Skip to content
This repository was archived by the owner on Jan 30, 2025. It is now read-only.

Commit b12e1d7

Browse files
circlecubecirclecube
authored
Merge pull request #1447 from bluehost/release/3.15.6
Release/3.15.6
2 parents 2d6179d + e6a5370 commit b12e1d7

File tree

10 files changed

+261
-209
lines changed

10 files changed

+261
-209
lines changed

‎.github/workflows/cypress-matrix.yml‎

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -111,7 +111,11 @@ jobs:
111111
echo '{"wpVersion": "${{ matrix.wpVersion }}","phpVersion": "${{ matrix.phpVersion }}"}' > cypress.env.json
112112
113113
- name: Install WordPress
114-
run: npx wp-env start --debug
114+
uses: nick-fields/retry@v3
115+
with:
116+
timeout_minutes: 4
117+
max_attempts: 3
118+
command: npx wp-env start --debug
115119

116120
- name: Run Cypress Tests
117121
if: ${{ github.repository != 'bluehost/bluehost-wordpress-plugin' || github.actor == 'dependabot[bot]' }}

‎.github/workflows/cypress.yml‎

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -99,7 +99,11 @@ jobs:
9999
run: echo '{"plugins":["${{ steps.workflow.outputs.DIST }}/${{ steps.workflow.outputs.PACKAGE }}"]}' > .wp-env.override.json
100100

101101
- name: Install WordPress
102-
run: npx wp-env start --debug
102+
uses: nick-fields/retry@v3
103+
with:
104+
timeout_minutes: 4
105+
max_attempts: 3
106+
command: npx wp-env start --debug
103107

104108
- name: Run Cypress Tests
105109
if: ${{ github.repository != 'bluehost/bluehost-wordpress-plugin' || github.actor == 'dependabot[bot]' }}

‎bluehost-wordpress-plugin.php‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
* Plugin URI: https://bluehost.com
1313
* Update URI: https://github.com/bluehost/bluehost-wordpress-plugin
1414
* Description: WordPress plugin that integrates a WordPress site with the Bluehost control panel, including performance, security, and update features.
15-
* Version: 3.15.5
15+
* Version: 3.15.6
1616
* Requires at least: 6.5
1717
* Requires PHP: 7.3
1818
* Tested up to: 6.7.1
@@ -32,7 +32,7 @@
3232
}
3333

3434
// Define constants
35-
define( 'BLUEHOST_PLUGIN_VERSION', '3.15.5' );
35+
define( 'BLUEHOST_PLUGIN_VERSION', '3.15.6' );
3636
define( 'BLUEHOST_PLUGIN_FILE', __FILE__ );
3737
define( 'BLUEHOST_PLUGIN_DIR', plugin_dir_path( __FILE__ ) );
3838
define( 'BLUEHOST_PLUGIN_URL', plugin_dir_url( __FILE__ ) );

‎bootstrap.php‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,6 @@
1111
use WP_Forge\UpgradeHandler\UpgradeHandler;
1212
use NewfoldLabs\WP\ModuleLoader\Container;
1313
use NewfoldLabs\WP\ModuleLoader\Plugin;
14-
use NewfoldLabs\WP\Context\Context;
1514
use NewfoldLabs\WP\Module\Features\Features;
1615
use function NewfoldLabs\WP\ModuleLoader\container as setContainer;
1716
use function NewfoldLabs\WP\Context\setContext;
@@ -80,8 +79,7 @@ function () {
8079
$bluehost_module_container->set( 'cache_types', $cache_types );
8180
$bluehost_module_container->set( 'marketplace_brand', $marketplace_brand );
8281
}
83-
},
84-
11
82+
}
8583
);
8684

8785
// Properly get branding links depending on market

