From 1d198904d6cd21a68156919d3f0e6c848a836ed8 Mon Sep 17 00:00:00 2001 From: "greenkeeper[bot]" Date: Mon, 12 Dec 2016 18:02:27 +0000 Subject: [PATCH 1/2] chore(package): update ember-ajax to version 2.5.3 https://greenkeeper.io/ --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 0f4f5d1199..1fee6616f2 100644 --- a/package.json +++ b/package.json @@ -38,7 +38,7 @@ "broccoli-merge-trees": "^1.1.1", "broccoli-serviceworker": "0.1.4", "broccoli-stylelint": "billybonks/broccoli-stylelint", - "ember-ajax": "2.5.2", + "ember-ajax": "2.5.3", "ember-browserify": "^1.1.12", "ember-cli": "2.10.0", "ember-cli-active-link-wrapper": "0.3.2", From db002b9fc48744aff92f1342b78da9942c934b8b Mon Sep 17 00:00:00 2001 From: John Kleinschmidt Date: Mon, 6 Feb 2017 11:53:34 -0500 Subject: [PATCH 2/2] Fixed error in theater scheduling test --- tests/acceptance/appointments-test.js | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/tests/acceptance/appointments-test.js b/tests/acceptance/appointments-test.js index 70a05059b8..eafb547080 100644 --- 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}`;