Merge branch 'develop' into update/react-app-cleanup

bluehost · Dec 4, 2023 · e42c266 · e42c266
2 parents 2e1df82 + 31ff11f
commit e42c266
Show file tree

Hide file tree

Showing 10 changed files with 458 additions and 887 deletions.
diff --git a/.github/dependabot.yml b/.github/dependabot.yml
@@ -9,12 +9,6 @@ updates:
       - dependency-type: direct
     schedule:
       interval: "daily"
-    assignees:
-      - "wpscholar"
-    reviewers:
-      - "aalani95"
-      - "circlecube"
-      - "wpscholar"
     commit-message:
       prefix: "GitHub Actions"
       include: "scope"
@@ -30,12 +24,6 @@ updates:
     schedule:
       interval: "daily"
     versioning-strategy: increase
-    assignees:
-      - "wpscholar"
-    reviewers:
-      - "aalani95"
-      - "circlecube"
-      - "wpscholar"
     commit-message:
       prefix: "NPM"
       prefix-development: "NPM Dev"
@@ -59,12 +47,6 @@ updates:
     allow:
       - dependency-type: direct
     versioning-strategy: increase
-    assignees:
-      - "wpscholar"
-    reviewers:
-      - "aalani95"
-      - "circlecube"
-      - "wpscholar"
     commit-message:
       prefix: "Composer"
       prefix-development: "Composer Dev"

diff --git a/.github/workflows/cypress-matrix.yml b/.github/workflows/cypress-matrix.yml
@@ -30,9 +30,9 @@ jobs:
           - '8.1'
           - '8.2'
         wpVersion:
-          - '6.1'
           - '6.2'
           - '6.3'
+          - '6.4'
 
     steps:
 
@@ -115,27 +115,12 @@ jobs:
         run: npx wp-env start --debug
 
       - name: Run Cypress Tests
-        env:
-          RECORD_REPLAY_API_KEY: ${{ secrets.RECORD_REPLAY_API_KEY }}
-        if: ${{ github.repository != 'bluehost/bluehost-wordpress-plugin' || env.RECORD_REPLAY_API_KEY == '' }}
-        run: npx cypress run
+        if: ${{ github.repository != 'bluehost/bluehost-wordpress-plugin' || github.actor == 'dependabot[bot]' }}
+        run: npm run test:e2e -- --browser chrome
 
       - name: Run Cypress Tests
-        uses: replayio/[email protected]
-        env:
-          RECORD_REPLAY_METADATA_TEST_RUN_TITLE: "php-${{ matrix.phpVersion }}, wp-${{ matrix.wpVersion }}"
-          RECORD_REPLAY_API_KEY: ${{ secrets.RECORD_REPLAY_API_KEY }}
-        if: ${{ github.repository == 'bluehost/bluehost-wordpress-plugin' && env.RECORD_REPLAY_API_KEY != '' }}
-        with:
-          api-key: ${{ secrets.RECORD_REPLAY_API_KEY }}
-          browser: 'replay-chromium'
-          command: npm run test:e2e -- --record --key ${{ secrets.CYPRESS_RECORD_KEY }} --tag bluehost,php-${{ matrix.phpVersion }},wp-${{ matrix.wpVersion }}
-          upload-all: false
-
-      - name: List Replays
-        if: always()
-        shell: bash
-        run: npx @replayio/replay ls --json
+        if: ${{ github.repository == 'bluehost/bluehost-wordpress-plugin' && github.actor != 'dependabot[bot]' }}
+        run: npm run test:e2e -- --browser chrome --record --key ${{ secrets.CYPRESS_RECORD_KEY }} --tag "bluehost,php-${{ matrix.phpVersion }},wp-${{ matrix.wpVersion }}"
 
       - name: Store screenshots of test failures
         if: ${{ failure() }}

diff --git a/.github/workflows/cypress-tests-beta.yml b/.github/workflows/cypress-tests-beta.yml
@@ -98,27 +98,13 @@ jobs:
       - name: Install WordPress
         run: npx wp-env start --debug
 
-      - name: Run Cypress Beta Only Tests
-        env:
-          RECORD_REPLAY_API_KEY: ${{ secrets.RECORD_REPLAY_API_KEY }}
-        if: ${{ github.repository != 'bluehost/bluehost-wordpress-plugin' || env.RECORD_REPLAY_API_KEY == '' }}
-        run: npx cypress run
+      - name: Run Cypress Tests
+        if: ${{ github.repository != 'bluehost/bluehost-wordpress-plugin' || github.actor == 'dependabot[bot]' }}
+        run: npm run test:e2e -- --browser chrome
 