‎composer.json‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -74,11 +74,11 @@
7474
"require": {
7575
"newfold-labs/wp-module-activation": "^1.0.5",
7676
"newfold-labs/wp-module-atomic": "^1.3.0",
77-
"newfold-labs/wp-module-coming-soon": "^1.2.6",
77+
"newfold-labs/wp-module-coming-soon": "^1.3.2",
7878
"newfold-labs/wp-module-context": "^1.0.1",
7979
"newfold-labs/wp-module-data": "^2.6.7",
8080
"newfold-labs/wp-module-deactivation": "^1.2.3",
81-
"newfold-labs/wp-module-ecommerce": "^1.4.3",
81+
"newfold-labs/wp-module-ecommerce": "^1.4.4",
8282
"newfold-labs/wp-module-facebook": "^1.0.9",
8383
"newfold-labs/wp-module-features": "^1.4.2",
8484
"newfold-labs/wp-module-global-ctb": "^1.0.13",
@@ -95,7 +95,7 @@
9595
"newfold-labs/wp-module-pls": "^1.0.0",
9696
"newfold-labs/wp-module-runtime": "^1.0.12",
9797
"newfold-labs/wp-module-secure-passwords": "^1.1.1",
98-
"newfold-labs/wp-module-solutions": "^1.0.6",
98+
"newfold-labs/wp-module-solutions": "^1.0.7",
9999
"newfold-labs/wp-module-sso": "^1.0.7",
100100
"newfold-labs/wp-module-staging": "^2.1.1",
101101
"wp-forge/wp-update-handler": "^1.0.2",

‎composer.lock‎

Lines changed: 34 additions & 29 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎cypress.config.js‎

Lines changed: 52 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -28,8 +28,6 @@ module.exports = defineConfig( {
2828
],
2929
e2e: {
3030
setupNodeEvents( on, config ) {
31-
const semver = require( 'semver' );
32-
3331
// Ensure that the base URL is always properly set.
3432
if ( config.env && config.env.baseUrl ) {
3533
config.baseUrl = config.env.baseUrl;
@@ -53,13 +51,27 @@ module.exports = defineConfig( {
5351
}
5452
}
5553

56-
// Exclude Onboarding and ecommerce tests for WordPress lower than 6.5 (6.4 or 6.3) or PHP lower than 7.4 (7.1, 7.2 and 7.3)
57-
if ( semver.satisfies( config.env.wpSemverVersion, '<6.5.0' ) || semver.satisfies( config.env.phpSemverVersion, '<7.4.0' )) {
54+
// Tests require Wondor Theme, exclude if not supported due to WP or PHP versions
55+
if ( ! supportsWonderTheme( config.env ) ) {
56+
config.excludeSpecPattern = config.excludeSpecPattern.concat( [
57+
'vendor/newfold-labs/wp-module-onboarding/tests/cypress/integration/**', // Onboarding requires Wonder Theme
58+
'vendor/newfold-labs/wp-module-ecommerce/tests/cypress/integration/Home/ecommerce-next-steps.cy.js', // Requires Onboarding
59+
] );
60+
}
61+
62+
// Tests requires Woo, so exclude if not supported due to WP or PHP versions
63+
if ( ! supportsWoo( config.env ) ) {
5864
config.excludeSpecPattern = config.excludeSpecPattern.concat( [
5965
'vendor/newfold-labs/wp-module-ecommerce/tests/cypress/integration/Site-Capabilities/**',
6066
'vendor/newfold-labs/wp-module-ecommerce/tests/cypress/integration/Home/homePageWithWoo.cy.js',
61-
'vendor/newfold-labs/wp-module-ecommerce/tests/cypress/integration/Home/ecommerce-next-steps.cy.js', // Skip this since Onboarding does not support this version
62-
'vendor/newfold-labs/wp-module-onboarding/tests/cypress/integration/**' // Onboarding requires WP 6.5 or greater, as it uses the Wonder Theme which has the same requirement
67+
'vendor/newfold-labs/wp-module-coming-soon/tests/cypress/integration/coming-soon-woo.cy.js',
68+
] );
69+
}
70+
71+
// Test requires Jetpack, so exclude if not supported due to WP or PHP versions
72+
if ( ! supportsJetpack( config.env ) ) {
73+
config.excludeSpecPattern = config.excludeSpecPattern.concat( [
74+
'vendor/newfold-labs/wp-module-solutions/tests/cypress/integration/wp-plugins-installation-check.cy.js',
6375
] );
6476
}
6577

@@ -81,3 +93,37 @@ module.exports = defineConfig( {
8193
retries: 1,
8294
experimentalMemoryManagement: true,
8395
} );
96+
97+
// Check against plugin support at https://wordpress.org/plugins/woocommerce/
98+
const supportsWoo = ( env ) => {
99+
const semver = require( 'semver' );
100+
if (
101+
semver.satisfies( env.wpSemverVersion, '>=6.5.0' ) &&
102+
semver.satisfies( env.phpSemverVersion, '>=7.4.0' )
103+
) {
104+
return true;
105+
}
106+
return false;
107+
};
108+
// Check against plugin support at https://wordpress.org/plugins/jetpack/
109+
const supportsJetpack = ( env ) => {
110+
const semver = require( 'semver' );
111+
if (
112+
semver.satisfies( env.wpSemverVersion, '>=6.6.0' ) &&
113+
semver.satisfies( env.phpSemverVersion, '>=7.2.0' )
114+
) {
115+
return true;
116+
}
117+
return false;
118+
};
119+
// Check against theme support at https://github.com/newfold-labs/yith-wonder/blob/master/style.css
120+
const supportsWonderTheme = ( env ) => {
121+
const semver = require( 'semver' );
122+
if (
123+
semver.satisfies( env.wpSemverVersion, '>=6.5.0' ) &&
124+
semver.satisfies( env.phpSemverVersion, '>=7.0.0' )
125+
) {
126+
return true;
127+
}
128+
return false;
129+
};

0 commit comments

Comments
 (0)