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

Merge pull request #6927 from weseek/imprv/108870-108871-108872-cypress

imprv: Update Cypress test 108870 108871 108872
Ryoji Shimizu 3 лет назад
Родитель
Сommit
21972813fb

+ 1 - 0
packages/app/test/cypress/integration/21-basic-features-for-guest/access-to-page.spec.ts

@@ -3,6 +3,7 @@ context('Access to page by guest', () => {
 
 
   it('/Sandbox is successfully loaded', () => {
   it('/Sandbox is successfully loaded', () => {
     cy.visit('/Sandbox');
     cy.visit('/Sandbox');
+    cy.waitUntilSpinnerDisappear();
     cy.getByTestid('grw-pagetree-item-container').should('be.visible');
     cy.getByTestid('grw-pagetree-item-container').should('be.visible');
     cy.collapseSidebar(true, true);
     cy.collapseSidebar(true, true);
     cy.screenshot(`${ssPrefix}-sandbox`);
     cy.screenshot(`${ssPrefix}-sandbox`);

+ 2 - 0
packages/app/test/cypress/integration/30-search/search.spec.ts

@@ -155,6 +155,8 @@ context('Search all pages', () => {
     const tag = 'help';
     const tag = 'help';
     const searchText = `tag:${tag}`;
     const searchText = `tag:${tag}`;
     cy.visit('/');
     cy.visit('/');
+    cy.waitUntilSkeletonDisappear();
+
     // Add tag
     // Add tag
     cy.get('#edit-tags-btn-wrapper-for-tooltip > a').click({force: true});
     cy.get('#edit-tags-btn-wrapper-for-tooltip > a').click({force: true});
     cy.get('#edit-tag-modal').should('be.visible');
     cy.get('#edit-tag-modal').should('be.visible');

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

@@ -49,6 +49,11 @@ Cypress.Commands.add('waitUntilSkeletonDisappear', () => {
   cy.get('.grw-skeleton').should('not.exist');
   cy.get('.grw-skeleton').should('not.exist');
 });
 });
 
 
+Cypress.Commands.add('waitUntilSpinnerDisappear', () => {
+  cy.get('.fa-spinner').should('exist');
+  cy.get('.fa-spinner').should('not.exist');
+});
+
 let isSidebarCollapsed: boolean | undefined;
 let isSidebarCollapsed: boolean | undefined;
 
 
 Cypress.Commands.add('collapseSidebar', (isCollapsed, force=false) => {
 Cypress.Commands.add('collapseSidebar', (isCollapsed, force=false) => {

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

@@ -38,6 +38,7 @@ declare global {
        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>,
        waitUntilSkeletonDisappear(): Chainable<void>,
        waitUntilSkeletonDisappear(): Chainable<void>,
+       waitUntilSpinnerDisappear(): Chainable<void>,
     }
     }
   }
   }
 }
 }