Merge branch 'trunk' into PRESS4-545-Lint-Fixes

newfold-labs · Jul 10, 2024 · 23f8082 · 23f8082
2 parents 5f7781f + 35acde7
commit 23f8082
Show file tree

Hide file tree

Showing 10 changed files with 65 additions and 69 deletions.
diff --git a/bootstrap.php b/bootstrap.php
@@ -5,7 +5,7 @@
 
 use function NewfoldLabs\WP\ModuleLoader\register;
 
-define( 'NFD_ECOMMERCE_MODULE_VERSION', '1.3.35' );
+define( 'NFD_ECOMMERCE_MODULE_VERSION', '1.3.36' );
 
 if ( function_exists( 'is_admin' ) && is_admin() ) {
 	$old_woocommerce_module_version = get_option( 'nfd_ecommerce_module_version' );

diff --git a/composer.lock b/composer.lock
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -2,7 +2,7 @@
   "name": "@newfold-labs/wp-module-ecommerce",
   "description": "Brand Agnostic eCommerce Experience",
   "license": "GPL-2.0-or-later",
-  "version": "1.3.35",
+  "version": "1.3.36",
   "main": "build/index.js",
   "files": [
     "build/",

diff --git a/tests/cypress/integration/Home/ecommerce-coming-soon.cy.js b/tests/cypress/integration/Home/ecommerce-coming-soon.cy.js
@@ -4,19 +4,16 @@ import {
 	comingSoon,
 	uninstallPlugins,
 } from '../wp-module-support/utils.cy';
-import { EventsAPI, APIList } from '../wp-module-support/eventsAPIs.cy';
 
 const customCommandTimeout = 20000;
 const pluginId = GetPluginId();
-const hg_region = 'br';
 
 describe(
 	'e-commerce Home Page- Coming soon mode',
 	{ testIsolation: true },
 	() => {
 		beforeEach( () => {
 			wpLogin();
-			uninstallPlugins();
 			comingSoon( true );
 			cy.visit( '/wp-admin/admin.php?page=' + pluginId + '#/home' );
 		} );

diff --git a/tests/cypress/integration/Home/ecommerce-live.cy.js b/tests/cypress/integration/Home/ecommerce-live.cy.js
@@ -2,7 +2,6 @@ import { GetPluginId } from '../wp-module-support/pluginID.cy';
 import {
 	wpLogin,
 	comingSoon,
-	uninstallPlugins,
 } from '../wp-module-support/utils.cy';
 
 const customCommandTimeout = 20000;
@@ -11,7 +10,6 @@ const pluginId = GetPluginId();
 describe( 'e-commerce Home Page- Live Mode', { testIsolation: true }, () => {
 	beforeEach( () => {
 		wpLogin();
-		uninstallPlugins();
 		comingSoon( false );
 		cy.visit( '/wp-admin/admin.php?page=' + pluginId + '#/home' );
 	} );

diff --git a/tests/cypress/integration/Home/ecommerce-next-steps.cy.js b/tests/cypress/integration/Home/ecommerce-next-steps.cy.js
@@ -1,7 +1,6 @@
 import { GetPluginId } from '../wp-module-support/pluginID.cy';
 import {
 	wpLogin,
-	comingSoon,
 	viewCompletedTasks,
 	viewRemainingTasks,
 } from '../wp-module-support/utils.cy';
@@ -155,17 +154,11 @@ describe( 'e-commerce Home Page- Next Steps', () => {
 			.scrollIntoView()
 			.invoke( 'removeAttr', 'target' )
 			.click();
-		if ( pluginId == 'crazy-domains' ) {
-			cy.url().should(
-				'equal',
-				`https://my.yoast.com/signup?redirect_to=https://academy.yoast.com/courses/?utm_medium=crazydomains_plugin&utm_source=wp-home`
-			);
-		} else {
-			cy.url().should(
-				'equal',
-				`https://my.yoast.com/signup?redirect_to=https://academy.yoast.com/courses/?utm_medium=${ pluginId }_plugin&utm_source=wp-home`
+			cy.url()
+				.should(
+				'contain',
+				'https://my.yoast.com/signup?redirect_to=https://academy.yoast.com/courses/'
 			);
-		}
 		cy.go( 'back' );
 		EventsAPI( APIList.yoast_seo_academy, pluginId );
 

diff --git a/tests/cypress/integration/Home/homePageWithWoo.cy.js b/tests/cypress/integration/Home/homePageWithWoo.cy.js
@@ -16,10 +16,12 @@ describe(
 	'e-commerce Home Page - When WooCommerce is installed',
 	{ testIsolation: true },
 	() => {
+		before(() => {
+			installWoo();
+		});
+
 		beforeEach( () => {
 			wpLogin();
-			uninstallPlugins();
-			installWoo();
 			cy.visit( '/wp-admin/admin.php?page=' + pluginId + '#/home' );
 		} );
 
@@ -28,6 +30,7 @@ describe(
 		} );
 
 		it( 'Verify next steps "Add your store info"', () => {
+			cy.reload();
 			waitForNextSteps();
 			cy.get( '#add-your-store-info a', {
 				timeout: customCommandTimeout,
@@ -86,7 +89,11 @@ describe(
 			viewRemainingTasks();
 		} );
 
-		it( 'Verify next step "Connect a payment processor"', () => {
+		it( 'Verify next step "Connect a payment processor"', function () {
+			// Razorpay is not enabled for crazy-domains, hense skipping
+			if (pluginId == 'crazy-domains') { 
+				this.skip();
+			}
 			cy.reload();
 			waitForNextSteps();
 			cy.get( '#connect-a-payment-processor a', {