Skip to content

Commit

Permalink
Merge pull request #496 from newfold-labs/release/2.1.5
Browse files Browse the repository at this point in the history
Release/2.1.5
  • Loading branch information
circlecube authored Dec 4, 2024
2 parents df0c077 + 4a2a7a2 commit 69aba3b
Show file tree
Hide file tree
Showing 15 changed files with 3,439 additions and 2,703 deletions.
2 changes: 1 addition & 1 deletion .wp-env.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"core": "WordPress/WordPress#tags/6.6.2",
"core": "WordPress/WordPress#tags/6.7.1",
"config": {
"WP_DEBUG": true,
"WP_DEBUG_LOG": true,
Expand Down
16 changes: 8 additions & 8 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -74,29 +74,29 @@
"doctrine/inflector": "1.2.0 as 1.3.1",
"newfold-labs/wp-module-activation": "^1.0.5",
"newfold-labs/wp-module-atomic": "^1.3",
"newfold-labs/wp-module-coming-soon": "^1.2.6",
"newfold-labs/wp-module-coming-soon": "^1.3.1",
"newfold-labs/wp-module-context": "^1.0.1",
"newfold-labs/wp-module-data": "^2.6.5",
"newfold-labs/wp-module-data": "^2.6.7",
"newfold-labs/wp-module-deactivation": "^1.2.3",
"newfold-labs/wp-module-ecommerce": "^1.4.1",
"newfold-labs/wp-module-ecommerce": "^1.4.4",
"newfold-labs/wp-module-features": "^1.4.2",
"newfold-labs/wp-module-loader": "^1.0.10",
"newfold-labs/wp-module-marketplace": "^2.4.0",
"newfold-labs/wp-module-migration": "^1.0.12",
"newfold-labs/wp-module-notifications": "^1.6.1",
"newfold-labs/wp-module-onboarding": "^2.5.2",
"newfold-labs/wp-module-patterns": "^2.6.0",
"newfold-labs/wp-module-notifications": "^1.6.6",
"newfold-labs/wp-module-onboarding": "^2.5.5",
"newfold-labs/wp-module-patterns": "^2.8.0",
"newfold-labs/wp-module-performance": "^2.0.1",
"newfold-labs/wp-module-runtime": "^1.0.12",
"newfold-labs/wp-module-secure-passwords": "^1.1.1",
"newfold-labs/wp-module-sso": "^1.0.6",
"newfold-labs/wp-module-sso": "^1.0.7",
"wp-forge/wp-update-handler": "^1.0.2",
"wp-forge/wp-upgrade-handler": "^1.0"
},
"require-dev": {
"newfold-labs/wp-php-standards": "^1.2.4",
"roave/security-advisories": "dev-latest",
"wp-cli/i18n-command": "^2.6.3",
"wp-phpunit/wp-phpunit": "^6.6.2"
"wp-phpunit/wp-phpunit": "^6.7.1"
}
}
244 changes: 138 additions & 106 deletions composer.lock

Large diffs are not rendered by default.

22 changes: 13 additions & 9 deletions cypress.config.js
Original file line number Diff line number Diff line change
Expand Up @@ -53,17 +53,21 @@ module.exports = defineConfig({
}
}

// Exclude 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)
// Exclude 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)
// Since WooCommerce is unsupported, activation/deactivation/installation is going to fail
if ( semver.satisfies( config.env.wpSemverVersion, '<6.5.0' ) || semver.satisfies( config.env.phpSemverVersion, '<7.4.0' )) {
config.excludeSpecPattern = config.excludeSpecPattern.concat( [
'vendor/newfold-labs/wp-module-ecommerce/tests/cypress/integration/Site-Capabilities/**',
'vendor/newfold-labs/wp-module-ecommerce/tests/cypress/integration/Home/homePageWithWoo.cy.js',
'vendor/newfold-labs/wp-module-ecommerce/tests/cypress/integration/Home/ecommerce-next-steps.cy.js', // Skip this since Onboarding does not support this version
if (
semver.satisfies( config.env.wpSemverVersion, '<6.5.0' ) ||
semver.satisfies( config.env.phpSemverVersion, '<7.4.0' )
) {
config.excludeSpecPattern = config.excludeSpecPattern.concat( [
'vendor/newfold-labs/wp-module-ecommerce/tests/cypress/integration/Site-Capabilities/**',
'vendor/newfold-labs/wp-module-ecommerce/tests/cypress/integration/Home/homePageWithWoo.cy.js',
'vendor/newfold-labs/wp-module-ecommerce/tests/cypress/integration/Home/ecommerce-next-steps.cy.js', // Skip this since Onboarding does not support this version
'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
'vendor/newfold-labs/wp-module-coming-soon/tests/cypress/integration/coming-soon-woo.cy.js', // woo is required and is not supported in older WP or PHP
'vendor/newfold-labs/wp-module-ecommerce/tests/cypress/integration/Store/**',
'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
] );
}
] );
}

on('task', {
log(message) {
Expand Down
Loading

0 comments on commit 69aba3b

Please sign in to comment.