Yuki Takei 4 سال پیش
والد
کامیت
d6b4f2616e

+ 1 - 13
packages/app/test/cypress/integration/2-basic-features/access-to-admin-page.spec.ts

@@ -15,25 +15,13 @@ const adminMenues = [
 context('Access to Admin page', () => {
   const ssPrefix = 'access-to-admin-page-';
 
-  let connectSid: string | undefined;
-
-  before(() => {
+  beforeEach(() => {
     // login
     cy.fixture("user-admin.json").then(user => {
       cy.login(user.username, user.password);
-
-    });
-    cy.getCookie('connect.sid').then(cookie => {
-      connectSid = cookie?.value;
     });
   });
 
-  beforeEach(() => {
-    if (connectSid != null) {
-      cy.setCookie('connect.sid', connectSid);
-    }
-  });
-
   it('/admin is successfully loaded', () => {
     cy.visit('/admin');
     cy.getByTestid('admin-home').should('be.visible');

+ 1 - 12
packages/app/test/cypress/integration/2-basic-features/access-to-me-page.spec.ts

@@ -1,26 +1,15 @@
 context('Access to /me page', () => {
   const ssPrefix = 'access-to-me-page-';
 
-  let connectSid: string | undefined;
-
-  before(() => {
+  beforeEach(() => {
     // login
     cy.fixture("user-admin.json").then(user => {
       cy.login(user.username, user.password);
     });
-    cy.getCookie('connect.sid').then(cookie => {
-      connectSid = cookie?.value;
-    });
     // collapse sidebar
     cy.collapseSidebar(true);
   });
 
-  beforeEach(() => {
-    if (connectSid != null) {
-      cy.setCookie('connect.sid', connectSid);
-    }
-  });
-
   it('/me is successfully loaded', () => {
     cy.visit('/me', {  });
     cy.screenshot(`${ssPrefix}-me`);

+ 1 - 12
packages/app/test/cypress/integration/2-basic-features/access-to-page.spec.ts

@@ -2,26 +2,15 @@
 context('Access to page', () => {
   const ssPrefix = 'access-to-page-';
 
-  let connectSid: string | undefined;
-
-  before(() => {
+  beforeEach(() => {
     // login
     cy.fixture("user-admin.json").then(user => {
       cy.login(user.username, user.password);
     });
-    cy.getCookie('connect.sid').then(cookie => {
-      connectSid = cookie?.value;
-    });
     // collapse sidebar
     cy.collapseSidebar(true);
   });
 
-  beforeEach(() => {
-    if (connectSid != null) {
-      cy.setCookie('connect.sid', connectSid);
-    }
-  });
-
   it('/Sandbox is successfully loaded', () => {
     cy.visit('/Sandbox', {  });
     cy.screenshot(`${ssPrefix}-sandbox`);

+ 1 - 12
packages/app/test/cypress/integration/2-basic-features/access-to-special-page.spec.ts

@@ -2,26 +2,15 @@
 context('Access to special pages', () => {
   const ssPrefix = 'access-to-special-pages-';
 
-  let connectSid: string | undefined;
-
-  before(() => {
+  beforeEach(() => {
     // login
     cy.fixture("user-admin.json").then(user => {
       cy.login(user.username, user.password);
     });
-    cy.getCookie('connect.sid').then(cookie => {
-      connectSid = cookie?.value;
-    });
     // collapse sidebar
     cy.collapseSidebar(true);
   });
 
-  beforeEach(() => {
-    if (connectSid != null) {
-      cy.setCookie('connect.sid', connectSid);
-    }
-  });
-
   it('/trash is successfully loaded', () => {
     cy.visit('/trash', {  });
     cy.getByTestid('trash-page-list').should('be.visible');

+ 2 - 13
packages/app/test/cypress/integration/2-basic-features/open-presentation-modal.spec.ts

@@ -2,22 +2,11 @@ context('Open presentation modal', () => {
 
   const ssPrefix = 'access-to-presentation-modal-';
 
-  let connectSid: string | undefined;
-
-  before(() => {
+  beforeEach(() => {
     // login
     cy.fixture("user-admin.json").then(user => {
       cy.login(user.username, user.password);
     });
-    cy.getCookie('connect.sid').then(cookie => {
-      connectSid = cookie?.value;
-    });
-  });
-
-  beforeEach(() => {
-    if (connectSid != null) {
-      cy.setCookie('connect.sid', connectSid);
-    }
   });
 
   it('PresentationModal for "/" is shown successfully', () => {
@@ -30,7 +19,7 @@ context('Open presentation modal', () => {
 
     // eslint-disable-next-line cypress/no-unnecessary-waiting
     cy.wait(1500);
-    cy.screenshot(`${ssPrefix}-opne-top`);
+    cy.screenshot(`${ssPrefix}-open-top`);
   });
 
   it('PresentationModal for "/Sandbox/Bootstrap4" is shown successfully', () => {

+ 2 - 13
packages/app/test/cypress/integration/2-basic-features/switch-sidebar-contents.spec.ts

@@ -1,26 +1,15 @@
 context('Access to page', () => {
   const ssPrefix = 'switch-sidebar-content';
 
-  let connectSid: string | undefined;
-
-  before(() => {
+  beforeEach(() => {
     // login
     cy.fixture("user-admin.json").then(user => {
       cy.login(user.username, user.password);
     });
-    cy.getCookie('connect.sid').then(cookie => {
-      connectSid = cookie?.value;
-    });
-  });
-
-  beforeEach(() => {
-    if (connectSid != null) {
-      cy.setCookie('connect.sid', connectSid);
-    }
   });
 
   it('PageTree is successfully shown', () => {
-    cy.visit('/');
+    cy.visit('/page');
     cy.getByTestid('grw-sidebar-nav-primary-page-tree').click();
     cy.screenshot(`${ssPrefix}-pagetree-before-load`, { capture: 'viewport' });
     // eslint-disable-next-line cypress/no-unnecessary-waiting