test: avoid errorneous initial render from setRoutes

vaadin · Sep 26, 2024 · bf2ea88 · bf2ea88
1 parent b838b53
commit bf2ea88
Show file tree

Hide file tree

Showing 4 changed files with 887 additions and 695 deletions.
diff --git a/test/router/dynamic-redirect.spec.ts b/test/router/dynamic-redirect.spec.ts
@@ -18,42 +18,43 @@ describe('Vaadin.Router', () => {
   let history: sinon.SinonStubbedInstance<History>;
 
   before(() => {
-    history = sinon.createStubInstance(History);
     outlet = document.createElement('div');
     document.body.append(outlet);
   });
 
   after(() => {
-    Object.values(history).forEach((stub: sinon.SinonStub) => stub.restore());
     outlet.remove();
   });
 
   beforeEach(() => {
-    cleanup(outlet);
+    history = sinon.createStubInstance(History);
 
     // create a new router instance
     router = new Router(outlet);
   });
 
   afterEach(() => {
-    Object.values(history).forEach((stub: sinon.SinonStub) => stub.resetHistory());
+    cleanup(outlet);
     router.unsubscribe();
   });
 
   describe('resolver chain and router features', () => {
     it('redirect overwrites activated routes', async () => {
-      await router.setRoutes([
-        { path: '/a', children: [{ path: '/b', children: [{ path: '/c', component: 'x-home-view' }] }] },
-        { path: '/', redirect: '/a/b/c' },
-      ]);
+      await router.setRoutes(
+        [
+          { path: '/a', children: [{ path: '/b', children: [{ path: '/c', component: 'x-home-view' }] }] },
+          { path: '/', redirect: '/a/b/c' },
+        ],
+        true,
+      );
 
       await router.render('/');
 
       verifyActiveRoutes(router, ['/a', '/b', '/c']);
     });
 
     it('action that returns custom component activates route', async () => {
-      await router.setRoutes([{ path: '/', action: (_context, commands) => commands?.component('x-home-view') }]);
+      await router.setRoutes([{ path: '/', action: (_context, commands) => commands?.component('x-home-view') }], true);
 
       await router.render('/');
 
@@ -64,7 +65,7 @@ describe('Vaadin.Router', () => {
       await router.setRoutes([
         { path: '/', action: (_context, commands) => commands?.redirect('/a') },
         { path: '/a', component: 'x-users-view' },
-      ]);
+      ], true);
 
       await router.render('/');
 
@@ -79,7 +80,7 @@ describe('Vaadin.Router', () => {
         { path: '/', action: (_context, commands) => commands?.redirect('/u') },
         { path: '/u', action: (_context, commands) => commands?.redirect('/users') },
         { path: '/users', component: 'x-users-list' },
-      ]);
+      ], true);
 
       await router.render('/');
 
@@ -94,7 +95,7 @@ describe('Vaadin.Router', () => {
         { path: '/a', action: (_context, commands) => commands?.redirect('/b') },
         { path: '/b', action: (_context, commands) => commands?.redirect('/c') },
         { path: '/c', action: (_context, commands) => commands?.redirect('/a') },
-      ]);
+      ], true);
 
       const onError = sinon.spy();
       // eslint-disable-next-line @typescript-eslint/use-unknown-in-catch-callback-variable