Skip to content
This repository has been archived by the owner on Jan 9, 2023. It is now read-only.

Update ember-ajax to the latest version 🚀 #859

Merged
merged 3 commits into from
Feb 6, 2017
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@
"broccoli-manifest": "0.0.7",
"broccoli-merge-trees": "^1.1.1",
"broccoli-serviceworker": "0.1.4",
"ember-ajax": "2.5.2",
"ember-ajax": "2.5.4",
"ember-browserify": "^1.1.12",
"ember-cli": "2.10.0",
"ember-cli-active-link-wrapper": "0.3.2",
Expand Down
8 changes: 6 additions & 2 deletions tests/acceptance/appointments-test.js
Original file line number Diff line number Diff line change
Expand Up @@ -183,8 +183,12 @@ test('Appointment calendar', function(assert) {
test('Theater scheduling', function(assert) {
runWithPouchDump('appointments', function() {
authenticateUser();
let later = moment().add(2, 'hours');
let today = moment().add(1, 'hours');
let later = moment();
later.hour(11);
later.minute(30);
let today = moment();
today.hour(10);
today.minute(30);
let startTime = today.format(TIME_FORMAT);
let endTime = later.format(TIME_FORMAT);
let timeString = `${startTime} - ${endTime}`;
Expand Down