From b38c1d5d7aeaeb8955dac582ef1b231adf439a98 Mon Sep 17 00:00:00 2001 From: scalvert Date: Thu, 19 Jan 2017 15:43:43 -0800 Subject: [PATCH] Adding test to ensure currentURL is set on multiple visits --- .../currenturl_lifecycle_test.js | 15 ++++++--------- 1 file changed, 6 insertions(+), 9 deletions(-) diff --git a/packages/ember/tests/routing/router_service_test/currenturl_lifecycle_test.js b/packages/ember/tests/routing/router_service_test/currenturl_lifecycle_test.js index 8e82133b67e..3e9b03203aa 100644 --- a/packages/ember/tests/routing/router_service_test/currenturl_lifecycle_test.js +++ b/packages/ember/tests/routing/router_service_test/currenturl_lifecycle_test.js @@ -184,16 +184,8 @@ if (isFeatureEnabled('ember-routing-router-service')) { }); } - ['@test RouterService#currentURL is correctly set with component'](assert) { - assert.expect(1); - - return this.visit('/').then(() => { - this.assertText('/'); - }); - } - ['@test RouterService#currentURL is correctly set with component after consecutive visits'](assert) { - assert.expect(2); + assert.expect(3); return this.visit('/') .then(() => { @@ -203,6 +195,11 @@ if (isFeatureEnabled('ember-routing-router-service')) { }) .then(() => { this.assertText('/child'); + + return this.visit('/'); + }) + .then(() => { + this.assertText('/'); }); } });