-      - name: Run Cypress Beta Only Tests
-        uses: replayio/[email protected]
-        env:
-          RECORD_REPLAY_API_KEY: ${{ secrets.RECORD_REPLAY_API_KEY }}
-        if: ${{ github.repository == 'bluehost/bluehost-wordpress-plugin' && env.RECORD_REPLAY_API_KEY != '' }}
-        with:
-          api-key: ${{ secrets.RECORD_REPLAY_API_KEY }}
-          browser: 'replay-chromium'
-          command: npm run test:e2e -- --record --key ${{ secrets.CYPRESS_RECORD_KEY }}
-          upload-all: false
-
-      - name: List Replays
-        if: always()
-        shell: bash
-        run: npx @replayio/replay ls --json
+      - name: Run Cypress Tests
+        if: ${{ github.repository == 'bluehost/bluehost-wordpress-plugin' && github.actor != 'dependabot[bot]' }}
+        run: npm run test:e2e -- --browser chrome --record --key ${{ secrets.CYPRESS_RECORD_KEY }} --tag "bluehost, wp-beta"
 
       - name: Store screenshots of test failures
         if: failure()

diff --git a/.github/workflows/cypress.yml b/.github/workflows/cypress.yml
@@ -102,26 +102,12 @@ jobs:
         run: npx wp-env start --debug
 
       - name: Run Cypress Tests
-        env:
-          RECORD_REPLAY_API_KEY: ${{ secrets.RECORD_REPLAY_API_KEY }}
-        if: ${{ github.repository != 'bluehost/bluehost-wordpress-plugin' || env.RECORD_REPLAY_API_KEY == '' }}
-        run: npx cypress run
+        if: ${{ github.repository != 'bluehost/bluehost-wordpress-plugin' || github.actor == 'dependabot[bot]' }}
+        run: npm run test:e2e -- --browser chrome
 
       - name: Run Cypress Tests
-        uses: replayio/[email protected]
-        env:
-          RECORD_REPLAY_API_KEY: ${{ secrets.RECORD_REPLAY_API_KEY }}
-        if: ${{ github.repository == 'bluehost/bluehost-wordpress-plugin' && env.RECORD_REPLAY_API_KEY != '' }}
-        with:
-          api-key: ${{ secrets.RECORD_REPLAY_API_KEY }}
-          browser: 'replay-chromium'
-          command: npm run test:e2e -- --record --key ${{ secrets.CYPRESS_RECORD_KEY }} --tag bluehost
-          upload-all: false
-
-      - name: List Replays
-        if: always()
-        shell: bash
-        run: npx @replayio/replay ls --json
+        if: ${{ github.repository == 'bluehost/bluehost-wordpress-plugin' && github.actor != 'dependabot[bot]' }}
+        run: npm run test:e2e -- --browser chrome --record --key ${{ secrets.CYPRESS_RECORD_KEY }} --tag bluehost
 
       - name: Store screenshots of test failures
         if: failure()

diff --git a/composer.json b/composer.json
@@ -59,8 +59,8 @@
     "newfold-labs/wp-module-coming-soon": "^1.1.12",
     "newfold-labs/wp-module-ctb": "^1.1.2",
     "newfold-labs/wp-module-customer-bluehost": "^1.6.0",
-    "newfold-labs/wp-module-data": "^2.4.9",
-    "newfold-labs/wp-module-deactivation": "^1.0.2",
+    "newfold-labs/wp-module-data": "^2.4.13",
+    "newfold-labs/wp-module-deactivation": "^1.0.3",
     "newfold-labs/wp-module-ecommerce": "^1.3.9",
     "newfold-labs/wp-module-global-ctb": "^1.0.9",
     "newfold-labs/wp-module-help-center": "1.0.21",

diff --git a/composer.lock b/composer.lock
diff --git a/cypress.config.js b/cypress.config.js
@@ -1,5 +1,4 @@
 const { defineConfig } = require('cypress')
-const cypressReplay = require("@replayio/cypress")
 const { phpVersion, core } = require('./.wp-env.json')
 const wpVersion = /[^/]*$/.exec(core)[0]
 
@@ -18,7 +17,6 @@ module.exports = defineConfig({
   screenshotsFolder: 'tests/cypress/screenshots',
   video: true,
   videosFolder: 'tests/cypress/videos',
-  videoUploadOnPasses: false,
   chromeWebSecurity: false,
   viewportWidth: 1024,
   viewportHeight: 768,
@@ -31,9 +29,6 @@ module.exports = defineConfig({
 		setupNodeEvents(on, config) {
 			const semver = require('semver');
 
-			// Setup Replay
-			cypressReplay.default(on, config);
-
 			// Ensure that the base URL is always properly set.
 			if (config.env && config.env.baseUrl) {
 				config.baseUrl = config.env.baseUrl;