refactor(router): use afterDeactivate hook for stopping

aurelia · Oct 5, 2020 · 3683586 · 3683586
1 parent 79282ad
commit 3683586
Show file tree

Hide file tree

Showing 9 changed files with 1 addition and 16 deletions.
diff --git a/packages/__tests__/router/__smoke-tests.spec.ts.txt b/packages/__tests__/router/__smoke-tests.spec.ts.txt
@@ -101,7 +101,6 @@ async function createFixture<T extends Constructable>(
       // scheduler.getRenderTaskQueue().flush();
       // assert.isSchedulerEmpty();
 
-      router.stop();
       await au.stop().wait();
       ctx.doc.body.removeChild(host);
 

diff --git a/packages/__tests__/router/_shared/create-fixture.ts b/packages/__tests__/router/_shared/create-fixture.ts
@@ -106,9 +106,6 @@ export async function createFixture<T extends Constructable>(
       logConfig.level = level;
     },
     async tearDown() {
-
-      router.stop();
-
       assert.isSchedulerEmpty();
 
       hia.setPhase('stop');

diff --git a/packages/__tests__/router/configuration.spec.ts b/packages/__tests__/router/configuration.spec.ts
@@ -33,7 +33,6 @@ describe('Configuration', function () {
     await au.start().wait();
 
     async function tearDown() {
-      router.stop();
       await au.stop().wait();
       ctx.doc.body.removeChild(host);
 
@@ -112,7 +111,6 @@ describe('Configuration', function () {
 
     await au.stop().wait();
     ctx.doc.body.removeChild(host);
-    router.stop();
 
     au.dispose();
     assert.isSchedulerEmpty();

diff --git a/packages/__tests__/router/hook-manager.spec.ts b/packages/__tests__/router/hook-manager.spec.ts
@@ -40,7 +40,6 @@ describe('HookManager', function () {
 
     async function tearDown() {
       unspyNavigationStates(router, _pushState, _replaceState);
-      router.stop();
       RouterConfiguration.customize();
       await au.stop().wait();
 

diff --git a/packages/__tests__/router/instruction-resolver.spec.ts b/packages/__tests__/router/instruction-resolver.spec.ts
@@ -27,7 +27,6 @@ describe('InstructionResolver', function () {
     await au.start().wait();
 
     async function tearDown() {
-      router.stop();
       await au.stop().wait();
       ctx.doc.body.removeChild(host);
 

diff --git a/packages/__tests__/router/nav.spec.ts b/packages/__tests__/router/nav.spec.ts
@@ -46,7 +46,6 @@ describe('Nav', function () {
     await au.start().wait();
 
     async function tearDown() {
-      router.stop();
       await au.stop().wait();
       ctx.doc.body.removeChild(host);
 

diff --git a/packages/__tests__/router/router.spec.ts b/packages/__tests__/router/router.spec.ts
@@ -151,7 +151,6 @@ describe('Router', function () {
 
     async function tearDown() {
       unspyNavigationStates(router, _pushState, _replaceState);
-      router.stop();
       await au.stop().wait();
       ctx.doc.body.removeChild(host);
     }
@@ -960,7 +959,6 @@ describe('Router', function () {
       async function $teardown() {
         await au.stop().wait();
         ctx.doc.body.removeChild(host);
-        router.stop();
 
         au.dispose();
         assert.isSchedulerEmpty();
@@ -1210,7 +1208,6 @@ describe('Router', function () {
 
       async function $teardown() {
         unspyNavigationStates(router, _pushState, _replaceState);
-        router.stop();
         await au.stop().wait();
         ctx.doc.body.removeChild(host);
 
@@ -1342,7 +1339,6 @@ describe('Router', function () {
 
       async function $teardown() {
         unspyNavigationStates(router, _pushState, _replaceState);
-        router.stop();
         await au.stop().wait();
         ctx.doc.body.removeChild(host);
 
@@ -1612,7 +1608,6 @@ describe('Router', function () {
 
       async function $teardown() {
         unspyNavigationStates(router, _pushState, _replaceState);
-        router.stop();
         await au.stop().wait();
         ctx.doc.body.removeChild(host);
 
@@ -1835,7 +1830,6 @@ describe('Router', function () {
 
       async function $teardown() {
         unspyNavigationStates(router, _pushState, _replaceState);
-        router.stop();
         await au.stop().wait();
         ctx.doc.body.removeChild(host);
 

diff --git a/packages/__tests__/router/viewport.spec.ts b/packages/__tests__/router/viewport.spec.ts
@@ -31,7 +31,6 @@ describe('Viewport', function () {
     await au.start().wait();
 
     async function tearDown() {
-      router.stop();
       RouterConfiguration.customize();
       await au.stop().wait();
 

diff --git a/packages/router/src/configuration.ts b/packages/router/src/configuration.ts
@@ -67,6 +67,7 @@ const routerConfiguration = {
       ...DefaultResources,
       StartTask.with(IRouter).beforeActivate().call(configurationCall),
       StartTask.with(IRouter).afterActivate().call(router => router.loadUrl()),
+      StartTask.with(IRouter).afterDeactivate().call(router => router.stop()),
     );
   },
   /**