Просмотр исходного кода

improve VRT collapseSidebar command

Yuki Takei 4 лет назад
Родитель
Сommit
930a4db874

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

@@ -11,6 +11,8 @@ context('Access to /me page', () => {
     cy.getCookie('connect.sid').then(cookie => {
       connectSid = cookie?.value;
     });
+    // collapse sidebar
+    cy.collapseSidebar(true);
   });
 
   beforeEach(() => {

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

@@ -12,6 +12,8 @@ context('Access to page', () => {
     cy.getCookie('connect.sid').then(cookie => {
       connectSid = cookie?.value;
     });
+    // collapse sidebar
+    cy.collapseSidebar(true);
   });
 
   beforeEach(() => {
@@ -22,12 +24,6 @@ context('Access to page', () => {
 
   it('/Sandbox is successfully loaded', () => {
     cy.visit('/Sandbox', {  });
-
-    // collapse sidebar and wait saving
-    cy.collapseSidebar(true);
-    // eslint-disable-next-line cypress/no-unnecessary-waiting
-    cy.wait(1500);
-
     cy.screenshot(`${ssPrefix}-sandbox`, { capture: 'viewport' });
   });
 

+ 2 - 0
packages/app/test/cypress/integration/2-basic-features/open-page-create-modal.spec.ts

@@ -12,6 +12,8 @@ context('Open PageCreateModal', () => {
     cy.getCookie('connect.sid').then(cookie => {
       connectSid = cookie?.value;
     });
+    // collapse sidebar
+    cy.collapseSidebar(true);
   });
 
   beforeEach(() => {

+ 2 - 0
packages/app/test/cypress/integration/3-search/access-to-private-legacy-pages-directly.spec.ts

@@ -11,6 +11,8 @@ context('Access to legacy private pages directly', () => {
     cy.getCookie('connect.sid').then(cookie => {
       connectSid = cookie?.value;
     });
+    // collapse sidebar
+    cy.collapseSidebar(true);
   });
 
   beforeEach(() => {

+ 2 - 0
packages/app/test/cypress/integration/3-search/access-to-result-page-directly.spec.ts

@@ -11,6 +11,8 @@ context('Access to search result page directly', () => {
     cy.getCookie('connect.sid').then(cookie => {
       connectSid = cookie?.value;
     });
+    // collapse sidebar
+    cy.collapseSidebar(true);
   });
 
   beforeEach(() => {

+ 6 - 0
packages/app/test/cypress/support/commands.ts

@@ -39,11 +39,17 @@ Cypress.Commands.add('login', (username, password) => {
 });
 
 Cypress.Commands.add('collapseSidebar', (isCollapsed) => {
+  cy.visit('/');
+
   cy.getByTestid('grw-contextual-navigation-sub').then(($contents) => {
     const isCurrentCollapsed = $contents.hasClass('d-none');
     // toggle when the current state and isCoolapsed is not match
     if (isCurrentCollapsed !== isCollapsed) {
       cy.getByTestid("grw-navigation-resize-button").click({force: true});
+
+      // wait until saving UserUISettings
+      // eslint-disable-next-line cypress/no-unnecessary-waiting
+      cy.wait(1500);
     }
   });
 });