From b159cb9b9a99067a878c3d5e1d52d8d9e1685ee8 Mon Sep 17 00:00:00 2001 From: wpalani Date: Fri, 30 Aug 2024 11:27:34 -0700 Subject: [PATCH 01/13] Update version to 3.14.8 --- bluehost-wordpress-plugin.php | 4 ++-- package-lock.json | 4 ++-- package.json | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/bluehost-wordpress-plugin.php b/bluehost-wordpress-plugin.php index 61c79a47d..ddef799d2 100644 --- a/bluehost-wordpress-plugin.php +++ b/bluehost-wordpress-plugin.php @@ -12,7 +12,7 @@ * Plugin URI: https://bluehost.com * Update URI: https://github.com/bluehost/bluehost-wordpress-plugin * Description: WordPress plugin that integrates a WordPress site with the Bluehost control panel, including performance, security, and update features. - * Version: 3.14.7 + * Version: 3.14.8 * Requires at least: 6.4 * Requires PHP: 7.3 * Tested up to: 6.6.1 @@ -32,7 +32,7 @@ } // Define constants -define( 'BLUEHOST_PLUGIN_VERSION', '3.14.7' ); +define( 'BLUEHOST_PLUGIN_VERSION', '3.14.8' ); define( 'BLUEHOST_PLUGIN_FILE', __FILE__ ); define( 'BLUEHOST_PLUGIN_DIR', plugin_dir_path( __FILE__ ) ); define( 'BLUEHOST_PLUGIN_URL', plugin_dir_url( __FILE__ ) ); diff --git a/package-lock.json b/package-lock.json index f890ffea5..ac49fab80 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,12 +1,12 @@ { "name": "bluehost-wordpress-plugin", - "version": "3.14.7", + "version": "3.14.8", "lockfileVersion": 3, "requires": true, "packages": { "": { "name": "bluehost-wordpress-plugin", - "version": "3.14.7", + "version": "3.14.8", "license": "GPL-2.0-or-later", "dependencies": { "@heroicons/react": "^2.1.5", diff --git a/package.json b/package.json index 060f4c5b8..4a8d5fa64 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "bluehost-wordpress-plugin", - "version": "3.14.7", + "version": "3.14.8", "description": "WordPress plugin that integrates your WordPress site with the Bluehost control panel, including performance, security, and update features.", "author": { "name": "Bluehost", From f07d1b937f71dc99a2f6fdf55da3c9c4a6941785 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 2 Sep 2024 15:45:23 +0000 Subject: [PATCH 02/13] Composer(deps): Bump newfold-labs/wp-module-coming-soon Bumps [newfold-labs/wp-module-coming-soon](https://github.com/newfold-labs/wp-module-coming-soon) from 1.2.5 to 1.2.6. - [Release notes](https://github.com/newfold-labs/wp-module-coming-soon/releases) - [Commits](https://github.com/newfold-labs/wp-module-coming-soon/compare/1.2.5...1.2.6) --- updated-dependencies: - dependency-name: newfold-labs/wp-module-coming-soon dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- composer.json | 2 +- composer.lock | 48 ++++++++++++++++++++++++------------------------ 2 files changed, 25 insertions(+), 25 deletions(-) diff --git a/composer.json b/composer.json index a5a736be1..209e3bf84 100644 --- a/composer.json +++ b/composer.json @@ -74,7 +74,7 @@ "require": { "newfold-labs/wp-module-activation": "^1.0.3", "newfold-labs/wp-module-atomic": "^1.3.0", - "newfold-labs/wp-module-coming-soon": "^1.2.5", + "newfold-labs/wp-module-coming-soon": "^1.2.6", "newfold-labs/wp-module-context": "^1.0.1", "newfold-labs/wp-module-data": "^2.6.2", "newfold-labs/wp-module-deactivation": "^1.2.3", diff --git a/composer.lock b/composer.lock index db35ba7e2..76dff3bb9 100644 --- a/composer.lock +++ b/composer.lock @@ -4,7 +4,7 @@ "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies", "This file is @generated automatically" ], - "content-hash": "3a63321309e5d03dcc3cf0c32c9e4561", + "content-hash": "dedb5661bbfc7ad43b6696ea95ac9120", "packages": [ { "name": "doctrine/inflector", @@ -722,24 +722,24 @@ }, { "name": "newfold-labs/wp-module-coming-soon", - "version": "1.2.5", + "version": "1.2.6", "source": { "type": "git", "url": "https://github.com/newfold-labs/wp-module-coming-soon.git", - "reference": "36da71998930ffc6fcb13d2ea082b82507a284b2" + "reference": "3b43b08f02348e4d016392247dc4503df5d48b39" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/newfold-labs/wp-module-coming-soon/zipball/36da71998930ffc6fcb13d2ea082b82507a284b2", - "reference": "36da71998930ffc6fcb13d2ea082b82507a284b2", + "url": "https://api.github.com/repos/newfold-labs/wp-module-coming-soon/zipball/3b43b08f02348e4d016392247dc4503df5d48b39", + "reference": "3b43b08f02348e4d016392247dc4503df5d48b39", "shasum": "" }, "require": { - "newfold-labs/wp-module-data": ">=2.4.18", + "newfold-labs/wp-module-data": ">=2.6.2", "wp-forge/wp-upgrade-handler": "^1.0" }, "require-dev": { - "newfold-labs/wp-php-standards": "^1.2" + "newfold-labs/wp-php-standards": "^1.2.4" }, "type": "library", "autoload": { @@ -769,10 +769,10 @@ ], "description": "Coming Soon module for WordPress sites.", "support": { - "source": "https://github.com/newfold-labs/wp-module-coming-soon/tree/1.2.5", + "source": "https://github.com/newfold-labs/wp-module-coming-soon/tree/1.2.6", "issues": "https://github.com/newfold-labs/wp-module-coming-soon/issues" }, - "time": "2024-06-19T19:13:33+00:00" + "time": "2024-08-30T20:32:49+00:00" }, { "name": "newfold-labs/wp-module-context", @@ -830,36 +830,36 @@ }, { "name": "newfold-labs/wp-module-data", - "version": "2.6.2", + "version": "2.6.3", "source": { "type": "git", "url": "https://github.com/newfold-labs/wp-module-data.git", - "reference": "91d1b03162f23b7b8bd3a41d9496eb8017df0051" + "reference": "f98dfabe6a4cb10aec6dcd6e81fc7d269238e9a4" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/newfold-labs/wp-module-data/zipball/91d1b03162f23b7b8bd3a41d9496eb8017df0051", - "reference": "91d1b03162f23b7b8bd3a41d9496eb8017df0051", + "url": "https://api.github.com/repos/newfold-labs/wp-module-data/zipball/f98dfabe6a4cb10aec6dcd6e81fc7d269238e9a4", + "reference": "f98dfabe6a4cb10aec6dcd6e81fc7d269238e9a4", "shasum": "" }, "require": { "ext-json": "*", - "newfold-labs/wp-module-loader": "^1.0", + "newfold-labs/wp-module-loader": "^1.0.10", "wp-forge/helpers": "^2.0", - "wp-forge/wp-query-builder": "^1.0", + "wp-forge/wp-query-builder": "^1.0.4", "wp-forge/wp-upgrade-handler": "^1.0", - "wpscholar/url": "^1.2" + "wpscholar/url": "^1.2.2" }, "require-dev": { "10up/wp_mock": "^0.4.2", - "bluehost/bluehost-wordpress-plugin": "*", - "brianhenryie/composer-phpstorm": "*", - "johnpbloch/wordpress": "*", + "bluehost/bluehost-wordpress-plugin": ">=3.1", + "brianhenryie/composer-phpstorm": ">=0.4", + "johnpbloch/wordpress": ">=6.5.3", "kporras07/composer-symlinks": "^1.2", - "lucatume/wp-browser": "^3", - "newfold-labs/wp-php-standards": "^1.2", + "lucatume/wp-browser": "^3.5.8", + "newfold-labs/wp-php-standards": "^1.2.3", "phpunit/phpcov": "^5.0", - "wpackagist-plugin/woocommerce": "*" + "wpackagist-plugin/woocommerce": ">=9" }, "type": "library", "extra": { @@ -921,10 +921,10 @@ ], "description": "Newfold Data Module", "support": { - "source": "https://github.com/newfold-labs/wp-module-data/tree/2.6.2", + "source": "https://github.com/newfold-labs/wp-module-data/tree/2.6.3", "issues": "https://github.com/newfold-labs/wp-module-data/issues" }, - "time": "2024-08-16T14:18:26+00:00" + "time": "2024-08-30T19:51:58+00:00" }, { "name": "newfold-labs/wp-module-deactivation", From e2ad84aef5a7fcc1e8e254da6770c22b544c9215 Mon Sep 17 00:00:00 2001 From: Dave Ryan Date: Tue, 3 Sep 2024 13:59:32 -0700 Subject: [PATCH 03/13] Update add new post and page launchpads with wb params --- src/app/pages/pages-and-posts/blogPosts.js | 2 +- src/app/pages/pages-and-posts/sitePages.js | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/app/pages/pages-and-posts/blogPosts.js b/src/app/pages/pages-and-posts/blogPosts.js index fe0920101..0a148b765 100644 --- a/src/app/pages/pages-and-posts/blogPosts.js +++ b/src/app/pages/pages-and-posts/blogPosts.js @@ -38,7 +38,7 @@ const BlogPosts = () => { { __( 'View all', 'wp-plugin-bluehost' ) } - + diff --git a/src/app/pages/pages-and-posts/sitePages.js b/src/app/pages/pages-and-posts/sitePages.js index b2cbe38e1..e0c680251 100644 --- a/src/app/pages/pages-and-posts/sitePages.js +++ b/src/app/pages/pages-and-posts/sitePages.js @@ -38,7 +38,7 @@ const SitePages = () => { { __( 'View all', 'wp-plugin-bluehost' ) } - + From 88fa4f36182919b7de4fe8488ceaaa2335b6a70b Mon Sep 17 00:00:00 2001 From: Dave Ryan Date: Tue, 3 Sep 2024 14:06:03 -0700 Subject: [PATCH 04/13] chore: Update page and post creation buttons tests with wb parameters --- tests/cypress/integration/pages-and-posts.cy.js | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/tests/cypress/integration/pages-and-posts.cy.js b/tests/cypress/integration/pages-and-posts.cy.js index dbc0c5ddf..d5d7d6b9f 100644 --- a/tests/cypress/integration/pages-and-posts.cy.js +++ b/tests/cypress/integration/pages-and-posts.cy.js @@ -33,9 +33,9 @@ describe('Pages & Posts', function () { cy.go('back'); cy.get('.wppbh-app-site-page') - .find('a[href="post-new.php?post_type=page"] Button') + .find('a[href="wp-admin/post-new.php?post_type=page&wb-library=patterns&wb-category=features"] Button') .click(); - cy.url().should('include', 'post-new.php?post_type=page'); + cy.url().should('include', 'wp-admin/post-new.php?post_type=page&wb-library=patterns&wb-category=features'); cy.go('back'); }); @@ -48,9 +48,9 @@ describe('Pages & Posts', function () { cy.go('back'); cy.get('.wppbh-app-blog-posts') - .get('a[href="post-new.php"] Button') + .get('a[href="post-new.php?wb-library=patterns&wb-category=text"] Button') .click(); - cy.url().should('include', 'post-new.php'); + cy.url().should('include', 'post-new.php?wb-library=patterns&wb-category=text'); cy.go('back'); }); From 32863c12e18e26f39a2840da4fb49a45947e9c9f Mon Sep 17 00:00:00 2001 From: Dave Ryan Date: Tue, 3 Sep 2024 15:00:50 -0700 Subject: [PATCH 05/13] fix: make sure tests can pass --- tests/cypress/integration/pages-and-posts.cy.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tests/cypress/integration/pages-and-posts.cy.js b/tests/cypress/integration/pages-and-posts.cy.js index d5d7d6b9f..de293bbc0 100644 --- a/tests/cypress/integration/pages-and-posts.cy.js +++ b/tests/cypress/integration/pages-and-posts.cy.js @@ -33,9 +33,9 @@ describe('Pages & Posts', function () { cy.go('back'); cy.get('.wppbh-app-site-page') - .find('a[href="wp-admin/post-new.php?post_type=page&wb-library=patterns&wb-category=features"] Button') + .find('a[href="post-new.php?post_type=page&wb-library=patterns&wb-category=features"] Button') .click(); - cy.url().should('include', 'wp-admin/post-new.php?post_type=page&wb-library=patterns&wb-category=features'); + cy.url().should('include', 'post-new.php?post_type=page&wb-library=patterns&wb-category=features'); cy.go('back'); }); From 46be3c3a3ab4463c2a5ba1d950c45bc285db286e Mon Sep 17 00:00:00 2001 From: wpalani Date: Tue, 3 Sep 2024 18:20:47 -0700 Subject: [PATCH 06/13] Bump Data module to 2.6.3 --- composer.json | 2 +- composer.lock | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/composer.json b/composer.json index 209e3bf84..bd687e645 100644 --- a/composer.json +++ b/composer.json @@ -76,7 +76,7 @@ "newfold-labs/wp-module-atomic": "^1.3.0", "newfold-labs/wp-module-coming-soon": "^1.2.6", "newfold-labs/wp-module-context": "^1.0.1", - "newfold-labs/wp-module-data": "^2.6.2", + "newfold-labs/wp-module-data": "^2.6.3", "newfold-labs/wp-module-deactivation": "^1.2.3", "newfold-labs/wp-module-ecommerce": "^1.3.41", "newfold-labs/wp-module-facebook": "^1.0.9", diff --git a/composer.lock b/composer.lock index 76dff3bb9..9f479b596 100644 --- a/composer.lock +++ b/composer.lock @@ -4,7 +4,7 @@ "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies", "This file is @generated automatically" ], - "content-hash": "dedb5661bbfc7ad43b6696ea95ac9120", + "content-hash": "b2741412bef32325a0905cf637ee5b73", "packages": [ { "name": "doctrine/inflector", From 6bd1ab71f8c3236705359a84c314c87fa6a05f0f Mon Sep 17 00:00:00 2001 From: wpalani Date: Tue, 3 Sep 2024 18:21:52 -0700 Subject: [PATCH 07/13] Skip WonderBlocks tests on WP versions older than 6.6 --- cypress.config.js | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/cypress.config.js b/cypress.config.js index 84f28f8a1..52420b2f7 100644 --- a/cypress.config.js +++ b/cypress.config.js @@ -63,6 +63,13 @@ module.exports = defineConfig( { ] ); } + // Exclude WonderBlocks tests for WordPress lower than 6.6 (6.5 or 6.4) + if ( semver.satisfies( config.env.wpSemverVersion, '<6.6.0' ) ) { + config.excludeSpecPattern = config.excludeSpecPattern.concat( [ + 'vendor/newfold-labs/wp-module-wonderblocks/tests/cypress/integration/**', + ] ); + } + return config; }, baseUrl: 'http://localhost:8882', From ea788aedf46b9a53fb1e2585cdc2e94d88fff46c Mon Sep 17 00:00:00 2001 From: wpalani Date: Tue, 3 Sep 2024 18:45:38 -0700 Subject: [PATCH 08/13] Fix oatterns module path --- cypress.config.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cypress.config.js b/cypress.config.js index 52420b2f7..e195d91e6 100644 --- a/cypress.config.js +++ b/cypress.config.js @@ -66,7 +66,7 @@ module.exports = defineConfig( { // Exclude WonderBlocks tests for WordPress lower than 6.6 (6.5 or 6.4) if ( semver.satisfies( config.env.wpSemverVersion, '<6.6.0' ) ) { config.excludeSpecPattern = config.excludeSpecPattern.concat( [ - 'vendor/newfold-labs/wp-module-wonderblocks/tests/cypress/integration/**', + 'vendor/newfold-labs/wp-module-patterns/tests/cypress/integration/**', ] ); } From 21fe23451a2b5a0b041f434d9c01eaf42613f6e4 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 4 Sep 2024 17:24:45 +0000 Subject: [PATCH 09/13] Composer(deps): Bump newfold-labs/wp-module-patterns from 2.4.0 to 2.4.1 Bumps [newfold-labs/wp-module-patterns](https://github.com/newfold-labs/wp-module-patterns) from 2.4.0 to 2.4.1. - [Release notes](https://github.com/newfold-labs/wp-module-patterns/releases) - [Commits](https://github.com/newfold-labs/wp-module-patterns/compare/2.4.0...2.4.1) --- updated-dependencies: - dependency-name: newfold-labs/wp-module-patterns dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- composer.json | 2 +- composer.lock | 44 ++++++++++++++++++++++---------------------- 2 files changed, 23 insertions(+), 23 deletions(-) diff --git a/composer.json b/composer.json index a5a736be1..cf04230c4 100644 --- a/composer.json +++ b/composer.json @@ -88,7 +88,7 @@ "newfold-labs/wp-module-migration": "^1.0.11", "newfold-labs/wp-module-notifications": "^1.5.0", "newfold-labs/wp-module-onboarding": "^2.3.11", - "newfold-labs/wp-module-patterns": "^2.4.0", + "newfold-labs/wp-module-patterns": "^2.4.1", "newfold-labs/wp-module-performance": "2.0.1 as 1.9.9", "newfold-labs/wp-module-runtime": "^1.0.11", "newfold-labs/wp-module-secure-passwords": "^1.1.1", diff --git a/composer.lock b/composer.lock index db35ba7e2..04fa4eb00 100644 --- a/composer.lock +++ b/composer.lock @@ -4,7 +4,7 @@ "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies", "This file is @generated automatically" ], - "content-hash": "3a63321309e5d03dcc3cf0c32c9e4561", + "content-hash": "bbe0a435021b44d6acfbf6618ed4f699", "packages": [ { "name": "doctrine/inflector", @@ -830,36 +830,36 @@ }, { "name": "newfold-labs/wp-module-data", - "version": "2.6.2", + "version": "2.6.3", "source": { "type": "git", "url": "https://github.com/newfold-labs/wp-module-data.git", - "reference": "91d1b03162f23b7b8bd3a41d9496eb8017df0051" + "reference": "f98dfabe6a4cb10aec6dcd6e81fc7d269238e9a4" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/newfold-labs/wp-module-data/zipball/91d1b03162f23b7b8bd3a41d9496eb8017df0051", - "reference": "91d1b03162f23b7b8bd3a41d9496eb8017df0051", + "url": "https://api.github.com/repos/newfold-labs/wp-module-data/zipball/f98dfabe6a4cb10aec6dcd6e81fc7d269238e9a4", + "reference": "f98dfabe6a4cb10aec6dcd6e81fc7d269238e9a4", "shasum": "" }, "require": { "ext-json": "*", - "newfold-labs/wp-module-loader": "^1.0", + "newfold-labs/wp-module-loader": "^1.0.10", "wp-forge/helpers": "^2.0", - "wp-forge/wp-query-builder": "^1.0", + "wp-forge/wp-query-builder": "^1.0.4", "wp-forge/wp-upgrade-handler": "^1.0", - "wpscholar/url": "^1.2" + "wpscholar/url": "^1.2.2" }, "require-dev": { "10up/wp_mock": "^0.4.2", - "bluehost/bluehost-wordpress-plugin": "*", - "brianhenryie/composer-phpstorm": "*", - "johnpbloch/wordpress": "*", + "bluehost/bluehost-wordpress-plugin": ">=3.1", + "brianhenryie/composer-phpstorm": ">=0.4", + "johnpbloch/wordpress": ">=6.5.3", "kporras07/composer-symlinks": "^1.2", - "lucatume/wp-browser": "^3", - "newfold-labs/wp-php-standards": "^1.2", + "lucatume/wp-browser": "^3.5.8", + "newfold-labs/wp-php-standards": "^1.2.3", "phpunit/phpcov": "^5.0", - "wpackagist-plugin/woocommerce": "*" + "wpackagist-plugin/woocommerce": ">=9" }, "type": "library", "extra": { @@ -921,10 +921,10 @@ ], "description": "Newfold Data Module", "support": { - "source": "https://github.com/newfold-labs/wp-module-data/tree/2.6.2", + "source": "https://github.com/newfold-labs/wp-module-data/tree/2.6.3", "issues": "https://github.com/newfold-labs/wp-module-data/issues" }, - "time": "2024-08-16T14:18:26+00:00" + "time": "2024-08-30T19:51:58+00:00" }, { "name": "newfold-labs/wp-module-deactivation", @@ -1642,16 +1642,16 @@ }, { "name": "newfold-labs/wp-module-patterns", - "version": "2.4.0", + "version": "2.4.1", "source": { "type": "git", "url": "https://github.com/newfold-labs/wp-module-patterns.git", - "reference": "dabe7f8de5ee83400021e4e12374486086248eea" + "reference": "2d8bb11201123adc6505afd89af6494490f929ed" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/newfold-labs/wp-module-patterns/zipball/dabe7f8de5ee83400021e4e12374486086248eea", - "reference": "dabe7f8de5ee83400021e4e12374486086248eea", + "url": "https://api.github.com/repos/newfold-labs/wp-module-patterns/zipball/2d8bb11201123adc6505afd89af6494490f929ed", + "reference": "2d8bb11201123adc6505afd89af6494490f929ed", "shasum": "" }, "require": { @@ -1689,10 +1689,10 @@ ], "description": "WordPress Cloud Patterns", "support": { - "source": "https://github.com/newfold-labs/wp-module-patterns/tree/2.4.0", + "source": "https://github.com/newfold-labs/wp-module-patterns/tree/2.4.1", "issues": "https://github.com/newfold-labs/wp-module-patterns/issues" }, - "time": "2024-08-30T12:44:15+00:00" + "time": "2024-09-04T13:49:43+00:00" }, { "name": "newfold-labs/wp-module-performance", From c38268a3ca3058b9d9585850009576a95c7819d7 Mon Sep 17 00:00:00 2001 From: wpalani Date: Wed, 4 Sep 2024 11:24:34 -0700 Subject: [PATCH 10/13] Remove WonderBlocks tests skip WonderBlocks now work on older versions of WordPress --- cypress.config.js | 7 ------- 1 file changed, 7 deletions(-) diff --git a/cypress.config.js b/cypress.config.js index e195d91e6..84f28f8a1 100644 --- a/cypress.config.js +++ b/cypress.config.js @@ -63,13 +63,6 @@ module.exports = defineConfig( { ] ); } - // Exclude WonderBlocks tests for WordPress lower than 6.6 (6.5 or 6.4) - if ( semver.satisfies( config.env.wpSemverVersion, '<6.6.0' ) ) { - config.excludeSpecPattern = config.excludeSpecPattern.concat( [ - 'vendor/newfold-labs/wp-module-patterns/tests/cypress/integration/**', - ] ); - } - return config; }, baseUrl: 'http://localhost:8882', From 90365a6109bc926691e350193629bbb5a3ccc383 Mon Sep 17 00:00:00 2001 From: wpalani Date: Wed, 4 Sep 2024 11:34:41 -0700 Subject: [PATCH 11/13] Revert "Remove WonderBlocks tests skip" This reverts commit c38268a3ca3058b9d9585850009576a95c7819d7. --- cypress.config.js | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/cypress.config.js b/cypress.config.js index 84f28f8a1..e195d91e6 100644 --- a/cypress.config.js +++ b/cypress.config.js @@ -63,6 +63,13 @@ module.exports = defineConfig( { ] ); } + // Exclude WonderBlocks tests for WordPress lower than 6.6 (6.5 or 6.4) + if ( semver.satisfies( config.env.wpSemverVersion, '<6.6.0' ) ) { + config.excludeSpecPattern = config.excludeSpecPattern.concat( [ + 'vendor/newfold-labs/wp-module-patterns/tests/cypress/integration/**', + ] ); + } + return config; }, baseUrl: 'http://localhost:8882', From cab78d7a581c6b5a063d450bc3b2872ac531abf1 Mon Sep 17 00:00:00 2001 From: wpalani Date: Wed, 4 Sep 2024 11:43:03 -0700 Subject: [PATCH 12/13] Bump patterns module to 2.4.1 --- composer.json | 2 +- composer.lock | 14 +++++++------- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/composer.json b/composer.json index bd687e645..94753f5b2 100644 --- a/composer.json +++ b/composer.json @@ -88,7 +88,7 @@ "newfold-labs/wp-module-migration": "^1.0.11", "newfold-labs/wp-module-notifications": "^1.5.0", "newfold-labs/wp-module-onboarding": "^2.3.11", - "newfold-labs/wp-module-patterns": "^2.4.0", + "newfold-labs/wp-module-patterns": "^2.4.1", "newfold-labs/wp-module-performance": "2.0.1 as 1.9.9", "newfold-labs/wp-module-runtime": "^1.0.11", "newfold-labs/wp-module-secure-passwords": "^1.1.1", diff --git a/composer.lock b/composer.lock index 9f479b596..314b4b695 100644 --- a/composer.lock +++ b/composer.lock @@ -4,7 +4,7 @@ "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies", "This file is @generated automatically" ], - "content-hash": "b2741412bef32325a0905cf637ee5b73", + "content-hash": "6cb19b13ff307ad98af2649af4473ce2", "packages": [ { "name": "doctrine/inflector", @@ -1642,16 +1642,16 @@ }, { "name": "newfold-labs/wp-module-patterns", - "version": "2.4.0", + "version": "2.4.1", "source": { "type": "git", "url": "https://github.com/newfold-labs/wp-module-patterns.git", - "reference": "dabe7f8de5ee83400021e4e12374486086248eea" + "reference": "2d8bb11201123adc6505afd89af6494490f929ed" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/newfold-labs/wp-module-patterns/zipball/dabe7f8de5ee83400021e4e12374486086248eea", - "reference": "dabe7f8de5ee83400021e4e12374486086248eea", + "url": "https://api.github.com/repos/newfold-labs/wp-module-patterns/zipball/2d8bb11201123adc6505afd89af6494490f929ed", + "reference": "2d8bb11201123adc6505afd89af6494490f929ed", "shasum": "" }, "require": { @@ -1689,10 +1689,10 @@ ], "description": "WordPress Cloud Patterns", "support": { - "source": "https://github.com/newfold-labs/wp-module-patterns/tree/2.4.0", + "source": "https://github.com/newfold-labs/wp-module-patterns/tree/2.4.1", "issues": "https://github.com/newfold-labs/wp-module-patterns/issues" }, - "time": "2024-08-30T12:44:15+00:00" + "time": "2024-09-04T13:49:43+00:00" }, { "name": "newfold-labs/wp-module-performance", From 91d6fe06256c4500d6818b896f036288536cbaa8 Mon Sep 17 00:00:00 2001 From: wpalani Date: Wed, 4 Sep 2024 11:43:27 -0700 Subject: [PATCH 13/13] Reapply "Remove WonderBlocks tests skip" This reverts commit 90365a6109bc926691e350193629bbb5a3ccc383. --- cypress.config.js | 7 ------- 1 file changed, 7 deletions(-) diff --git a/cypress.config.js b/cypress.config.js index e195d91e6..84f28f8a1 100644 --- a/cypress.config.js +++ b/cypress.config.js @@ -63,13 +63,6 @@ module.exports = defineConfig( { ] ); } - // Exclude WonderBlocks tests for WordPress lower than 6.6 (6.5 or 6.4) - if ( semver.satisfies( config.env.wpSemverVersion, '<6.6.0' ) ) { - config.excludeSpecPattern = config.excludeSpecPattern.concat( [ - 'vendor/newfold-labs/wp-module-patterns/tests/cypress/integration/**', - ] ); - } - return config; }, baseUrl: 'http://localhost:8882',