From bb673fa5fd2fa09e77f163dd66a5497e99bfabea Mon Sep 17 00:00:00 2001 From: Evan Mullins Date: Tue, 19 Mar 2024 12:42:08 -0400 Subject: [PATCH 1/4] add slight delay when looking for notice and remove ellipsis from text match test on failing hg/i18n branch --- .github/workflows/brand-plugin-test.yml | 1 + tests/cypress/integration/staging-prod.cy.js | 5 +++-- tests/cypress/integration/staging-staging.cy.js | 5 +++-- 3 files changed, 7 insertions(+), 4 deletions(-) diff --git a/.github/workflows/brand-plugin-test.yml b/.github/workflows/brand-plugin-test.yml index c92f34d..05567f4 100644 --- a/.github/workflows/brand-plugin-test.yml +++ b/.github/workflows/brand-plugin-test.yml @@ -41,4 +41,5 @@ jobs: module-repo: ${{ github.repository }} module-branch: ${{ needs.setup.outputs.branch }} plugin-repo: 'newfold-labs/wp-plugin-hostgator' + plugin-branch: 'update/i18n-and-lint' secrets: inherit \ No newline at end of file diff --git a/tests/cypress/integration/staging-prod.cy.js b/tests/cypress/integration/staging-prod.cy.js index 235a843..2f784bb 100644 --- a/tests/cypress/integration/staging-prod.cy.js +++ b/tests/cypress/integration/staging-prod.cy.js @@ -198,7 +198,7 @@ describe( 'Staging Page - Production Environment', function () { }, { body: stagingSwitchFixture, - delay: 500, + delay: 1000, } ).as( 'stagingSwitch' ); @@ -221,9 +221,10 @@ describe( 'Staging Page - Production Environment', function () { .contains( 'Switch' ) .should( 'be.visible' ) .click(); + cy.wait( 100 ); cy.get( '.nfd-notifications' ) - .contains( 'p', 'Working...' ) + .contains( 'p', 'Working' ) .should( 'be.visible' ); cy.wait( '@stagingSwitch' ); diff --git a/tests/cypress/integration/staging-staging.cy.js b/tests/cypress/integration/staging-staging.cy.js index 43a9d1d..0abcc50 100644 --- a/tests/cypress/integration/staging-staging.cy.js +++ b/tests/cypress/integration/staging-staging.cy.js @@ -56,7 +56,7 @@ describe( 'Staging Page - Staging Environmant', function () { }, { body: stagingDeployFixture, - delay: 500, + delay: 1000, } ).as( 'stagingDeploy' ); @@ -71,9 +71,10 @@ describe( 'Staging Page - Staging Environmant', function () { .contains( 'Deploy' ) .should( 'be.visible' ) .click(); + cy.wait( 100 ); cy.get( '.nfd-notifications' ) - .contains( 'p', 'Working...' ) + .contains( 'p', 'Working' ) .should( 'be.visible' ); cy.wait( '@stagingDeploy' ); From 606a3eaaf9937b7876cc2adb173644fd49c92367 Mon Sep 17 00:00:00 2001 From: Evan Mullins Date: Tue, 19 Mar 2024 12:50:22 -0400 Subject: [PATCH 2/4] only run module tests --- .github/workflows/brand-plugin-test.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/brand-plugin-test.yml b/.github/workflows/brand-plugin-test.yml index 05567f4..5ce16b9 100644 --- a/.github/workflows/brand-plugin-test.yml +++ b/.github/workflows/brand-plugin-test.yml @@ -42,4 +42,5 @@ jobs: module-branch: ${{ needs.setup.outputs.branch }} plugin-repo: 'newfold-labs/wp-plugin-hostgator' plugin-branch: 'update/i18n-and-lint' + only-module-tests: true secrets: inherit \ No newline at end of file From 9f009be371481f150adb4a63ff28882f9c83cda4 Mon Sep 17 00:00:00 2001 From: Evan Mullins Date: Tue, 19 Mar 2024 12:57:49 -0400 Subject: [PATCH 3/4] revert module only tests --- .github/workflows/brand-plugin-test.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.github/workflows/brand-plugin-test.yml b/.github/workflows/brand-plugin-test.yml index 5ce16b9..05567f4 100644 --- a/.github/workflows/brand-plugin-test.yml +++ b/.github/workflows/brand-plugin-test.yml @@ -42,5 +42,4 @@ jobs: module-branch: ${{ needs.setup.outputs.branch }} plugin-repo: 'newfold-labs/wp-plugin-hostgator' plugin-branch: 'update/i18n-and-lint' - only-module-tests: true secrets: inherit \ No newline at end of file From 2c1dffd8f8e8eb4d37281993981f53ceb36da704 Mon Sep 17 00:00:00 2001 From: Evan Mullins Date: Tue, 19 Mar 2024 13:24:39 -0400 Subject: [PATCH 4/4] revert plugin branch switch for testing --- .github/workflows/brand-plugin-test.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.github/workflows/brand-plugin-test.yml b/.github/workflows/brand-plugin-test.yml index 05567f4..c92f34d 100644 --- a/.github/workflows/brand-plugin-test.yml +++ b/.github/workflows/brand-plugin-test.yml @@ -41,5 +41,4 @@ jobs: module-repo: ${{ github.repository }} module-branch: ${{ needs.setup.outputs.branch }} plugin-repo: 'newfold-labs/wp-plugin-hostgator' - plugin-branch: 'update/i18n-and-lint' secrets: inherit \ No newline at end of file