Mudana-Grune 2 лет назад
Родитель
Сommit
104511ee16

+ 13 - 3
apps/app/test/cypress/integration/20-basic-features/20-basic-features--access-to-page.spec.ts

@@ -265,7 +265,10 @@ context('Access to Template Editing Mode', () => {
 
 
     cy.get('#grw-subnav-container').within(() => {
     cy.get('#grw-subnav-container').within(() => {
       cy.getByTestid('open-page-item-control-btn').click({force: true});
       cy.getByTestid('open-page-item-control-btn').click({force: true});
-      cy.getByTestid('open-page-template-modal-btn').click({force: true});
+    });
+
+    cy.get('body').within(() => {
+      cy.getByTestid('open-page-template-modal-btn').filter('.show').click({force: true});
     });
     });
 
 
     cy.getByTestid('page-template-modal').should('be.visible');
     cy.getByTestid('page-template-modal').should('be.visible');
@@ -296,7 +299,10 @@ context('Access to Template Editing Mode', () => {
 
 
     cy.get('#grw-subnav-container').within(() => {
     cy.get('#grw-subnav-container').within(() => {
       cy.getByTestid('open-page-item-control-btn').click({force: true});
       cy.getByTestid('open-page-item-control-btn').click({force: true});
-      cy.getByTestid('open-page-template-modal-btn').click({force: true});
+    });
+
+    cy.get('body').within(() => {
+      cy.getByTestid('open-page-template-modal-btn').filter('.show').click({force: true});
     });
     });
 
 
     cy.getByTestid('page-template-modal').should('be.visible');
     cy.getByTestid('page-template-modal').should('be.visible');
@@ -325,8 +331,12 @@ context('Access to Template Editing Mode', () => {
     cy.visit('/Sandbox/_template');
     cy.visit('/Sandbox/_template');
     cy.get('#grw-subnav-container').within(() => {
     cy.get('#grw-subnav-container').within(() => {
       cy.getByTestid('open-page-item-control-btn').click({force: true});
       cy.getByTestid('open-page-item-control-btn').click({force: true});
-      cy.getByTestid('open-page-delete-modal-btn').click({force: true});
     });
     });
+
+    cy.get('body').within(() => {
+      cy.getByTestid('open-page-delete-modal-btn').filter('.show').click({force: true});
+    });
+
     cy.getByTestid('page-delete-modal').should('be.visible').within(() => {
     cy.getByTestid('page-delete-modal').should('be.visible').within(() => {
       cy.intercept('POST', '/_api/pages.remove').as('remove');
       cy.intercept('POST', '/_api/pages.remove').as('remove');
       cy.getByTestid('delete-page-button').click();
       cy.getByTestid('delete-page-button').click();

+ 12 - 3
apps/app/test/cypress/integration/20-basic-features/20-basic-features--use-tools.spec.ts

@@ -138,7 +138,10 @@ context('Modal for page operation', () => {
 
 
     cy.get('#grw-subnav-container').within(() => {
     cy.get('#grw-subnav-container').within(() => {
       cy.getByTestid('open-page-item-control-btn').click({force: true});
       cy.getByTestid('open-page-item-control-btn').click({force: true});
-      cy.getByTestid('open-page-delete-modal-btn').click({force: true});
+    });
+
+    cy.get('body').within(() => {
+      cy.getByTestid('open-page-delete-modal-btn').filter('.show').click({force: true});
     });
     });
 
 
     cy.getByTestid('page-delete-modal').should('be.visible').within(() => {
     cy.getByTestid('page-delete-modal').should('be.visible').within(() => {
@@ -165,7 +168,10 @@ context('Modal for page operation', () => {
 
 
     cy.get('#grw-subnav-container').within(() => {
     cy.get('#grw-subnav-container').within(() => {
       cy.getByTestid('open-page-item-control-btn').click({force: true});
       cy.getByTestid('open-page-item-control-btn').click({force: true});
-      cy.getByTestid('open-page-duplicate-modal-btn').click({force: true});
+    });
+
+    cy.get('body').within(() => {
+      cy.getByTestid('open-page-duplicate-modal-btn').filter('.show').click({force: true});
     });
     });
 
 
     cy.getByTestid('page-duplicate-modal').should('be.visible').screenshot(`${ssPrefix}-duplicate-bootstrap4`);
     cy.getByTestid('page-duplicate-modal').should('be.visible').screenshot(`${ssPrefix}-duplicate-bootstrap4`);
@@ -177,7 +183,10 @@ context('Modal for page operation', () => {
 
 
     cy.get('#grw-subnav-container').within(() => {
     cy.get('#grw-subnav-container').within(() => {
       cy.getByTestid('open-page-item-control-btn').click({force: true});
       cy.getByTestid('open-page-item-control-btn').click({force: true});
-      cy.getByTestid('open-page-move-rename-modal-btn').click({force: true});
+    });
+
+    cy.get('body').within(() => {
+      cy.getByTestid('open-page-move-rename-modal-btn').filter('.show').click({force: true});
     });
     });
 
 
     cy.getByTestid('grw-page-rename-button').should('be.disabled');
     cy.getByTestid('grw-page-rename-button').should('be.disabled');