Merge pull request #859 from HospitalRun/greenkeeper/ember-ajax-2.5.3

Update ember-ajax to the latest version 🚀
HospitalRun · Feb 6, 2017 · 195b838 · 195b838
2 parents 389ba29 + db002b9
commit 195b838
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 3 deletions.
diff --git a/package.json b/package.json
@@ -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",

diff --git a/tests/acceptance/appointments-test.js b/tests/acceptance/appointments-test.js
@@ -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}`;