Răsfoiți Sursa

fix command name and replace some codes with it

Yohei-Shiina 3 ani în urmă
părinte
comite
40e547aa99

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

@@ -17,6 +17,7 @@ context('Access to page', () => {
 
 
   it('/Sandbox with anchor hash is successfully loaded', () => {
   it('/Sandbox with anchor hash is successfully loaded', () => {
     cy.visit('/Sandbox#Headers');
     cy.visit('/Sandbox#Headers');
+    cy.waitUntilSkeletonDisappear();
 
 
     // hide fab // disable fab for sticky-events warning
     // hide fab // disable fab for sticky-events warning
     // cy.getByTestid('grw-fab-container').invoke('attr', 'style', 'display: none');
     // cy.getByTestid('grw-fab-container').invoke('attr', 'style', 'display: none');
@@ -26,7 +27,6 @@ context('Access to page', () => {
     // https://stackoverflow.com/questions/5041494/selecting-and-manipulating-css-pseudo-elements-such-as-before-and-after-usin/21709814#21709814
     // https://stackoverflow.com/questions/5041494/selecting-and-manipulating-css-pseudo-elements-such-as-before-and-after-usin/21709814#21709814
     cy.get('#mdcont-headers').invoke('removeClass', 'blink');
     cy.get('#mdcont-headers').invoke('removeClass', 'blink');
 
 
-    cy.get('.grw-skeleton').should('not.exist');
     cy.screenshot(`${ssPrefix}-sandbox-headers`);
     cy.screenshot(`${ssPrefix}-sandbox-headers`);
   });
   });
 
 
@@ -52,7 +52,7 @@ context('Access to page', () => {
   it('/user/admin is successfully loaded', () => {
   it('/user/admin is successfully loaded', () => {
     cy.visit('/user/admin', {  });
     cy.visit('/user/admin', {  });
 
 
-    cy.get('.grw-skeleton').should('not.exist');
+    cy.waitUntilSkeletonDisappear();
     // for check download toc data
     // for check download toc data
     cy.get('.toc-link').should('be.visible');
     cy.get('.toc-link').should('be.visible');
 
 

+ 1 - 1
packages/app/test/cypress/integration/20-basic-features/click-page-icons.spec.ts

@@ -77,7 +77,7 @@ context('Click page icons button', () => {
 
 
   it('Successfully display list of "seen by user"', () => {
   it('Successfully display list of "seen by user"', () => {
     cy.visit('/Sandbox');
     cy.visit('/Sandbox');
-    cy.get('.grw-skeleton').should('not.exist');
+    cy.waitUntilSkeletonDisappear();
     // eslint-disable-next-line cypress/no-unnecessary-waiting
     // eslint-disable-next-line cypress/no-unnecessary-waiting
     cy.wait(2000); // wait for get method
     cy.wait(2000); // wait for get method
     cy.get('#grw-subnav-container').within(() => {
     cy.get('#grw-subnav-container').within(() => {

+ 1 - 1
packages/app/test/cypress/integration/60-home/home.spec.ts

@@ -18,7 +18,7 @@ context('Access Home', () => {
     // eslint-disable-next-line cypress/no-unnecessary-waiting
     // eslint-disable-next-line cypress/no-unnecessary-waiting
     cy.wait(2000); // wait for calcViewHeight and rendering
     cy.wait(2000); // wait for calcViewHeight and rendering
 
 
-    cy.get('.grw-skeleton').should('not.exist');
+    cy.waitUntilSkeletonDisappear();
     // for check download toc data
     // for check download toc data
     cy.get('.toc-link').should('be.visible');
     cy.get('.toc-link').should('be.visible');
 
 

+ 1 - 1
packages/app/test/cypress/support/commands.ts

@@ -44,7 +44,7 @@ Cypress.Commands.add('login', (username, password) => {
 /**
 /**
  * use only for the pages which use component with skeleton
  * use only for the pages which use component with skeleton
  */
  */
-Cypress.Commands.add('waitSkeletonDisappear', () => {
+Cypress.Commands.add('waitUntilSkeletonDisappear', () => {
   cy.get('.grw-skeleton').should('not.exist');
   cy.get('.grw-skeleton').should('not.exist');
   cy.get('.grw-skeleton').should('exist');
   cy.get('.grw-skeleton').should('exist');
 });
 });

+ 1 - 1
packages/app/test/cypress/support/index.ts

@@ -37,7 +37,7 @@ declare global {
        getByTestid(selector: string, options?: Partial<Loggable & Timeoutable & Withinable & Shadow>): Chainable<JQuery<Element>>,
        getByTestid(selector: string, options?: Partial<Loggable & Timeoutable & Withinable & Shadow>): Chainable<JQuery<Element>>,
        login(username: string, password: string): Chainable<void>,
        login(username: string, password: string): Chainable<void>,
        collapseSidebar(isCollapsed: boolean, force?: boolean): Chainable<void>,
        collapseSidebar(isCollapsed: boolean, force?: boolean): Chainable<void>,
-       waitSkeletonDisappear(): Chainable<void>,
+       waitUntilSkeletonDisappear(): Chainable<void>,
     }
     }
   }
   }
 }
 }