diff --git a/bootstrap.php b/bootstrap.php index c1f820351..ba7901fbb 100644 --- a/bootstrap.php +++ b/bootstrap.php @@ -24,7 +24,7 @@ function nfd_wp_module_onboarding_register() { // Set Global Constants if ( ! defined( 'NFD_ONBOARDING_VERSION' ) ) { - define( 'NFD_ONBOARDING_VERSION', '1.12.0' ); + define( 'NFD_ONBOARDING_VERSION', '1.12.1' ); } if ( ! defined( 'NFD_ONBOARDING_DIR' ) ) { define( 'NFD_ONBOARDING_DIR', __DIR__ ); diff --git a/build/1.12.0/111.js b/build/1.12.1/111.js similarity index 100% rename from build/1.12.0/111.js rename to build/1.12.1/111.js diff --git a/build/1.12.0/128.js b/build/1.12.1/128.js similarity index 100% rename from build/1.12.0/128.js rename to build/1.12.1/128.js diff --git a/build/1.12.0/244.js b/build/1.12.1/244.js similarity index 100% rename from build/1.12.0/244.js rename to build/1.12.1/244.js diff --git a/build/1.12.0/310.js b/build/1.12.1/310.js similarity index 100% rename from build/1.12.0/310.js rename to build/1.12.1/310.js diff --git a/build/1.12.0/33.js b/build/1.12.1/33.js similarity index 100% rename from build/1.12.0/33.js rename to build/1.12.1/33.js diff --git a/build/1.12.0/405.js b/build/1.12.1/405.js similarity index 100% rename from build/1.12.0/405.js rename to build/1.12.1/405.js diff --git a/build/1.12.0/420.js b/build/1.12.1/420.js similarity index 100% rename from build/1.12.0/420.js rename to build/1.12.1/420.js diff --git a/build/1.12.0/449.js b/build/1.12.1/449.js similarity index 100% rename from build/1.12.0/449.js rename to build/1.12.1/449.js diff --git a/build/1.12.0/465.js b/build/1.12.1/465.js similarity index 100% rename from build/1.12.0/465.js rename to build/1.12.1/465.js diff --git a/build/1.12.0/491.js b/build/1.12.1/491.js similarity index 100% rename from build/1.12.0/491.js rename to build/1.12.1/491.js diff --git a/build/1.12.0/537.js b/build/1.12.1/537.js similarity index 100% rename from build/1.12.0/537.js rename to build/1.12.1/537.js diff --git a/build/1.12.0/574.js b/build/1.12.1/574.js similarity index 100% rename from build/1.12.0/574.js rename to build/1.12.1/574.js diff --git a/build/1.12.0/58.js b/build/1.12.1/58.js similarity index 100% rename from build/1.12.0/58.js rename to build/1.12.1/58.js diff --git a/build/1.12.0/657.js b/build/1.12.1/657.js similarity index 100% rename from build/1.12.0/657.js rename to build/1.12.1/657.js diff --git a/build/1.12.0/662.js b/build/1.12.1/662.js similarity index 100% rename from build/1.12.0/662.js rename to build/1.12.1/662.js diff --git a/build/1.12.0/696.js b/build/1.12.1/696.js similarity index 100% rename from build/1.12.0/696.js rename to build/1.12.1/696.js diff --git a/build/1.12.0/704.js b/build/1.12.1/704.js similarity index 100% rename from build/1.12.0/704.js rename to build/1.12.1/704.js diff --git a/build/1.12.0/719.js b/build/1.12.1/719.js similarity index 100% rename from build/1.12.0/719.js rename to build/1.12.1/719.js diff --git a/build/1.12.0/73.js b/build/1.12.1/73.js similarity index 100% rename from build/1.12.0/73.js rename to build/1.12.1/73.js diff --git a/build/1.12.0/76.js b/build/1.12.1/76.js similarity index 100% rename from build/1.12.0/76.js rename to build/1.12.1/76.js diff --git a/build/1.12.0/792.js b/build/1.12.1/792.js similarity index 100% rename from build/1.12.0/792.js rename to build/1.12.1/792.js diff --git a/build/1.12.0/849.js b/build/1.12.1/849.js similarity index 100% rename from build/1.12.0/849.js rename to build/1.12.1/849.js diff --git a/build/1.12.0/856.js b/build/1.12.1/856.js similarity index 100% rename from build/1.12.0/856.js rename to build/1.12.1/856.js diff --git a/build/1.12.0/993.js b/build/1.12.1/993.js similarity index 100% rename from build/1.12.0/993.js rename to build/1.12.1/993.js diff --git a/build/1.12.0/994.js b/build/1.12.1/994.js similarity index 100% rename from build/1.12.0/994.js rename to build/1.12.1/994.js diff --git a/build/1.12.0/images/bluesky.733ebcbf.png b/build/1.12.1/images/bluesky.733ebcbf.png similarity index 100% rename from build/1.12.0/images/bluesky.733ebcbf.png rename to build/1.12.1/images/bluesky.733ebcbf.png diff --git a/build/1.12.0/images/content.fb050ea1.png b/build/1.12.1/images/content.fb050ea1.png similarity index 100% rename from build/1.12.0/images/content.fb050ea1.png rename to build/1.12.1/images/content.fb050ea1.png diff --git a/build/1.12.0/images/design.cc6a697f.png b/build/1.12.1/images/design.cc6a697f.png similarity index 100% rename from build/1.12.0/images/design.cc6a697f.png rename to build/1.12.1/images/design.cc6a697f.png diff --git a/build/1.12.0/images/features.593fb09c.png b/build/1.12.1/images/features.593fb09c.png similarity index 100% rename from build/1.12.0/images/features.593fb09c.png rename to build/1.12.1/images/features.593fb09c.png diff --git a/build/1.12.0/images/full-service.7f58f410.png b/build/1.12.1/images/full-service.7f58f410.png similarity index 100% rename from build/1.12.0/images/full-service.7f58f410.png rename to build/1.12.1/images/full-service.7f58f410.png diff --git a/build/1.12.0/images/full-service.adb3abd6.png b/build/1.12.1/images/full-service.adb3abd6.png similarity index 100% rename from build/1.12.0/images/full-service.adb3abd6.png rename to build/1.12.1/images/full-service.adb3abd6.png diff --git a/build/1.12.0/images/help.19cc7e75.png b/build/1.12.1/images/help.19cc7e75.png similarity index 100% rename from build/1.12.0/images/help.19cc7e75.png rename to build/1.12.1/images/help.19cc7e75.png diff --git a/build/1.12.0/images/step-interstitial.00b15f9e.png b/build/1.12.1/images/step-interstitial.00b15f9e.png similarity index 100% rename from build/1.12.0/images/step-interstitial.00b15f9e.png rename to build/1.12.1/images/step-interstitial.00b15f9e.png diff --git a/build/1.12.0/images/wp-admin.2908b886.png b/build/1.12.1/images/wp-admin.2908b886.png similarity index 100% rename from build/1.12.0/images/wp-admin.2908b886.png rename to build/1.12.1/images/wp-admin.2908b886.png diff --git a/build/1.12.0/images/wp-admin.6c8af0b4.png b/build/1.12.1/images/wp-admin.6c8af0b4.png similarity index 100% rename from build/1.12.0/images/wp-admin.6c8af0b4.png rename to build/1.12.1/images/wp-admin.6c8af0b4.png diff --git a/build/1.12.0/images/wp-admin.d8650899.png b/build/1.12.1/images/wp-admin.d8650899.png similarity index 100% rename from build/1.12.0/images/wp-admin.d8650899.png rename to build/1.12.1/images/wp-admin.d8650899.png diff --git a/build/1.12.0/onboarding.asset.php b/build/1.12.1/onboarding.asset.php similarity index 100% rename from build/1.12.0/onboarding.asset.php rename to build/1.12.1/onboarding.asset.php diff --git a/build/1.12.0/onboarding.css b/build/1.12.1/onboarding.css similarity index 100% rename from build/1.12.0/onboarding.css rename to build/1.12.1/onboarding.css diff --git a/build/1.12.0/onboarding.js b/build/1.12.1/onboarding.js similarity index 100% rename from build/1.12.0/onboarding.js rename to build/1.12.1/onboarding.js diff --git a/package-lock.json b/package-lock.json index fa543b786..3c7e65185 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,6 +1,6 @@ { "name": "@newfold-labs/wp-module-onboarding", - "version": "1.12.0", + "version": "1.12.1", "lockfileVersion": 1, "requires": true, "dependencies": { @@ -59,9 +59,9 @@ "dev": true }, "@babel/core": { - "version": "7.23.7", - "resolved": "https://registry.npmjs.org/@babel/core/-/core-7.23.7.tgz", - "integrity": "sha512-+UpDgowcmqe36d4NwqvKsyPMlOLNGMsfMmQ5WGCu+siCe3t3dfe9njrzGfdN4qq+bcNUt0+Vw6haRxBOycs4dw==", + "version": "7.23.9", + "resolved": "https://registry.npmjs.org/@babel/core/-/core-7.23.9.tgz", + "integrity": "sha512-5q0175NOjddqpvvzU+kDiSOAk4PfdO6FvwCWoQ6RO7rTzEe8vlo+4HVfcnAREhD4npMs0e9uZypjTwzZPCf/cw==", "dev": true, "requires": { "@ampproject/remapping": "^2.2.0", @@ -69,11 +69,11 @@ "@babel/generator": "^7.23.6", "@babel/helper-compilation-targets": "^7.23.6", "@babel/helper-module-transforms": "^7.23.3", - "@babel/helpers": "^7.23.7", - "@babel/parser": "^7.23.6", - "@babel/template": "^7.22.15", - "@babel/traverse": "^7.23.7", - "@babel/types": "^7.23.6", + "@babel/helpers": "^7.23.9", + "@babel/parser": "^7.23.9", + "@babel/template": "^7.23.9", + "@babel/traverse": "^7.23.9", + "@babel/types": "^7.23.9", "convert-source-map": "^2.0.0", "debug": "^4.1.0", "gensync": "^1.0.0-beta.2", @@ -81,6 +81,17 @@ "semver": "^6.3.1" }, "dependencies": { + "@babel/types": { + "version": "7.23.9", + "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.23.9.tgz", + "integrity": "sha512-dQjSq/7HaSjRM43FFGnv5keM2HsxpmyV1PfaSVm0nzzjwwTmjOe6J4bC8e3+pTEIgHaHj+1ZlLThRJ2auc/w1Q==", + "dev": true, + "requires": { + "@babel/helper-string-parser": "^7.23.4", + "@babel/helper-validator-identifier": "^7.22.20", + "to-fast-properties": "^2.0.0" + } + }, "convert-source-map": { "version": "2.0.0", "resolved": "https://registry.npmjs.org/convert-source-map/-/convert-source-map-2.0.0.tgz", @@ -105,9 +116,9 @@ } }, "@babel/eslint-parser": { - "version": "7.23.3", - "resolved": "https://registry.npmjs.org/@babel/eslint-parser/-/eslint-parser-7.23.3.tgz", - "integrity": "sha512-9bTuNlyx7oSstodm1cR1bECj4fkiknsDa1YniISkJemMY3DGhJNYBECbe6QD/q54mp2J8VO66jW3/7uP//iFCw==", + "version": "7.23.9", + "resolved": "https://registry.npmjs.org/@babel/eslint-parser/-/eslint-parser-7.23.9.tgz", + "integrity": "sha512-xPndlO7qxiJbn0ATvfXQBjCS7qApc9xmKHArgI/FTEFxXas5dnjC/VqM37lfZun9dclRYcn+YQAr6uDFy0bB2g==", "dev": true, "requires": { "@nicolo-ribaudo/eslint-scope-5-internals": "5.1.1-v1", @@ -159,9 +170,9 @@ } }, "@babel/helper-create-class-features-plugin": { - "version": "7.23.7", - "resolved": "https://registry.npmjs.org/@babel/helper-create-class-features-plugin/-/helper-create-class-features-plugin-7.23.7.tgz", - "integrity": "sha512-xCoqR/8+BoNnXOY7RVSgv6X+o7pmT5q1d+gGcRlXYkI+9B31glE4jeejhKVpA04O1AtzOt7OSQ6VYKP5FcRl9g==", + "version": "7.23.9", + "resolved": "https://registry.npmjs.org/@babel/helper-create-class-features-plugin/-/helper-create-class-features-plugin-7.23.9.tgz", + "integrity": "sha512-B2L9neXTIyPQoXDm+NtovPvG6VOLWnaXu3BIeVDWwdKFgG30oNa6CqVGiJPDWQwIAK49t9gnQI9c6K6RzabiKw==", "dev": true, "requires": { "@babel/helper-annotate-as-pure": "^7.22.5", @@ -363,14 +374,27 @@ } }, "@babel/helpers": { - "version": "7.23.8", - "resolved": "https://registry.npmjs.org/@babel/helpers/-/helpers-7.23.8.tgz", - "integrity": "sha512-KDqYz4PiOWvDFrdHLPhKtCThtIcKVy6avWD2oG4GEvyQ+XDZwHD4YQd+H2vNMnq2rkdxsDkU82T+Vk8U/WXHRQ==", + "version": "7.23.9", + "resolved": "https://registry.npmjs.org/@babel/helpers/-/helpers-7.23.9.tgz", + "integrity": "sha512-87ICKgU5t5SzOT7sBMfCOZQ2rHjRU+Pcb9BoILMYz600W6DkVRLFBPwQ18gwUVvggqXivaUakpnxWQGbpywbBQ==", "dev": true, "requires": { - "@babel/template": "^7.22.15", - "@babel/traverse": "^7.23.7", - "@babel/types": "^7.23.6" + "@babel/template": "^7.23.9", + "@babel/traverse": "^7.23.9", + "@babel/types": "^7.23.9" + }, + "dependencies": { + "@babel/types": { + "version": "7.23.9", + "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.23.9.tgz", + "integrity": "sha512-dQjSq/7HaSjRM43FFGnv5keM2HsxpmyV1PfaSVm0nzzjwwTmjOe6J4bC8e3+pTEIgHaHj+1ZlLThRJ2auc/w1Q==", + "dev": true, + "requires": { + "@babel/helper-string-parser": "^7.23.4", + "@babel/helper-validator-identifier": "^7.22.20", + "to-fast-properties": "^2.0.0" + } + } } }, "@babel/highlight": { @@ -384,9 +408,9 @@ } }, "@babel/parser": { - "version": "7.23.6", - "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.23.6.tgz", - "integrity": "sha512-Z2uID7YJ7oNvAI20O9X0bblw7Qqs8Q2hFy0R9tAfnfLkp5MW0UH9eUvnDSnFwKZ0AvgS1ucqR4KzvVHgnke1VQ==", + "version": "7.23.9", + "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.23.9.tgz", + "integrity": "sha512-9tcKgqKbs3xGJ+NtKF2ndOBBLVwPjl1SHxPQkd36r3Dlirw3xWUeGaTbqr7uGZcTaxkVNwc+03SVP7aCdWrTlA==", "dev": true }, "@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression": { @@ -625,9 +649,9 @@ } }, "@babel/plugin-transform-async-generator-functions": { - "version": "7.23.7", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-async-generator-functions/-/plugin-transform-async-generator-functions-7.23.7.tgz", - "integrity": "sha512-PdxEpL71bJp1byMG0va5gwQcXHxuEYC/BgI/e88mGTtohbZN28O5Yit0Plkkm/dBzCF/BxmbNcses1RH1T+urA==", + "version": "7.23.9", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-async-generator-functions/-/plugin-transform-async-generator-functions-7.23.9.tgz", + "integrity": "sha512-8Q3veQEDGe14dTYuwagbRtwxQDnytyg1JFu4/HwEMETeofocrB0U0ejBJIXoeG/t2oXZ8kzCyI0ZZfbT80VFNQ==", "dev": true, "requires": { "@babel/helper-environment-visitor": "^7.22.20", @@ -851,9 +875,9 @@ } }, "@babel/plugin-transform-modules-systemjs": { - "version": "7.23.3", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-modules-systemjs/-/plugin-transform-modules-systemjs-7.23.3.tgz", - "integrity": "sha512-ZxyKGTkF9xT9YJuKQRo19ewf3pXpopuYQd8cDXqNzc3mUNbOME0RKMoZxviQk74hwzfQsEe66dE92MaZbdHKNQ==", + "version": "7.23.9", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-modules-systemjs/-/plugin-transform-modules-systemjs-7.23.9.tgz", + "integrity": "sha512-KDlPRM6sLo4o1FkiSlXoAa8edLXFsKKIda779fbLrvmeuc3itnjCtaO6RrtoaANsIJANj+Vk1zqbZIMhkCAHVw==", "dev": true, "requires": { "@babel/helper-hoist-variables": "^7.22.5", @@ -1065,16 +1089,16 @@ } }, "@babel/plugin-transform-runtime": { - "version": "7.23.7", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-runtime/-/plugin-transform-runtime-7.23.7.tgz", - "integrity": "sha512-fa0hnfmiXc9fq/weK34MUV0drz2pOL/vfKWvN7Qw127hiUPabFCUMgAbYWcchRzMJit4o5ARsK/s+5h0249pLw==", + "version": "7.23.9", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-runtime/-/plugin-transform-runtime-7.23.9.tgz", + "integrity": "sha512-A7clW3a0aSjm3ONU9o2HAILSegJCYlEZmOhmBRReVtIpY/Z/p7yIZ+wR41Z+UipwdGuqwtID/V/dOdZXjwi9gQ==", "dev": true, "requires": { "@babel/helper-module-imports": "^7.22.15", "@babel/helper-plugin-utils": "^7.22.5", - "babel-plugin-polyfill-corejs2": "^0.4.7", - "babel-plugin-polyfill-corejs3": "^0.8.7", - "babel-plugin-polyfill-regenerator": "^0.5.4", + "babel-plugin-polyfill-corejs2": "^0.4.8", + "babel-plugin-polyfill-corejs3": "^0.9.0", + "babel-plugin-polyfill-regenerator": "^0.5.5", "semver": "^6.3.1" } }, @@ -1176,9 +1200,9 @@ } }, "@babel/preset-env": { - "version": "7.23.8", - "resolved": "https://registry.npmjs.org/@babel/preset-env/-/preset-env-7.23.8.tgz", - "integrity": "sha512-lFlpmkApLkEP6woIKprO6DO60RImpatTQKtz4sUcDjVcK8M8mQ4sZsuxaTMNOZf0sqAq/ReYW1ZBHnOQwKpLWA==", + "version": "7.23.9", + "resolved": "https://registry.npmjs.org/@babel/preset-env/-/preset-env-7.23.9.tgz", + "integrity": "sha512-3kBGTNBBk9DQiPoXYS0g0BYlwTQYUTifqgKTjxUwEUkduRT2QOa0FPGBJ+NROQhGyYO5BuTJwGvBnqKDykac6A==", "dev": true, "requires": { "@babel/compat-data": "^7.23.5", @@ -1208,7 +1232,7 @@ "@babel/plugin-syntax-top-level-await": "^7.14.5", "@babel/plugin-syntax-unicode-sets-regex": "^7.18.6", "@babel/plugin-transform-arrow-functions": "^7.23.3", - "@babel/plugin-transform-async-generator-functions": "^7.23.7", + "@babel/plugin-transform-async-generator-functions": "^7.23.9", "@babel/plugin-transform-async-to-generator": "^7.23.3", "@babel/plugin-transform-block-scoped-functions": "^7.23.3", "@babel/plugin-transform-block-scoping": "^7.23.4", @@ -1230,7 +1254,7 @@ "@babel/plugin-transform-member-expression-literals": "^7.23.3", "@babel/plugin-transform-modules-amd": "^7.23.3", "@babel/plugin-transform-modules-commonjs": "^7.23.3", - "@babel/plugin-transform-modules-systemjs": "^7.23.3", + "@babel/plugin-transform-modules-systemjs": "^7.23.9", "@babel/plugin-transform-modules-umd": "^7.23.3", "@babel/plugin-transform-named-capturing-groups-regex": "^7.22.5", "@babel/plugin-transform-new-target": "^7.23.3", @@ -1256,9 +1280,9 @@ "@babel/plugin-transform-unicode-regex": "^7.23.3", "@babel/plugin-transform-unicode-sets-regex": "^7.23.3", "@babel/preset-modules": "0.1.6-no-external-plugins", - "babel-plugin-polyfill-corejs2": "^0.4.7", - "babel-plugin-polyfill-corejs3": "^0.8.7", - "babel-plugin-polyfill-regenerator": "^0.5.4", + "babel-plugin-polyfill-corejs2": "^0.4.8", + "babel-plugin-polyfill-corejs3": "^0.9.0", + "babel-plugin-polyfill-regenerator": "^0.5.5", "core-js-compat": "^3.31.0", "semver": "^6.3.1" } @@ -1316,20 +1340,33 @@ } }, "@babel/template": { - "version": "7.22.15", - "resolved": "https://registry.npmjs.org/@babel/template/-/template-7.22.15.tgz", - "integrity": "sha512-QPErUVm4uyJa60rkI73qneDacvdvzxshT3kksGqlGWYdOTIUOwJ7RDUL8sGqslY1uXWSL6xMFKEXDS3ox2uF0w==", + "version": "7.23.9", + "resolved": "https://registry.npmjs.org/@babel/template/-/template-7.23.9.tgz", + "integrity": "sha512-+xrD2BWLpvHKNmX2QbpdpsBaWnRxahMwJjO+KZk2JOElj5nSmKezyS1B4u+QbHMTX69t4ukm6hh9lsYQ7GHCKA==", "dev": true, "requires": { - "@babel/code-frame": "^7.22.13", - "@babel/parser": "^7.22.15", - "@babel/types": "^7.22.15" + "@babel/code-frame": "^7.23.5", + "@babel/parser": "^7.23.9", + "@babel/types": "^7.23.9" + }, + "dependencies": { + "@babel/types": { + "version": "7.23.9", + "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.23.9.tgz", + "integrity": "sha512-dQjSq/7HaSjRM43FFGnv5keM2HsxpmyV1PfaSVm0nzzjwwTmjOe6J4bC8e3+pTEIgHaHj+1ZlLThRJ2auc/w1Q==", + "dev": true, + "requires": { + "@babel/helper-string-parser": "^7.23.4", + "@babel/helper-validator-identifier": "^7.22.20", + "to-fast-properties": "^2.0.0" + } + } } }, "@babel/traverse": { - "version": "7.23.7", - "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.23.7.tgz", - "integrity": "sha512-tY3mM8rH9jM0YHFGyfC0/xf+SB5eKUu7HPj7/k3fpi9dAlsMc5YbQvDi0Sh2QTPXqMhyaAtzAr807TIyfQrmyg==", + "version": "7.23.9", + "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.23.9.tgz", + "integrity": "sha512-I/4UJ9vs90OkBtY6iiiTORVMyIhJ4kAVmsKo9KFc8UOxMeUfi2hvtIBsET5u9GizXE6/GFSuKCTNfgCswuEjRg==", "dev": true, "requires": { "@babel/code-frame": "^7.23.5", @@ -1338,12 +1375,23 @@ "@babel/helper-function-name": "^7.23.0", "@babel/helper-hoist-variables": "^7.22.5", "@babel/helper-split-export-declaration": "^7.22.6", - "@babel/parser": "^7.23.6", - "@babel/types": "^7.23.6", + "@babel/parser": "^7.23.9", + "@babel/types": "^7.23.9", "debug": "^4.3.1", "globals": "^11.1.0" }, "dependencies": { + "@babel/types": { + "version": "7.23.9", + "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.23.9.tgz", + "integrity": "sha512-dQjSq/7HaSjRM43FFGnv5keM2HsxpmyV1PfaSVm0nzzjwwTmjOe6J4bC8e3+pTEIgHaHj+1ZlLThRJ2auc/w1Q==", + "dev": true, + "requires": { + "@babel/helper-string-parser": "^7.23.4", + "@babel/helper-validator-identifier": "^7.22.20", + "to-fast-properties": "^2.0.0" + } + }, "debug": { "version": "4.3.4", "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.4.tgz", @@ -2795,9 +2843,9 @@ } }, "@sideway/address": { - "version": "4.1.4", - "resolved": "https://registry.npmjs.org/@sideway/address/-/address-4.1.4.tgz", - "integrity": "sha512-7vwq+rOHVWjyXxVlR76Agnvhy8I9rpzjosTESvmhNeXOXdZZB15Fl+TI9x1SiHZH5Jv2wTGduSxFDIaq0m3DUw==", + "version": "4.1.5", + "resolved": "https://registry.npmjs.org/@sideway/address/-/address-4.1.5.tgz", + "integrity": "sha512-IqO/DUQHUkPeixNQ8n0JA6102hT9CmaljNTPmQ1u8MEhBo/R4Q8eKLN/vGZxuebwOroDB4cbpjheD4+/sKFK4Q==", "dev": true, "requires": { "@hapi/hoek": "^9.0.0" @@ -3296,9 +3344,9 @@ } }, "@types/express-serve-static-core": { - "version": "4.17.41", - "resolved": "https://registry.npmjs.org/@types/express-serve-static-core/-/express-serve-static-core-4.17.41.tgz", - "integrity": "sha512-OaJ7XLaelTgrvlZD8/aa0vvvxZdUmlCn6MtWeB7TkiKW70BQLc9XEPpDLPdbo52ZhXUCrznlWdCHWxJWtdyajA==", + "version": "4.17.42", + "resolved": "https://registry.npmjs.org/@types/express-serve-static-core/-/express-serve-static-core-4.17.42.tgz", + "integrity": "sha512-ckM3jm2bf/MfB3+spLPWYPUH573plBFwpOhqQ2WottxYV85j1HQFlxmnTq57X1yHY9awZPig06hL/cLMgNWHIQ==", "dev": true, "requires": { "@types/node": "*", @@ -3694,16 +3742,16 @@ } }, "@typescript-eslint/eslint-plugin": { - "version": "6.19.1", - "resolved": "https://registry.npmjs.org/@typescript-eslint/eslint-plugin/-/eslint-plugin-6.19.1.tgz", - "integrity": "sha512-roQScUGFruWod9CEyoV5KlCYrubC/fvG8/1zXuT0WTcxX87GnMMmnksMwSg99lo1xiKrBzw2icsJPMAw1OtKxg==", + "version": "6.20.0", + "resolved": "https://registry.npmjs.org/@typescript-eslint/eslint-plugin/-/eslint-plugin-6.20.0.tgz", + "integrity": "sha512-fTwGQUnjhoYHeSF6m5pWNkzmDDdsKELYrOBxhjMrofPqCkoC2k3B2wvGHFxa1CTIqkEn88nlW1HVMztjo2K8Hg==", "dev": true, "requires": { "@eslint-community/regexpp": "^4.5.1", - "@typescript-eslint/scope-manager": "6.19.1", - "@typescript-eslint/type-utils": "6.19.1", - "@typescript-eslint/utils": "6.19.1", - "@typescript-eslint/visitor-keys": "6.19.1", + "@typescript-eslint/scope-manager": "6.20.0", + "@typescript-eslint/type-utils": "6.20.0", + "@typescript-eslint/utils": "6.20.0", + "@typescript-eslint/visitor-keys": "6.20.0", "debug": "^4.3.4", "graphemer": "^1.4.0", "ignore": "^5.2.4", @@ -3754,15 +3802,15 @@ } }, "@typescript-eslint/parser": { - "version": "6.19.1", - "resolved": "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-6.19.1.tgz", - "integrity": "sha512-WEfX22ziAh6pRE9jnbkkLGp/4RhTpffr2ZK5bJ18M8mIfA8A+k97U9ZyaXCEJRlmMHh7R9MJZWXp/r73DzINVQ==", + "version": "6.20.0", + "resolved": "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-6.20.0.tgz", + "integrity": "sha512-bYerPDF/H5v6V76MdMYhjwmwgMA+jlPVqjSDq2cRqMi8bP5sR3Z+RLOiOMad3nsnmDVmn2gAFCyNgh/dIrfP/w==", "dev": true, "requires": { - "@typescript-eslint/scope-manager": "6.19.1", - "@typescript-eslint/types": "6.19.1", - "@typescript-eslint/typescript-estree": "6.19.1", - "@typescript-eslint/visitor-keys": "6.19.1", + "@typescript-eslint/scope-manager": "6.20.0", + "@typescript-eslint/types": "6.20.0", + "@typescript-eslint/typescript-estree": "6.20.0", + "@typescript-eslint/visitor-keys": "6.20.0", "debug": "^4.3.4" }, "dependencies": { @@ -3784,23 +3832,23 @@ } }, "@typescript-eslint/scope-manager": { - "version": "6.19.1", - "resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-6.19.1.tgz", - "integrity": "sha512-4CdXYjKf6/6aKNMSly/BP4iCSOpvMmqtDzRtqFyyAae3z5kkqEjKndR5vDHL8rSuMIIWP8u4Mw4VxLyxZW6D5w==", + "version": "6.20.0", + "resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-6.20.0.tgz", + "integrity": "sha512-p4rvHQRDTI1tGGMDFQm+GtxP1ZHyAh64WANVoyEcNMpaTFn3ox/3CcgtIlELnRfKzSs/DwYlDccJEtr3O6qBvA==", "dev": true, "requires": { - "@typescript-eslint/types": "6.19.1", - "@typescript-eslint/visitor-keys": "6.19.1" + "@typescript-eslint/types": "6.20.0", + "@typescript-eslint/visitor-keys": "6.20.0" } }, "@typescript-eslint/type-utils": { - "version": "6.19.1", - "resolved": "https://registry.npmjs.org/@typescript-eslint/type-utils/-/type-utils-6.19.1.tgz", - "integrity": "sha512-0vdyld3ecfxJuddDjACUvlAeYNrHP/pDeQk2pWBR2ESeEzQhg52DF53AbI9QCBkYE23lgkhLCZNkHn2hEXXYIg==", + "version": "6.20.0", + "resolved": "https://registry.npmjs.org/@typescript-eslint/type-utils/-/type-utils-6.20.0.tgz", + "integrity": "sha512-qnSobiJQb1F5JjN0YDRPHruQTrX7ICsmltXhkV536mp4idGAYrIyr47zF/JmkJtEcAVnIz4gUYJ7gOZa6SmN4g==", "dev": true, "requires": { - "@typescript-eslint/typescript-estree": "6.19.1", - "@typescript-eslint/utils": "6.19.1", + "@typescript-eslint/typescript-estree": "6.20.0", + "@typescript-eslint/utils": "6.20.0", "debug": "^4.3.4", "ts-api-utils": "^1.0.1" }, @@ -3823,19 +3871,19 @@ } }, "@typescript-eslint/types": { - "version": "6.19.1", - "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-6.19.1.tgz", - "integrity": "sha512-6+bk6FEtBhvfYvpHsDgAL3uo4BfvnTnoge5LrrCj2eJN8g3IJdLTD4B/jK3Q6vo4Ql/Hoip9I8aB6fF+6RfDqg==", + "version": "6.20.0", + "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-6.20.0.tgz", + "integrity": "sha512-MM9mfZMAhiN4cOEcUOEx+0HmuaW3WBfukBZPCfwSqFnQy0grXYtngKCqpQN339X3RrwtzspWJrpbrupKYUSBXQ==", "dev": true }, "@typescript-eslint/typescript-estree": { - "version": "6.19.1", - "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-6.19.1.tgz", - "integrity": "sha512-aFdAxuhzBFRWhy+H20nYu19+Km+gFfwNO4TEqyszkMcgBDYQjmPJ61erHxuT2ESJXhlhrO7I5EFIlZ+qGR8oVA==", + "version": "6.20.0", + "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-6.20.0.tgz", + "integrity": "sha512-RnRya9q5m6YYSpBN7IzKu9FmLcYtErkDkc8/dKv81I9QiLLtVBHrjz+Ev/crAqgMNW2FCsoZF4g2QUylMnJz+g==", "dev": true, "requires": { - "@typescript-eslint/types": "6.19.1", - "@typescript-eslint/visitor-keys": "6.19.1", + "@typescript-eslint/types": "6.20.0", + "@typescript-eslint/visitor-keys": "6.20.0", "debug": "^4.3.4", "globby": "^11.1.0", "is-glob": "^4.0.3", @@ -3904,17 +3952,17 @@ } }, "@typescript-eslint/utils": { - "version": "6.19.1", - "resolved": "https://registry.npmjs.org/@typescript-eslint/utils/-/utils-6.19.1.tgz", - "integrity": "sha512-JvjfEZuP5WoMqwh9SPAPDSHSg9FBHHGhjPugSRxu5jMfjvBpq5/sGTD+9M9aQ5sh6iJ8AY/Kk/oUYVEMAPwi7w==", + "version": "6.20.0", + "resolved": "https://registry.npmjs.org/@typescript-eslint/utils/-/utils-6.20.0.tgz", + "integrity": "sha512-/EKuw+kRu2vAqCoDwDCBtDRU6CTKbUmwwI7SH7AashZ+W+7o8eiyy6V2cdOqN49KsTcASWsC5QeghYuRDTyOOg==", "dev": true, "requires": { "@eslint-community/eslint-utils": "^4.4.0", "@types/json-schema": "^7.0.12", "@types/semver": "^7.5.0", - "@typescript-eslint/scope-manager": "6.19.1", - "@typescript-eslint/types": "6.19.1", - "@typescript-eslint/typescript-estree": "6.19.1", + "@typescript-eslint/scope-manager": "6.20.0", + "@typescript-eslint/types": "6.20.0", + "@typescript-eslint/typescript-estree": "6.20.0", "semver": "^7.5.4" }, "dependencies": { @@ -3945,12 +3993,12 @@ } }, "@typescript-eslint/visitor-keys": { - "version": "6.19.1", - "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-6.19.1.tgz", - "integrity": "sha512-gkdtIO+xSO/SmI0W68DBg4u1KElmIUo3vXzgHyGPs6cxgB0sa3TlptRAAE0hUY1hM6FcDKEv7aIwiTGm76cXfQ==", + "version": "6.20.0", + "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-6.20.0.tgz", + "integrity": "sha512-E8Cp98kRe4gKHjJD4NExXKz/zOJ1A2hhZc+IMVD6i7w4yjIvh6VyuRI0gRtxAsXtoC35uGMaQ9rjI2zJaXDEAw==", "dev": true, "requires": { - "@typescript-eslint/types": "6.19.1", + "@typescript-eslint/types": "6.20.0", "eslint-visitor-keys": "^3.4.1" }, "dependencies": { @@ -5340,9 +5388,9 @@ "dev": true }, "axios": { - "version": "1.6.6", - "resolved": "https://registry.npmjs.org/axios/-/axios-1.6.6.tgz", - "integrity": "sha512-XZLZDFfXKM9U/Y/B4nNynfCRUqNyVZ4sBC/n9GDRCkq9vd2mIvKjKKsbIh1WPmHmNbg6ND7cTBY3Y2+u1G3/2Q==", + "version": "1.6.7", + "resolved": "https://registry.npmjs.org/axios/-/axios-1.6.7.tgz", + "integrity": "sha512-/hDJGff6/c7u0hDkvkGxR/oy6CbCs8ziCsC7SqmhjfozqiJGc8Z11wrv9z9lYfY4K8l+H9TpjcMDX0xOZmx+RA==", "dev": true, "requires": { "follow-redirects": "^1.15.4", @@ -5503,43 +5551,13 @@ } }, "babel-plugin-polyfill-corejs3": { - "version": "0.8.7", - "resolved": "https://registry.npmjs.org/babel-plugin-polyfill-corejs3/-/babel-plugin-polyfill-corejs3-0.8.7.tgz", - "integrity": "sha512-KyDvZYxAzkC0Aj2dAPyDzi2Ym15e5JKZSK+maI7NAwSqofvuFglbSsxE7wUOvTg9oFVnHMzVzBKcqEb4PJgtOA==", + "version": "0.9.0", + "resolved": "https://registry.npmjs.org/babel-plugin-polyfill-corejs3/-/babel-plugin-polyfill-corejs3-0.9.0.tgz", + "integrity": "sha512-7nZPG1uzK2Ymhy/NbaOWTg3uibM2BmGASS4vHS4szRZAIR8R6GwA/xAujpdrXU5iyklrimWnLWU+BLF9suPTqg==", "dev": true, "requires": { - "@babel/helper-define-polyfill-provider": "^0.4.4", - "core-js-compat": "^3.33.1" - }, - "dependencies": { - "@babel/helper-define-polyfill-provider": { - "version": "0.4.4", - "resolved": "https://registry.npmjs.org/@babel/helper-define-polyfill-provider/-/helper-define-polyfill-provider-0.4.4.tgz", - "integrity": "sha512-QcJMILQCu2jm5TFPGA3lCpJJTeEP+mqeXooG/NZbg/h5FTFi6V0+99ahlRsW8/kRLyb24LZVCCiclDedhLKcBA==", - "dev": true, - "requires": { - "@babel/helper-compilation-targets": "^7.22.6", - "@babel/helper-plugin-utils": "^7.22.5", - "debug": "^4.1.1", - "lodash.debounce": "^4.0.8", - "resolve": "^1.14.2" - } - }, - "debug": { - "version": "4.3.4", - "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.4.tgz", - "integrity": "sha512-PRWFHuSU3eDtQJPvnNY7Jcket1j0t5OuOsFzPPzsekD52Zl8qUfFIPEiswXqIvHWGVHOgX+7G/vCNNhehwxfkQ==", - "dev": true, - "requires": { - "ms": "2.1.2" - } - }, - "ms": { - "version": "2.1.2", - "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz", - "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==", - "dev": true - } + "@babel/helper-define-polyfill-provider": "^0.5.0", + "core-js-compat": "^3.34.0" } }, "babel-plugin-polyfill-regenerator": { @@ -5734,13 +5752,13 @@ } }, "browserslist": { - "version": "4.22.2", - "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-4.22.2.tgz", - "integrity": "sha512-0UgcrvQmBDvZHFGdYUehrCNIazki7/lUP3kkoi/r3YB2amZbFM9J43ZRkJTXBUZK4gmx56+Sqk9+Vs9mwZx9+A==", + "version": "4.22.3", + "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-4.22.3.tgz", + "integrity": "sha512-UAp55yfwNv0klWNapjs/ktHoguxuQNGnOzxYmfnXIS+8AsRDZkSDxg7R1AX3GKzn078SBI5dzwzj/Yx0Or0e3A==", "dev": true, "requires": { - "caniuse-lite": "^1.0.30001565", - "electron-to-chromium": "^1.4.601", + "caniuse-lite": "^1.0.30001580", + "electron-to-chromium": "^1.4.648", "node-releases": "^2.0.14", "update-browserslist-db": "^1.0.13" } @@ -5918,9 +5936,9 @@ } }, "caniuse-lite": { - "version": "1.0.30001580", - "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001580.tgz", - "integrity": "sha512-mtj5ur2FFPZcCEpXFy8ADXbDACuNFXg6mxVDqp7tqooX6l3zwm+d8EPoeOSIFRDvHs8qu7/SLFOGniULkcH2iA==", + "version": "1.0.30001581", + "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001581.tgz", + "integrity": "sha512-whlTkwhqV2tUmP3oYhtNfaWGYHDdS3JYFQBKXxcUR9qqPWsRhFHhoISO2Xnl/g0xyKzht9mI1LZpiNWfMzHixQ==", "dev": true }, "capital-case": { @@ -6740,9 +6758,9 @@ "dev": true }, "css-loader": { - "version": "6.9.1", - "resolved": "https://registry.npmjs.org/css-loader/-/css-loader-6.9.1.tgz", - "integrity": "sha512-OzABOh0+26JKFdMzlK6PY1u5Zx8+Ck7CVRlcGNZoY9qwJjdfu2VWFuprTIpPW+Av5TZTVViYWcFQaEEQURLknQ==", + "version": "6.10.0", + "resolved": "https://registry.npmjs.org/css-loader/-/css-loader-6.10.0.tgz", + "integrity": "sha512-LTSA/jWbwdMlk+rhmElbDR2vbtQoTBPr7fkJE+mxrHj+7ru0hUmHafDRzWIjIHTwpitWVaqY2/UWGRca3yUgRw==", "dev": true, "requires": { "icss-utils": "^5.1.0", @@ -7745,9 +7763,9 @@ "dev": true }, "electron-to-chromium": { - "version": "1.4.645", - "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.4.645.tgz", - "integrity": "sha512-EeS1oQDCmnYsRDRy2zTeC336a/4LZ6WKqvSaM1jLocEk5ZuyszkQtCpsqvuvaIXGOUjwtvF6LTcS8WueibXvSw==", + "version": "1.4.651", + "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.4.651.tgz", + "integrity": "sha512-jjks7Xx+4I7dslwsbaFocSwqBbGHQmuXBJUK9QBZTIrzPq3pzn6Uf2szFSP728FtLYE3ldiccmlkOM/zhGKCpA==", "dev": true }, "emittery": { @@ -8964,9 +8982,9 @@ "dev": true }, "fastq": { - "version": "1.16.0", - "resolved": "https://registry.npmjs.org/fastq/-/fastq-1.16.0.tgz", - "integrity": "sha512-ifCoaXsDrsdkWTtiNJX5uzHDsrck5TzfKKDcuFFTIrrc/BS076qgEIfoIy1VeZqViznfKiysPYTh/QeHtnIsYA==", + "version": "1.17.0", + "resolved": "https://registry.npmjs.org/fastq/-/fastq-1.17.0.tgz", + "integrity": "sha512-zGygtijUMT7jnk3h26kUms3BkSDp4IfIKjmnqI2tvx6nuBfiF1UqOxbnLfzdv+apBy+53oaImsKtMw/xYbW+1w==", "dev": true, "requires": { "reusify": "^1.0.4" @@ -10011,9 +10029,9 @@ "dev": true }, "immutable": { - "version": "4.3.4", - "resolved": "https://registry.npmjs.org/immutable/-/immutable-4.3.4.tgz", - "integrity": "sha512-fsXeu4J4i6WNWSikpI88v/PcVflZz+6kMhUfIwc5SY+poQRPnaf5V7qds6SUyUN3cVxEzuCab7QIoLOQ+DQ1wA==", + "version": "4.3.5", + "resolved": "https://registry.npmjs.org/immutable/-/immutable-4.3.5.tgz", + "integrity": "sha512-8eabxkth9gZatlwl5TBuJnCsoTADlL6ftEr7A4qgdaTsPyreilDSnUk57SO+jfKcNtxPa22U5KK6DSeAYhpBJw==", "dev": true }, "import-fresh": { @@ -12213,14 +12231,14 @@ } }, "joi": { - "version": "17.12.0", - "resolved": "https://registry.npmjs.org/joi/-/joi-17.12.0.tgz", - "integrity": "sha512-HSLsmSmXz+PV9PYoi3p7cgIbj06WnEBNT28n+bbBNcPZXZFqCzzvGqpTBPujx/Z0nh1+KNQPDrNgdmQ8dq0qYw==", + "version": "17.12.1", + "resolved": "https://registry.npmjs.org/joi/-/joi-17.12.1.tgz", + "integrity": "sha512-vtxmq+Lsc5SlfqotnfVjlViWfOL9nt/avKNbKYizwf6gsCfq9NYY/ceYRMFD8XDdrjJ9abJyScWmhmIiy+XRtQ==", "dev": true, "requires": { "@hapi/hoek": "^9.3.0", "@hapi/topo": "^5.1.0", - "@sideway/address": "^4.1.4", + "@sideway/address": "^4.1.5", "@sideway/formula": "^3.0.1", "@sideway/pinpoint": "^2.0.0" } @@ -17577,9 +17595,9 @@ } }, "web-vitals": { - "version": "3.5.1", - "resolved": "https://registry.npmjs.org/web-vitals/-/web-vitals-3.5.1.tgz", - "integrity": "sha512-xQ9lvIpfLxUj0eSmT79ZjRoU5wIRfIr7pNukL7ZE4EcWZSmfZQqOlhuAGfkVa3EFmzPHZhWhXfm2i5ys+THVPg==", + "version": "3.5.2", + "resolved": "https://registry.npmjs.org/web-vitals/-/web-vitals-3.5.2.tgz", + "integrity": "sha512-c0rhqNcHXRkY/ogGDJQxZ9Im9D19hDihbzSQJrsioex+KnFgmMzBiy57Z1EjkhX/+OjyBpclDCzz2ITtjokFmg==", "dev": true }, "webidl-conversions": { diff --git a/package.json b/package.json index 54110928f..2e6efe816 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "@newfold-labs/wp-module-onboarding", - "version": "1.12.0", + "version": "1.12.1", "description": "Next-generation WordPress Onboarding for WordPress sites at Newfold Digital.", "license": "GPL-2.0-or-later", "private": true, diff --git a/tests/cypress/integration/1-Initial-steps/branding.cy.js b/tests/cypress/integration/1-Initial-steps/branding.cy.js index e86b8f9c0..a45be4d90 100644 --- a/tests/cypress/integration/1-Initial-steps/branding.cy.js +++ b/tests/cypress/integration/1-Initial-steps/branding.cy.js @@ -1,5 +1,5 @@ // -import { GetPluginId } from '../wp-module-support/pluginID.cy'; +import { GetPluginId, GetPluginName } from '../wp-module-support/pluginID.cy'; describe( 'Branding', function () { before( () => { @@ -8,14 +8,18 @@ describe( 'Branding', function () { // since we are setting brand from plugin container, it will not be set to "newfold" // by default even if mm_brand option is deleted from the database - it( 'Has ' + GetPluginId() + ' CSS when mm_brand does not exist.', () => { + it( 'Has ' + GetPluginId() + ' class when mm_brand does not exist.', () => { cy.exec( 'npx wp-env run cli wp option delete mm_brand' ); cy.reload(); - cy.get( 'body' ).should( 'have.class', `nfd-brand-${ GetPluginId() }` ); - cy.get( '.is-bg-primary' ) - .should( 'have.css', 'background-color', 'rgb(53, 117, 211)' ) - .should( 'have.css', 'color', 'rgb(255, 255, 255)' ); - cy.get( '.nfd-step-card-subheading' ).should( 'contain',GetPluginId().charAt(0).toUpperCase() + GetPluginId().slice(1) ); + if(GetPluginId()=='hostgator'){ + cy.exec( 'npx wp-env run cli wp option set hg_region BR' ) + cy.reload(); + cy.get(`.nfd-brand-${ GetPluginId() }-br`,{timeout:10000}).should('be.visible'); + } + else{ + cy.get( 'body', {timeout:15000} ).should( 'have.class', `nfd-brand-${ GetPluginId() }` ); + } + GetPluginName(); } ); it( 'Has default WordPress styles when mm_brand has an empty value', () => { @@ -25,19 +29,20 @@ describe( 'Branding', function () { ); cy.reload(); cy.get( 'body' ).should( 'have.class', 'nfd-brand-wordpress' ); - cy.get( '.is-bg-primary' ) - .should( 'have.css', 'background-color', 'rgb(0, 124, 186)' ) - .should( 'have.css', 'color', 'rgb(255, 255, 255)' ); - cy.get( '.nfd-step-card-subheading' ).should( 'contain', 'web host' ); + if(GetPluginId()!='hostgator'){ + cy.get( '.nfd-step-card-subheading' ).should( 'contain', 'web host' ); + }; } ); - it( 'Has brand specific CSS for ' + GetPluginId(), () => { + it( 'Has brand specific class for ' + GetPluginId(), () => { cy.exec( `npx wp-env run cli wp option update mm_brand ${ GetPluginId() }` ); cy.reload(); - cy.get( 'body' ).should( 'have.class', `nfd-brand-${ GetPluginId() }` ); - cy.get( '.is-bg-primary' ) - .should( 'have.css', 'background-color', 'rgb(53, 117, 211)' ) - .should( 'have.css', 'color', 'rgb(255, 255, 255)' ); - cy.get( '.nfd-step-card-subheading' ).should( 'contain', GetPluginId().charAt(0).toUpperCase() + GetPluginId().slice(1) ); + if(GetPluginId()=='hostgator'){ + cy.get(`.nfd-brand-${ GetPluginId() }-br`,{timeout:10000}).should('be.visible'); + } + else{ + cy.get( 'body', {timeout:15000} ).should( 'have.class', `nfd-brand-${ GetPluginId() }` ); + } + GetPluginName(); } ); } ); diff --git a/tests/cypress/integration/1-Initial-steps/whats-next.cy.js b/tests/cypress/integration/1-Initial-steps/whats-next.cy.js index f0ca7dd04..28dd76e9f 100644 --- a/tests/cypress/integration/1-Initial-steps/whats-next.cy.js +++ b/tests/cypress/integration/1-Initial-steps/whats-next.cy.js @@ -1,7 +1,9 @@ // import { DrawerActivityForMenu } from '../wp-module-support/drawer.cy'; import { CheckCardHeadingSubheading } from '../wp-module-support/header.cy'; +import { GetPluginId } from '../wp-module-support/pluginID.cy'; import { + BasicSidebarCheck, CheckHelpPanelLinks, CheckIllustrationPanel, CheckInfoPanel, @@ -16,44 +18,50 @@ describe( 'What Next Page', function () { cy.wait( 5000 ); } ); - it.skip( 'Check Drawer Activity', () => { + it( 'Check Drawer Activity', () => { DrawerActivityForMenu( - 'Exit to WordPress', + 'WordPress', ':nth-child(6)', - 'What Next', false ); } ); - it( 'Check to make sure sidebar opens, content is in place and close sidebar', () => { - CheckIntroPanel( '__what-next', 'What’s Next' ); - CheckIllustrationPanel( '__what-next' ); - CheckInfoPanel( 2 ); - CheckHelpPanelLinks(); - } ); + if(GetPluginId()=='bluehost'){ + it( 'Check to make sure sidebar opens, content is in place and close sidebar', () => { + CheckIntroPanel( '__what-next', 'What’s Next' ); + CheckIllustrationPanel( '__what-next' ); + CheckInfoPanel( 2 ); + CheckHelpPanelLinks(); + } ); + + it( 'Hovering over overview tab panel and asserting the tab data', () => { + cy.contains( 'button', 'WHATS NEXT' ).trigger( 'mouseover' ); + cy.get( '.tab-text' ).should( + 'contain', + 'Add content, organize your menu and launch.' + ); + cy.contains( 'button', 'HELP & RESOURCES' ).trigger( 'mouseover' ); + cy.get( '.tab-text' ).should( + 'contain', + "Next step or next level, we're your partner." + ); + cy.contains( 'button', 'HIRE OUR EXPERTS' ).trigger( 'mouseover' ); + cy.get( '.tab-text' ).should( + 'contain', + 'Make our great people your people.' + ); + } ); + } + else{ + it( 'Check to make sure Sidebar opens', () => { + BasicSidebarCheck(); + } ); + }; it( 'Check if whatnext card is visible', () => { cy.get( '.whatnext-card' ).should( 'be.visible' ); } ); - it( 'Hovering over overview tab panel and asserting the tab data', () => { - cy.contains( 'button', 'WHATS NEXT' ).trigger( 'mouseover' ); - cy.get( '.tab-text' ).should( - 'contain', - 'Add content, organize your menu and launch.' - ); - cy.contains( 'button', 'HELP & RESOURCES' ).trigger( 'mouseover' ); - cy.get( '.tab-text' ).should( - 'contain', - "Next step or next level, we're your partner." - ); - cy.contains( 'button', 'HIRE OUR EXPERTS' ).trigger( 'mouseover' ); - cy.get( '.tab-text' ).should( - 'contain', - 'Make our great people your people.' - ); - } ); - it( 'Check if main heading and sub heading shows up', () => { CheckCardHeadingSubheading(); } ); @@ -63,11 +71,11 @@ describe( 'What Next Page', function () { } ); it( 'Check if complete setup button is visible', () => { - cy.contains( 'button', 'Complete Setup' ).should( 'be.visible' ); + cy.get('.nfd-nav-card-button').should( 'be.visible' ); } ); it( 'Check Finish button is visible and finish the setup', () => { - cy.contains( 'button', 'Finish' ).should( 'be.visible' ).click(); + cy.get('.components-button-group > .components-button').should( 'be.visible' ).click(); cy.wait( 1000 ); cy.url().should( 'not.contain', '/wp-setup/step/what-next' ); } ); diff --git a/tests/cypress/integration/2-general-onboarding-flow/basic-info.cy.js b/tests/cypress/integration/2-general-onboarding-flow/basic-info.cy.js index 0b292dde6..48b5b8042 100644 --- a/tests/cypress/integration/2-general-onboarding-flow/basic-info.cy.js +++ b/tests/cypress/integration/2-general-onboarding-flow/basic-info.cy.js @@ -2,6 +2,7 @@ import { DrawerClose } from '../wp-module-support/drawer.cy'; import { CheckHeadingSubheading } from '../wp-module-support/header.cy'; import { + BasicSidebarCheck, CheckHelpPanelLinks, CheckIllustrationPanel, CheckInfoPanel, @@ -9,6 +10,7 @@ import { } from '../wp-module-support/sidebar.cy'; import { SocialMediaTextValidations } from '../wp-module-support/socialMedia.cy'; import { APIList, BasicInfoAPI } from '../wp-module-support/EventsApi.cy'; +import { GetPluginId } from '../wp-module-support/pluginID.cy'; describe( 'Basic Info Page', function () { const desc = 'Welcome to WordPress'; @@ -35,7 +37,6 @@ describe( 'Basic Info Page', function () { cy.get( ':nth-child(2) > .nfd-onboarding-drawer__panel-menu-link' ) .should( 'have.class', 'active' ) - .should( 'have.text', 'Basic Info' ) .and( 'have.attr', 'href' ) .then( ( value ) => ( href = value ) ); cy.url().then( ( url ) => { @@ -49,18 +50,19 @@ describe( 'Basic Info Page', function () { CheckHeadingSubheading(); } ); - it( 'Check to make sure sidebar opens, content is in place and close sidebar', () => { - CheckIntroPanel( '__basic-info', 'Basic Info' ); - CheckIllustrationPanel(); - CheckInfoPanel(); - CheckHelpPanelLinks(); - } ); - - it( 'Check if Header has text `website` in it', () => { - cy.get( '.nfd-main-heading__title' ) - .should( 'be.visible' ) - .contains( 'website' ); - } ); + if(GetPluginId()=='bluehost'){ + it( 'Check to make sure sidebar opens, content is in place and close sidebar', () => { + CheckIntroPanel( '__basic-info', 'Basic Info' ); + CheckIllustrationPanel(); + CheckInfoPanel(); + CheckHelpPanelLinks(); + } ); + } + else{ + it( 'Check to make sure Sidebar opens', () => { + BasicSidebarCheck(); + } ); + }; it( 'Enter a Title and then Check if it reflects elsewhere', () => { const titleBox = cy.get( ':nth-child(1) > label > .nfd-input__field' ); @@ -164,24 +166,32 @@ describe( 'Basic Info Page', function () { socialTest2.focus(); socialTest.type( invalidURL ); socialTest2.focus(); - + if(GetPluginId()!='hostgator'){ + cy.get( '.Tooltip-Wrapper', { timeout: 3000 } ).should( 'exist' ); + cy.get( '.Tooltip-Tip', { timeout: 3000 } ) + .should( 'be.visible' ) + .should( 'contain', Tooltiptext2 ); + cy.get( '.navigation-buttons_next' ).click(); + cy.get( '.components-modal__content' ).should( 'be.visible' ); + cy.get( '.components-modal__header-heading' ).should( + 'have.text', + ModalText2 + ); + cy.get( '.components-modal__header button' , { timeout: customCommandTimeout } ).click() + cy.get( + '.browser-content_social_icon[style="background-image: var(--facebook-icon);"]' + ).should( 'have.css', 'opacity', '0.75' ); + } + else{ + cy.get( '.Tooltip-Wrapper', { timeout: 3000 } ).should( 'exist' ); + cy.get( '.Tooltip-Tip', { timeout: 3000 } ) + .should( 'be.visible' ); + }; // The URL Checker runs on a debounce // Shows the message to the User in case of Invalid URL - cy.get( '.Tooltip-Wrapper', { timeout: 3000 } ).should( 'exist' ); - cy.get( '.Tooltip-Tip', { timeout: 3000 } ) - .should( 'be.visible' ) - .should( 'contain', Tooltiptext2 ); - cy.get( '.navigation-buttons_next' ).click(); - cy.get( '.components-modal__content' ).should( 'be.visible' ); - cy.get( '.components-modal__header-heading' ).should( - 'have.text', - ModalText2 - ); + // cy.get( '.components-modal__content' ).type( '{esc}' ); - cy.get( '.components-modal__header button' , { timeout: customCommandTimeout } ).click() - cy.get( - '.browser-content_social_icon[style="background-image: var(--facebook-icon);"]' - ).should( 'have.css', 'opacity', '0.75' ); + socialTest.focus(); socialTest.clear(); @@ -207,7 +217,6 @@ describe( 'Basic Info Page', function () { cy .get( '.image-uploader_window-reset-btn' ) .should( 'exist' ) - .contains( 'UPLOAD' ) ) { cy.get( '.image-uploader_window-logo-icon-selected' ).should( 'not.exist' diff --git a/tests/cypress/integration/2-general-onboarding-flow/exit-to-wordpress.cy.js b/tests/cypress/integration/2-general-onboarding-flow/exit-to-wordpress.cy.js index a1bb3f046..a3f7136de 100644 --- a/tests/cypress/integration/2-general-onboarding-flow/exit-to-wordpress.cy.js +++ b/tests/cypress/integration/2-general-onboarding-flow/exit-to-wordpress.cy.js @@ -1,21 +1,23 @@ // +const { GetPluginId } = require("../wp-module-support/pluginID.cy"); + describe( 'Exit to WordPress', function () { before( () => { cy.visit( 'wp-admin/?page=nfd-onboarding#/wp-setup/step/basic-info' ); } ); - it.skip( 'Go to the Page where the Drawer contains Exit to WordPress Button', () => { + it( 'Go to the Page where the Drawer contains Exit to WordPress Button', () => { cy.get( '.nfd-onboarding-etw__trigger' ).click(); cy.get( '.components-modal__content' ).should( 'be.visible' ); } ); - it.skip( 'Check if heading and paragraph content exists', () => { + it ('Check if the Exit modal opens up', () => { + cy.get( '.components-modal__content' ).should('be.visible'); cy.get( 'h1.components-modal__header-heading' ).should( 'be.visible' ); - cy.get( '.components-modal__content > p' ).should( 'be.visible' ); } ); - it.skip( "Stay on Onboarding Page when 'X'/Continue is clicked", () => { + it( "Stay on Onboarding Page when 'X'/Continue is clicked", () => { cy.url().then( ( currUrl ) => { // When 'X' is clicked cy.get( '.components-modal__header > .components-button' ).click(); @@ -28,10 +30,9 @@ describe( 'Exit to WordPress', function () { } ); } ); - it.skip( 'Exit to WordPress Page', () => { + it( 'Exit to WordPress Page', () => { cy.get( '.nfd-onboarding-etw__trigger' ).click(); cy.get( '.nfd-onboarding-etw__buttons > .is-primary' ).click(); - cy.url( { timeout: 12000 } ).should( 'contain', 'index.php' ); + cy.url( { timeout: 12000 } ).should( 'contain', GetPluginId() ); } ); - } ); diff --git a/tests/cypress/integration/2-general-onboarding-flow/get-started-experience.cy.js b/tests/cypress/integration/2-general-onboarding-flow/get-started-experience.cy.js index a0cb39cf8..975404122 100644 --- a/tests/cypress/integration/2-general-onboarding-flow/get-started-experience.cy.js +++ b/tests/cypress/integration/2-general-onboarding-flow/get-started-experience.cy.js @@ -2,12 +2,14 @@ import { CheckDrawerDisabled } from '../wp-module-support/drawer.cy'; import { CheckCardHeadingSubheading } from '../wp-module-support/header.cy'; import { + BasicSidebarCheck, CheckHelpPanelLinks, CheckIllustrationPanel, CheckInfoPanel, CheckIntroPanel, } from '../wp-module-support/sidebar.cy'; import { APIList, EventsAPI } from '../wp-module-support/EventsApi.cy'; +import { GetPluginId } from '../wp-module-support/pluginID.cy'; describe( 'Start Setup WP Experience Page', function () { before( () => { @@ -20,6 +22,7 @@ describe( 'Start Setup WP Experience Page', function () { CheckDrawerDisabled(); } ); + if(GetPluginId()=='bluehost'){ it( 'Check to make sure sidebar opens, content is in place and close sidebar', () => { CheckIntroPanel( '__get-started-wp-experience', @@ -29,17 +32,25 @@ describe( 'Start Setup WP Experience Page', function () { CheckInfoPanel(); CheckHelpPanelLinks(); } ); + } + else{ + it( 'Check to make sure Sidebar opens', () => { + BasicSidebarCheck(); + } ); + }; it( 'Check if Headers Load', () => { CheckCardHeadingSubheading( true ); } ); - it( 'Check if `site` appears in heading', () => { - cy.get( '.nfd-step-card-heading' ) - .should( 'be.visible' ) - .contains( 'site' ); - } ); - + if(GetPluginId()!='hostgator'){ + it( 'Check if `site` appears in heading', () => { + cy.get( '.nfd-step-card-heading' ) + .should( 'be.visible' ) + .contains( 'site' ); + } ); + }; + it( 'Check if Radio Options load', () => { cy.get( '.components-radio-control__option' ) .should( 'exist' ) @@ -89,11 +100,6 @@ describe( 'Start Setup WP Experience Page', function () { } ); it( 'Checks if Continue Setup Button is Enabled after the Radio Button is Checked.', () => { - cy.get( '[type=radio]:checked' ).should( - 'have.css', - 'background-color', - 'rgb(53, 117, 211)' - ); cy.get( '.nfd-card-button' ).should( 'not.be.disabled' ).click(); cy.url().should( 'not.contain', 'get-started/experience' ); cy.go( 'back' ); diff --git a/tests/cypress/integration/2-general-onboarding-flow/get-started-welcome.cy.js b/tests/cypress/integration/2-general-onboarding-flow/get-started-welcome.cy.js index 71da3cf53..798f73227 100644 --- a/tests/cypress/integration/2-general-onboarding-flow/get-started-welcome.cy.js +++ b/tests/cypress/integration/2-general-onboarding-flow/get-started-welcome.cy.js @@ -2,12 +2,13 @@ import { CheckDrawerDisabled } from '../wp-module-support/drawer.cy'; import { CheckCardHeadingSubheading } from '../wp-module-support/header.cy'; import { + BasicSidebarCheck, CheckHelpPanelLinks, CheckIllustrationPanel, CheckInfoPanel, CheckIntroPanel, } from '../wp-module-support/sidebar.cy'; -import { GetPluginId } from '../wp-module-support/pluginID.cy'; +import { GetPluginId, GetPluginName } from '../wp-module-support/pluginID.cy'; describe( 'Get Started Welcome Page', function () { before( () => { @@ -31,14 +32,14 @@ describe( 'Get Started Welcome Page', function () { } ); } ); - it.skip( 'Check Exit to Wordpress button is visible and clickable and continue flow', () => { + it( 'Check Exit to Wordpress button is visible and clickable and continue flow', () => { cy.get( '.nfd-onboarding-etw__trigger' ).should( 'be.visible' ).click(); cy.get( '.components-modal__screen-overlay' ).should( 'be.visible' ); cy.get( '.nfd-onboarding-etw__buttons > .is-secondary' ).click(); cy.get( '.components-modal__screen-overlay' ).should( 'not.exist' ); } ); - it.skip( 'Check Exit to Wordpress button is visible and clickable and cancel', () => { + it( 'Check Exit to Wordpress button is visible and clickable and cancel', () => { cy.get( '.nfd-onboarding-etw__trigger' ).should( 'be.visible' ).click(); cy.get( '.components-modal__screen-overlay' ).should( 'be.visible' ); cy.get( '.components-modal__header > button' ).click(); @@ -49,12 +50,27 @@ describe( 'Get Started Welcome Page', function () { CheckDrawerDisabled(); } ); - it( 'Check to make sure sidebar opens, content is in place and close sidebar', () => { - CheckIntroPanel( '__get-started-welcome', 'Start Setup' ); - CheckIllustrationPanel(); - CheckInfoPanel( 2 ); - CheckHelpPanelLinks( true, 'Hire Our Full-Service Creative Team' ); - } ); + if(GetPluginId()=='bluehost'){ + it( 'Check to make sure sidebar opens, content is in place and close sidebar', () => { + CheckIntroPanel( '__get-started-welcome', 'Start Setup' ); + CheckIllustrationPanel(); + CheckInfoPanel( 2 ); + CheckHelpPanelLinks( true, 'Hire Our Full-Service Creative Team' ); + } ); + + it( 'Check if `website` appears in heading', () => { + cy.get('.nfd-step-card-heading') + .scrollIntoView() + .should('be.visible') + .contains('website'); + }); + } + else{ + it( 'Check to make sure Sidebar opens', () => { + BasicSidebarCheck(); + } ); + }; + it( 'Check if welcome card is visible', () => { cy.get( '.welcome-card' ).should( 'be.visible' ); @@ -65,13 +81,7 @@ describe( 'Get Started Welcome Page', function () { } ); it( 'Check for brandname in sub heading', () => { - cy.get( '.nfd-step-card-subheading' ).should( 'contain', GetPluginId().charAt(0).toUpperCase() + GetPluginId().slice(1) ); - } ); - - it( 'Check if `website` appears in heading', () => { - cy.get('.nfd-step-card-heading') - .should('be.visible') - .contains('website'); + GetPluginName(); } ); it( 'Check navigation back is not visible', () => { @@ -84,7 +94,7 @@ describe( 'Get Started Welcome Page', function () { cy.get('.navigation-buttons_back').click(); } ); - it.skip( 'Check Exit to Wordpress button is visible and clickable and exit flow', () => { + it( 'Check Exit to Wordpress button is visible and clickable and exit flow', () => { cy.get( '.nfd-onboarding-etw__trigger' ).should( 'be.visible' ).click(); cy.get( '.components-modal__screen-overlay' ).should( 'be.visible' ); cy.get( '.nfd-onboarding-etw__buttons > .is-primary' ).click(); diff --git a/tests/cypress/integration/2-general-onboarding-flow/site-features.cy.js b/tests/cypress/integration/2-general-onboarding-flow/site-features.cy.js index e565c7ce8..d08ca7034 100644 --- a/tests/cypress/integration/2-general-onboarding-flow/site-features.cy.js +++ b/tests/cypress/integration/2-general-onboarding-flow/site-features.cy.js @@ -1,7 +1,9 @@ // import { DrawerActivityForMenu } from '../wp-module-support/drawer.cy'; import { CheckHeadingSubheading } from '../wp-module-support/header.cy'; +import { GetPluginId } from '../wp-module-support/pluginID.cy'; import { + BasicSidebarCheck, CheckHelpPanelLinks, CheckIllustrationPanel, CheckInfoPanel, @@ -26,21 +28,27 @@ describe( 'Site Features', function () { .contains('site'); } ); - it.skip( 'Check Drawer Activity', () => { + it( 'Check Drawer Activity', () => { DrawerActivityForMenu( - 'Exit to WordPress', + 'WordPress', ':nth-child(5)', - 'Features', false ); } ); + if(GetPluginId()=='bluehost'){ it( 'Check to make sure sidebar opens, content is in place and close sidebar', () => { CheckIntroPanel( '__site-features', 'Features' ); CheckIllustrationPanel(); CheckInfoPanel(); CheckHelpPanelLinks(); } ); + } + else{ + it( 'Check to make sure Sidebar opens', () => { + BasicSidebarCheck(); + } ); + }; it( 'Check if Site Features list exists and select them', () => { let previewCount = 0; diff --git a/tests/cypress/integration/2-general-onboarding-flow/sitetype-primary.cy.js b/tests/cypress/integration/2-general-onboarding-flow/sitetype-primary.cy.js index 72b24062b..65cb3e615 100644 --- a/tests/cypress/integration/2-general-onboarding-flow/sitetype-primary.cy.js +++ b/tests/cypress/integration/2-general-onboarding-flow/sitetype-primary.cy.js @@ -3,11 +3,13 @@ import { APIList, EventsAPI } from '../wp-module-support/EventsApi.cy'; import { CheckDrawerDisabled } from '../wp-module-support/drawer.cy'; import { CheckCardHeadingSubheading } from '../wp-module-support/header.cy'; import { + BasicSidebarCheck, CheckHelpPanelLinks, CheckIllustrationPanel, CheckInfoPanel, CheckIntroPanel, } from '../wp-module-support/sidebar.cy'; +import { GetPluginId } from '../wp-module-support/pluginID.cy'; describe( 'Get Started Site Type Primary', function () { before( () => { @@ -25,13 +27,20 @@ describe( 'Get Started Site Type Primary', function () { CheckCardHeadingSubheading( true ); } ); - it( 'Check to make sure sidebar opens, content is in place and close sidebar', () => { - CheckIntroPanel( '__get-started-site-type', 'Site Type' ); - CheckIllustrationPanel(); - CheckInfoPanel(); - CheckHelpPanelLinks(); - } ); - + if(GetPluginId()=='bluehost'){ + it( 'Check to make sure sidebar opens, content is in place and close sidebar', () => { + CheckIntroPanel( '__get-started-site-type', 'Site Type' ); + CheckIllustrationPanel(); + CheckInfoPanel(); + CheckHelpPanelLinks(); + } ); + } + else{ + it( 'Check to make sure Sidebar opens', () => { + BasicSidebarCheck(); + } ); + }; + it( 'Check for Event API call being made when different categories are selected', ()=>{ let categoryCount = 0; let num = 0; diff --git a/tests/cypress/integration/2-general-onboarding-flow/sitetype-secondary.cy.js b/tests/cypress/integration/2-general-onboarding-flow/sitetype-secondary.cy.js index 2489b518a..08a956ef7 100644 --- a/tests/cypress/integration/2-general-onboarding-flow/sitetype-secondary.cy.js +++ b/tests/cypress/integration/2-general-onboarding-flow/sitetype-secondary.cy.js @@ -3,11 +3,13 @@ import { APIList, EventsAPI } from '../wp-module-support/EventsApi.cy'; import { CheckDrawerDisabled } from '../wp-module-support/drawer.cy'; import { CheckCardHeadingSubheading } from '../wp-module-support/header.cy'; import { + BasicSidebarCheck, CheckHelpPanelLinks, CheckIllustrationPanel, CheckInfoPanel, CheckIntroPanel, } from '../wp-module-support/sidebar.cy'; +import { GetPluginId } from '../wp-module-support/pluginID.cy'; describe( 'Get Started Site Type Secondary', function () { before( () => { @@ -25,12 +27,19 @@ describe( 'Get Started Site Type Secondary', function () { CheckCardHeadingSubheading( true ); } ); - it( 'Check to make sure sidebar opens, content is in place and close sidebar', () => { - CheckIntroPanel( '__get-started-site-type', 'Site Type' ); - CheckIllustrationPanel(); - CheckInfoPanel(); - CheckHelpPanelLinks(); - } ); + if(GetPluginId()=='bluehost'){ + it( 'Check to make sure sidebar opens, content is in place and close sidebar', () => { + CheckIntroPanel( '__get-started-site-type', 'Site Type' ); + CheckIllustrationPanel(); + CheckInfoPanel(); + CheckHelpPanelLinks(); + } ); + } + else{ + it( 'Check to make sure Sidebar opens', () => { + BasicSidebarCheck(); + } ) + }; it( 'Check for Event API call being made when different sub-categories are selected', ()=>{ let SubcategoryCount = 0; diff --git a/tests/cypress/integration/3-ecommerce-onboarding-flow/address.cy.js b/tests/cypress/integration/3-ecommerce-onboarding-flow/address.cy.js index 757dbab38..c3c19372b 100644 --- a/tests/cypress/integration/3-ecommerce-onboarding-flow/address.cy.js +++ b/tests/cypress/integration/3-ecommerce-onboarding-flow/address.cy.js @@ -1,7 +1,9 @@ // import { DrawerActivityForMenu } from '../wp-module-support/drawer.cy'; import { CheckCardHeadingSubheading } from '../wp-module-support/header.cy'; +import { GetPluginId } from '../wp-module-support/pluginID.cy'; import { + BasicSidebarCheck, CheckHelpPanelLinks, CheckIllustrationPanel, CheckInfoPanel, @@ -10,8 +12,9 @@ import { describe( 'Step Ecommerce Address/Store Details', function () { before( () => { - cy.wait( 10000 ); + cy.wait(2000); cy.exec('npx wp-env run cli wp option delete nfd_module_onboarding_flow'); + cy.wait( 10000 ); cy.visit( 'wp-admin/?page=nfd-onboarding&flow=ecommerce#/ecommerce/step/address' ); @@ -19,24 +22,26 @@ describe( 'Step Ecommerce Address/Store Details', function () { } ); it( 'Check Drawer Activity', () => { - cy.visit( - 'wp-admin/?page=nfd-onboarding&flow=ecommerce#/ecommerce/step/address' - ); - cy.wait( 8000 ); DrawerActivityForMenu( - 'Onboarding Menu', + 'Onboarding', ':nth-child(1)', - 'Street Address' ); } ); - it( 'Check to make sure sidebar opens, content is in place and close sidebar', () => { - CheckIntroPanel( '__ecommerce-address', 'Street Address' ); - CheckIllustrationPanel(); - CheckInfoPanel(); - CheckHelpPanelLinks(); - } ); - + if(GetPluginId()=='bluehost'){ + it( 'Check to make sure sidebar opens, content is in place and close sidebar', () => { + CheckIntroPanel( '__ecommerce-address', 'Street Address' ); + CheckIllustrationPanel(); + CheckInfoPanel(); + CheckHelpPanelLinks(); + } ); + } + else{ + it( 'Check to make sure Sidebar opens', () => { + BasicSidebarCheck(); + } ); + }; + it( 'Checks if Heading and Subheading are present', () => { CheckCardHeadingSubheading(); } ); diff --git a/tests/cypress/integration/3-ecommerce-onboarding-flow/basic-info.cy.js b/tests/cypress/integration/3-ecommerce-onboarding-flow/basic-info.cy.js index eeb4f090a..90cac13ff 100644 --- a/tests/cypress/integration/3-ecommerce-onboarding-flow/basic-info.cy.js +++ b/tests/cypress/integration/3-ecommerce-onboarding-flow/basic-info.cy.js @@ -2,6 +2,7 @@ import { DrawerClose } from '../wp-module-support/drawer.cy'; import { CheckHeadingSubheading } from '../wp-module-support/header.cy'; import { + BasicSidebarCheck, CheckHelpPanelLinks, CheckIllustrationPanel, CheckInfoPanel, @@ -9,6 +10,7 @@ import { } from '../wp-module-support/sidebar.cy'; import { SocialMediaTextValidations } from '../wp-module-support/socialMedia.cy'; import { APIList, BasicInfoAPI } from '../wp-module-support/EventsApi.cy'; +import { GetPluginId } from '../wp-module-support/pluginID.cy'; describe( 'Basic Info Page', function () { const desc = 'Welcome to WordPress'; @@ -37,7 +39,6 @@ describe( 'Basic Info Page', function () { cy.get( ':nth-child(2) > .nfd-onboarding-drawer__panel-menu-link' ) .should( 'have.class', 'active' ) - .should( 'have.text', 'Basic Info' ) .and( 'have.attr', 'href' ) .then( ( value ) => ( href = value ) ); cy.url().then( ( url ) => { @@ -51,18 +52,25 @@ describe( 'Basic Info Page', function () { CheckHeadingSubheading(); } ); - it( 'Check if `store` appears in heading', () => { - cy.get( '.nfd-main-heading__title' ) - .should( 'be.visible' ) - .contains( 'store' ); - } ); + if(GetPluginId()=='bluehost'){ + it( 'Check to make sure sidebar opens, content is in place and close sidebar', () => { + CheckIntroPanel( '__basic-info', 'Basic Info' ); + CheckIllustrationPanel(); + CheckInfoPanel(); + CheckHelpPanelLinks(); + } ); - it( 'Check to make sure sidebar opens, content is in place and close sidebar', () => { - CheckIntroPanel( '__basic-info', 'Basic Info' ); - CheckIllustrationPanel(); - CheckInfoPanel(); - CheckHelpPanelLinks(); - } ); + it( 'Check if `store` appears in heading', () => { + cy.get( '.nfd-main-heading__title' ) + .should( 'be.visible' ) + .contains( 'store' ); + } ); + } + else{ + it( 'Check to make sure Sidebar opens', () => { + BasicSidebarCheck(); + } ); + }; it( 'Enter a Title and then Check if it reflects elsewhere', () => { const titleBox = cy.get( ':nth-child(1) > label > .nfd-input__field' ); @@ -169,15 +177,23 @@ describe( 'Basic Info Page', function () { // The URL Checker runs on a debounce // Shows the message to the User in case of Invalid URL cy.get( '.Tooltip-Wrapper', { timeout: 3000 } ).should( 'exist' ); - cy.get( '.Tooltip-Tip', { timeout: 3000 } ) + if(GetPluginId()!='hostgator'){ + cy.get( '.Tooltip-Tip', { timeout: 3000 } ) .should( 'be.visible' ) .should( 'contain', Tooltiptext2 ); - cy.get( '.navigation-buttons_next' ).click(); - cy.get( '.components-modal__content' ).should( 'be.visible' ); - cy.get( '.components-modal__header-heading' ).should( - 'have.text', - ModalText2 - ); + cy.get( '.navigation-buttons_next' ).click(); + cy.get( '.components-modal__content' ).should( 'be.visible' ); + cy.get( '.components-modal__header-heading' ).should( + 'have.text', + ModalText2 + ); + } + else{ + cy.get( '.Tooltip-Tip', { timeout: 3000 } ).should( 'be.visible' ); + cy.get( '.navigation-buttons_next' ).click(); + cy.get( '.components-modal__content' ).should( 'be.visible' ); + } + cy.get( '.components-modal__header button' , { timeout: customCommandTimeout } ).click() cy.get( '.browser-content_social_icon[style="background-image: var(--facebook-icon);"]' @@ -207,7 +223,6 @@ describe( 'Basic Info Page', function () { cy .get( '.image-uploader_window-reset-btn' ) .should( 'exist' ) - .contains( 'UPLOAD' ) ) { cy.get( '.image-uploader_window-logo-icon-selected' ).should( 'not.exist' diff --git a/tests/cypress/integration/3-ecommerce-onboarding-flow/exit-to-wordpress.cy.js b/tests/cypress/integration/3-ecommerce-onboarding-flow/exit-to-wordpress.cy.js index 2ad25feeb..a61612975 100644 --- a/tests/cypress/integration/3-ecommerce-onboarding-flow/exit-to-wordpress.cy.js +++ b/tests/cypress/integration/3-ecommerce-onboarding-flow/exit-to-wordpress.cy.js @@ -6,17 +6,17 @@ describe( 'Exit to WordPress', function () { cy.visit( 'wp-admin/?page=nfd-onboarding&flow=ecommerce#/wp-setup/step/basic-info' ); } ); - it.skip( 'Go to the Page where the Drawer contains Exit to WordPress Button', () => { + it( 'Go to the Page where the Drawer contains Exit to WordPress Button', () => { cy.get( '.nfd-onboarding-etw__trigger' ).click(); cy.get( '.components-modal__content' ).should( 'be.visible' ); } ); - it.skip( 'Check if heading and paragraph content exists', () => { + it ('Check if the Exit modal opens up', () => { + cy.get( '.components-modal__content' ).should('be.visible'); cy.get( 'h1.components-modal__header-heading' ).should( 'be.visible' ); - cy.get( '.components-modal__content > p' ).should( 'be.visible' ); } ); - it.skip( "Stay on Onboarding Page when 'X'/Continue is clicked", () => { + it( "Stay on Onboarding Page when 'X'/Continue is clicked", () => { cy.url().then( ( currUrl ) => { // When 'X' is clicked cy.get( '.components-modal__header > .components-button' ).click(); @@ -29,7 +29,7 @@ describe( 'Exit to WordPress', function () { } ); } ); - it.skip( 'Exit to WordPress Page', () => { + it( 'Exit to WordPress Page', () => { cy.get( '.nfd-onboarding-etw__trigger' ).click(); cy.get( '.nfd-onboarding-etw__buttons > .is-primary' ).click(); cy.url( { timeout: 12000 } ).should( 'contain', GetPluginId() ); diff --git a/tests/cypress/integration/3-ecommerce-onboarding-flow/get-started-experience.cy.js b/tests/cypress/integration/3-ecommerce-onboarding-flow/get-started-experience.cy.js index a6dc70e3b..0ff33ad1b 100644 --- a/tests/cypress/integration/3-ecommerce-onboarding-flow/get-started-experience.cy.js +++ b/tests/cypress/integration/3-ecommerce-onboarding-flow/get-started-experience.cy.js @@ -2,12 +2,14 @@ import { CheckDrawerDisabled } from '../wp-module-support/drawer.cy'; import { CheckCardHeadingSubheading } from '../wp-module-support/header.cy'; import { + BasicSidebarCheck, CheckHelpPanelLinks, CheckIllustrationPanel, CheckInfoPanel, CheckIntroPanel, } from '../wp-module-support/sidebar.cy'; import { APIList, EventsAPI } from '../wp-module-support/EventsApi.cy'; +import { GetPluginId } from '../wp-module-support/pluginID.cy'; describe( 'Start Setup WP Experience Page', function () { before( () => { @@ -20,26 +22,33 @@ describe( 'Start Setup WP Experience Page', function () { CheckDrawerDisabled(); } ); - it( 'Check to make sure sidebar opens, content is in place and close sidebar', () => { - CheckIntroPanel( - '__get-started-wp-experience', - 'WordPress Experience' - ); - CheckIllustrationPanel(); - CheckInfoPanel(); - CheckHelpPanelLinks(); - } ); + if(GetPluginId()=='bluehost'){ + it( 'Check to make sure sidebar opens, content is in place and close sidebar', () => { + CheckIntroPanel( + '__get-started-wp-experience', + 'WordPress Experience' + ); + CheckIllustrationPanel(); + CheckInfoPanel(); + CheckHelpPanelLinks(); + } ); + + it( 'Check if `store` appears in heading', () => { + cy.get( '.nfd-step-card-heading' ) + .should( 'be.visible' ) + .contains( 'store' ); + } ); + } + else{ + it( 'Check to make sure Sidebar opens', () => { + BasicSidebarCheck(); + } ); + }; it( 'Check if Headers Load', () => { CheckCardHeadingSubheading( true ); } ); - it( 'Check if `store` appears in heading', () => { - cy.get( '.nfd-step-card-heading' ) - .should( 'be.visible' ) - .contains( 'store' ); - } ); - it( 'Check if Radio Options load', () => { cy.get( '.components-radio-control__option' ) .should( 'exist' ) @@ -89,11 +98,6 @@ describe( 'Start Setup WP Experience Page', function () { } ); it( 'Checks if Continue Setup Button is Enabled after the Radio Button is Checked.', () => { - cy.get( '[type=radio]:checked' ).should( - 'have.css', - 'background-color', - 'rgb(53, 117, 211)' - ); cy.get( '.nfd-card-button' ).should( 'not.be.disabled' ).click(); cy.url().should( 'not.contain', 'get-started/experience' ); cy.go( 'back' ); diff --git a/tests/cypress/integration/3-ecommerce-onboarding-flow/get-started-welcome.cy.js b/tests/cypress/integration/3-ecommerce-onboarding-flow/get-started-welcome.cy.js index 57a0d106b..0752c9380 100644 --- a/tests/cypress/integration/3-ecommerce-onboarding-flow/get-started-welcome.cy.js +++ b/tests/cypress/integration/3-ecommerce-onboarding-flow/get-started-welcome.cy.js @@ -2,12 +2,13 @@ import { CheckDrawerDisabled } from '../wp-module-support/drawer.cy'; import { CheckCardHeadingSubheading } from '../wp-module-support/header.cy'; import { + BasicSidebarCheck, CheckHelpPanelLinks, CheckIllustrationPanel, CheckInfoPanel, CheckIntroPanel, } from '../wp-module-support/sidebar.cy'; -import { GetPluginId } from '../wp-module-support/pluginID.cy'; +import { GetPluginId, GetPluginName } from '../wp-module-support/pluginID.cy'; describe( 'Get Started Welcome Page', function () { before( () => { @@ -31,14 +32,14 @@ describe( 'Get Started Welcome Page', function () { } ); } ); - it.skip( 'Check Exit to Wordpress button is visible and clickable and continue flow', () => { + it( 'Check Exit to Wordpress button is visible and clickable and continue flow', () => { cy.get( '.nfd-onboarding-etw__trigger' ).should( 'be.visible' ).click(); cy.get( '.components-modal__screen-overlay' ).should( 'be.visible' ); cy.get( '.nfd-onboarding-etw__buttons > .is-secondary' ).click(); cy.get( '.components-modal__screen-overlay' ).should( 'not.exist' ); } ); - it.skip( 'Check Exit to Wordpress button is visible and clickable and cancel', () => { + it( 'Check Exit to Wordpress button is visible and clickable and cancel', () => { cy.get( '.nfd-onboarding-etw__trigger' ).should( 'be.visible' ).click(); cy.get( '.components-modal__screen-overlay' ).should( 'be.visible' ); cy.get( '.components-modal__header > button' ).click(); @@ -49,12 +50,26 @@ describe( 'Get Started Welcome Page', function () { CheckDrawerDisabled(); } ); - it( 'Check to make sure sidebar opens, content is in place and close sidebar', () => { - CheckIntroPanel( '__get-started-welcome', 'Start Setup' ); - CheckIllustrationPanel(); - CheckInfoPanel( 2 ); - CheckHelpPanelLinks( true, 'Hire Our Full-Service Creative Team' ); - } ); + if(GetPluginId()=='bluehost'){ + it( 'Check to make sure sidebar opens, content is in place and close sidebar', () => { + CheckIntroPanel( '__get-started-welcome', 'Start Setup' ); + CheckIllustrationPanel(); + CheckInfoPanel( 2 ); + CheckHelpPanelLinks( true, 'Hire Our Full-Service Creative Team' ); + } ); + + it( 'Check if `store` appears in heading', () => { + cy.get('.nfd-step-card-heading') + .scrollIntoView() + .should('be.visible') + .contains('store'); + } ); + } + else{ + it( 'Check to make sure Sidebar opens', () => { + BasicSidebarCheck(); + } ); + }; it( 'Check if welcome card is visible', () => { cy.get( '.welcome-card' ).should( 'be.visible' ); @@ -65,15 +80,7 @@ describe( 'Get Started Welcome Page', function () { } ); it( 'Check for brandname in sub heading', () => { - cy.exec( `npx wp-env run cli wp option set mm_brand ${ GetPluginId() }` ); - cy.reload(); - cy.get( '.nfd-step-card-subheading' ).should( 'contain', GetPluginId().charAt(0).toUpperCase() + GetPluginId().slice(1)); - } ); - - it( 'Check if `store` appears in heading', () => { - cy.get('.nfd-step-card-heading') - .should('be.visible') - .contains('store'); + GetPluginName(); } ); it( 'Check navigation back is not visible', () => { @@ -86,7 +93,7 @@ describe( 'Get Started Welcome Page', function () { cy.get('.navigation-buttons_back').click(); } ); - it.skip( 'Check Exit to Wordpress button is visible and clickable and exit flow', () => { + it( 'Check Exit to Wordpress button is visible and clickable and exit flow', () => { cy.get( '.nfd-onboarding-etw__trigger' ).should( 'be.visible' ).click(); cy.get( '.components-modal__screen-overlay' ).should( 'be.visible' ); cy.get( '.nfd-onboarding-etw__buttons > .is-primary' ).click(); diff --git a/tests/cypress/integration/3-ecommerce-onboarding-flow/products.cy.js b/tests/cypress/integration/3-ecommerce-onboarding-flow/products.cy.js index 255d9ddd6..d161e1d40 100644 --- a/tests/cypress/integration/3-ecommerce-onboarding-flow/products.cy.js +++ b/tests/cypress/integration/3-ecommerce-onboarding-flow/products.cy.js @@ -1,7 +1,9 @@ // import { DrawerActivityForMenu } from '../wp-module-support/drawer.cy'; import { CheckCardHeadingSubheading } from '../wp-module-support/header.cy'; +import { GetPluginId } from '../wp-module-support/pluginID.cy'; import { + BasicSidebarCheck, CheckHelpPanelLinks, CheckIllustrationPanel, CheckInfoPanel, @@ -18,19 +20,25 @@ describe( 'Step Ecommerce Products Info', function () { it( 'Check Drawer Activity', () => { DrawerActivityForMenu( - 'Onboarding Menu', + 'Onboarding', ':nth-child(2)', - 'Product Info', false ); } ); - it( 'Check to make sure sidebar opens, content is in place and close sidebar', () => { - CheckIntroPanel( '__ecommerce-products', 'Products Info' ); - CheckIllustrationPanel(); - CheckInfoPanel(); - CheckHelpPanelLinks(); - } ); + if(GetPluginId()=='bluehost'){ + it( 'Check to make sure sidebar opens, content is in place and close sidebar', () => { + CheckIntroPanel( '__ecommerce-products', 'Products Info' ); + CheckIllustrationPanel(); + CheckInfoPanel(); + CheckHelpPanelLinks(); + } ); + } + else{ + it( 'Check to make sure Sidebar opens', () => { + BasicSidebarCheck(); + } ); + }; it( 'Checks if Heading and Subheading are present', () => { CheckCardHeadingSubheading(); diff --git a/tests/cypress/integration/3-ecommerce-onboarding-flow/site-features.cy.js b/tests/cypress/integration/3-ecommerce-onboarding-flow/site-features.cy.js index 38a265f6e..e2b338575 100644 --- a/tests/cypress/integration/3-ecommerce-onboarding-flow/site-features.cy.js +++ b/tests/cypress/integration/3-ecommerce-onboarding-flow/site-features.cy.js @@ -1,7 +1,9 @@ // import { DrawerActivityForMenu } from '../wp-module-support/drawer.cy'; import { CheckHeadingSubheading } from '../wp-module-support/header.cy'; +import { GetPluginId } from '../wp-module-support/pluginID.cy'; import { + BasicSidebarCheck, CheckHelpPanelLinks, CheckIllustrationPanel, CheckInfoPanel, @@ -20,21 +22,28 @@ describe( 'Site Features', function () { CheckHeadingSubheading(); } ); - it.skip( 'Check Drawer Activity', () => { + it( 'Check Drawer Activity', () => { DrawerActivityForMenu( - 'Exit to WordPress', + 'WordPress', ':nth-child(5)', - 'Features', false ); } ); - it( 'Check to make sure sidebar opens, content is in place and close sidebar', () => { - CheckIntroPanel( '__site-features', 'Features' ); - CheckIllustrationPanel(); - CheckInfoPanel(); - CheckHelpPanelLinks(); - } ); + if(GetPluginId()=='bluehost'){ + it( 'Check to make sure sidebar opens, content is in place and close sidebar', () => { + CheckIntroPanel( '__site-features', 'Features' ); + CheckIllustrationPanel(); + CheckInfoPanel(); + CheckHelpPanelLinks(); + } ); + } + else{ + it( 'Check to make sure Sidebar opens', () => { + BasicSidebarCheck(); + } ); + } + it( 'Check if Site Features list exists and select them', () => { let previewCount = 0; diff --git a/tests/cypress/integration/3-ecommerce-onboarding-flow/sitetype-primary.cy.js b/tests/cypress/integration/3-ecommerce-onboarding-flow/sitetype-primary.cy.js index d6e58d4f0..60805caa7 100644 --- a/tests/cypress/integration/3-ecommerce-onboarding-flow/sitetype-primary.cy.js +++ b/tests/cypress/integration/3-ecommerce-onboarding-flow/sitetype-primary.cy.js @@ -2,7 +2,9 @@ import { APIList, EventsAPI } from '../wp-module-support/EventsApi.cy'; import { CheckDrawerDisabled } from '../wp-module-support/drawer.cy'; import { CheckCardHeadingSubheading } from '../wp-module-support/header.cy'; +import { GetPluginId } from '../wp-module-support/pluginID.cy'; import { + BasicSidebarCheck, CheckHelpPanelLinks, CheckIllustrationPanel, CheckInfoPanel, @@ -25,24 +27,31 @@ describe( 'Get Started Site Type Primary', function () { CheckCardHeadingSubheading( true ); } ); - it( 'Check if `store` appears in heading', () => { - cy.get('.nfd-step-card-heading') - .should('be.visible') - .contains('store'); - } ); + if(GetPluginId()=='bluehost'){ + it( 'Check if `store` appears in heading', () => { + cy.get('.nfd-step-card-heading') + .should('be.visible') + .contains('store'); + } ); - it( 'Check to make sure sidebar opens, content is in place and close sidebar', () => { - CheckIntroPanel( '__get-started-site-type', 'Store Type' ); - CheckIllustrationPanel(); - CheckInfoPanel(); - CheckHelpPanelLinks(); - } ); + it( 'Check to make sure sidebar opens, content is in place and close sidebar', () => { + CheckIntroPanel( '__get-started-site-type', 'Store Type' ); + CheckIllustrationPanel(); + CheckInfoPanel(); + CheckHelpPanelLinks(); + } ); - it( 'Check if Business category is pre-selected', () => { - cy.get( '.chosenPrimaryCategory' ) - .find( '.categName' ) - .should( 'have.text', 'Business' ); - } ); + it( 'Check if Business category is pre-selected', () => { + cy.get( '.chosenPrimaryCategory' ) + .find( '.categName' ) + .should( 'have.text', 'Business' ); + } ); + } + else{ + it( 'Check to make sure Sidebar opens', () => { + BasicSidebarCheck(); + } ); + }; it( 'Check for Event API call being made when different categories are selected', ()=>{ let categoryCount = 0; diff --git a/tests/cypress/integration/3-ecommerce-onboarding-flow/sitetype-secondary.cy.js b/tests/cypress/integration/3-ecommerce-onboarding-flow/sitetype-secondary.cy.js index b5236fd34..13cb808d7 100644 --- a/tests/cypress/integration/3-ecommerce-onboarding-flow/sitetype-secondary.cy.js +++ b/tests/cypress/integration/3-ecommerce-onboarding-flow/sitetype-secondary.cy.js @@ -2,7 +2,9 @@ import { APIList, EventsAPI } from '../wp-module-support/EventsApi.cy'; import { CheckDrawerDisabled } from '../wp-module-support/drawer.cy'; import { CheckCardHeadingSubheading } from '../wp-module-support/header.cy'; +import { GetPluginId } from '../wp-module-support/pluginID.cy'; import { + BasicSidebarCheck, CheckHelpPanelLinks, CheckIllustrationPanel, CheckInfoPanel, @@ -25,26 +27,33 @@ describe( 'Get Started Site Type Secondary', function () { CheckCardHeadingSubheading( true ); } ); - it( 'Check if `store` appears in heading', () => { - cy.get('.nfd-step-card-heading') - .should('be.visible') - .contains('store'); - } ); - - it( 'Check to make sure sidebar opens, content is in place and close sidebar', () => { - CheckIntroPanel( '__get-started-site-type', 'Store Type' ); - CheckIllustrationPanel(); - CheckInfoPanel(); - CheckHelpPanelLinks(); - } ); + if(GetPluginId()=='bluehost'){ + it( 'Check if `store` appears in heading', () => { + cy.get('.nfd-step-card-heading') + .should('be.visible') + .contains('store'); + } ); + + it( 'Check to make sure sidebar opens, content is in place and close sidebar', () => { + CheckIntroPanel( '__get-started-site-type', 'Store Type' ); + CheckIllustrationPanel(); + CheckInfoPanel(); + CheckHelpPanelLinks(); + } ); - it( 'Check selected category is visible and selected', () => { - cy.get( '.category-scrolling-wrapper' ).should( 'be.visible' ); - cy.get( '.category-scrolling-wrapper__type-text' ).should( - 'contain', - 'Business' - ); - } ); + it( 'Check selected category is visible and selected', () => { + cy.get( '.category-scrolling-wrapper' ).should( 'be.visible' ); + cy.get( '.category-scrolling-wrapper__type-text' ).should( + 'contain', + 'Business' + ); + } ); + } + else{ + it( 'Check to make sure Sidebar opens', () => { + BasicSidebarCheck(); + } ); + }; it( 'Check for Event API call being made when different sub-categories are selected', ()=>{ let SubcategoryCount = 0; diff --git a/tests/cypress/integration/4-design-steps/colors-step.cy.js b/tests/cypress/integration/4-design-steps/colors-step.cy.js index d668ca914..3d15da0da 100644 --- a/tests/cypress/integration/4-design-steps/colors-step.cy.js +++ b/tests/cypress/integration/4-design-steps/colors-step.cy.js @@ -1,6 +1,8 @@ // import { DrawerActivityForSubMenu } from '../wp-module-support/drawer.cy'; +import { GetPluginId } from '../wp-module-support/pluginID.cy'; import { + BasicSidebarCheck, CheckHelpPanelLinks, CheckIllustrationPanel, CheckInfoPanel, @@ -24,12 +26,20 @@ describe( 'Colors Step Test', function () { ); } ); - it( 'Check to make sure sidebar opens, content is in place and close sidebar', () => { - CheckIntroPanel( '__design-colors', 'Colors' ); - CheckIllustrationPanel(); - CheckInfoPanel(); - CheckHelpPanelLinks(); - } ); + if(GetPluginId()=='bluehost'){ + it( 'Check to make sure sidebar opens, content is in place and close sidebar', () => { + CheckIntroPanel( '__design-colors', 'Colors' ); + CheckIllustrationPanel(); + CheckInfoPanel(); + CheckHelpPanelLinks(); + } ); + } + else{ + it( 'Check to make sure Sidebar opens', () => { + BasicSidebarCheck(); + } ); + }; + it( 'Check if Default Color variations exists and are selectable', () => { let previewCount = 0; diff --git a/tests/cypress/integration/4-design-steps/header-menu.cy.js b/tests/cypress/integration/4-design-steps/header-menu.cy.js index daa36b7c8..3f6131961 100644 --- a/tests/cypress/integration/4-design-steps/header-menu.cy.js +++ b/tests/cypress/integration/4-design-steps/header-menu.cy.js @@ -1,6 +1,8 @@ // import { DrawerActivityForSubMenu } from '../wp-module-support/drawer.cy'; +import { GetPluginId } from '../wp-module-support/pluginID.cy'; import { + BasicSidebarCheck, CheckHelpPanelLinks, CheckIllustrationPanel, CheckInfoPanel, @@ -28,12 +30,20 @@ describe( 'Header menu Page', function () { cy.contains( 'button', 'Design' ).should( 'be.visible' ); } ); - it( 'Check to make sure sidebar opens, content is in place and close sidebar', () => { - CheckIntroPanel( '__design-header-menu', 'Header & Menu' ); - CheckIllustrationPanel(); - CheckInfoPanel( 2 ); - CheckHelpPanelLinks(); - } ); + if(GetPluginId()=='bluehost'){ + it( 'Check to make sure sidebar opens, content is in place and close sidebar', () => { + CheckIntroPanel( '__design-header-menu', 'Header & Menu' ); + CheckIllustrationPanel(); + CheckInfoPanel( 2 ); + CheckHelpPanelLinks(); + } ); + } + else{ + it( 'Check to make sure Sidebar opens', () => { + BasicSidebarCheck(); + } ); + } + it( 'Check to make sure different design is selected', () => { let previewCount = 0; diff --git a/tests/cypress/integration/4-design-steps/homepage-styles.cy.js b/tests/cypress/integration/4-design-steps/homepage-styles.cy.js index c9192d81e..1012a91f0 100644 --- a/tests/cypress/integration/4-design-steps/homepage-styles.cy.js +++ b/tests/cypress/integration/4-design-steps/homepage-styles.cy.js @@ -2,7 +2,9 @@ import { DrawerActivityForMenu } from '../wp-module-support/drawer.cy'; import { CheckHeadingSubheading } from '../wp-module-support/header.cy'; +import { GetPluginId } from '../wp-module-support/pluginID.cy'; import { + BasicSidebarCheck, CheckHelpPanelLinks, CheckIllustrationPanel, CheckInfoPanel, @@ -23,18 +25,25 @@ describe( 'Homepage Styles Page', function () { it( 'Check Drawer Activity', () => { DrawerActivityForMenu( - 'Onboarding Menu', + 'Onboarding', ':nth-child(5)', 'Homepage Layouts' ); } ); + if(GetPluginId()=='bluehost'){ it( 'Check to make sure sidebar opens, content is in place and close sidebar', () => { CheckIntroPanel( '__design-homepage', 'Home Page' ); CheckIllustrationPanel(); CheckInfoPanel( 2 ); CheckHelpPanelLinks(); } ); + } + else{ + it( 'Check to make sure Sidebar opens', () => { + BasicSidebarCheck(); + } ); + }; it( 'Check if Homepage Styles exist and are selectable', () => { let previewCount = 0; diff --git a/tests/cypress/integration/4-design-steps/site-pages.cy.js b/tests/cypress/integration/4-design-steps/site-pages.cy.js index 2d791379c..66b5ea6c2 100644 --- a/tests/cypress/integration/4-design-steps/site-pages.cy.js +++ b/tests/cypress/integration/4-design-steps/site-pages.cy.js @@ -1,7 +1,9 @@ // import { DrawerActivityForMenu } from '../wp-module-support/drawer.cy'; import { CheckHeadingSubheading } from '../wp-module-support/header.cy'; +import { GetPluginId } from '../wp-module-support/pluginID.cy'; import { + BasicSidebarCheck, CheckHelpPanelLinks, CheckIllustrationPanel, CheckInfoPanel, @@ -22,18 +24,25 @@ describe( 'Site Pages', function () { it( 'Check Drawer Activity', () => { DrawerActivityForMenu( - 'Onboarding Menu', + 'Onboarding', ':nth-child(6)', 'Page Layouts' ); } ); + if(GetPluginId()=='bluehost'){ it( 'Check to make sure sidebar opens, content is in place and close sidebar', () => { CheckIntroPanel( '__site-pages', 'Pages' ); CheckIllustrationPanel(); CheckInfoPanel(); CheckHelpPanelLinks(); } ); + } + else{ + it( 'Check to make sure Sidebar opens', () => { + BasicSidebarCheck(); + } ); + } it( 'Check if Site Pages Templates exist and are selectable', () => { let previewCount = 0; diff --git a/tests/cypress/integration/4-design-steps/theme-styles-menu.cy.js b/tests/cypress/integration/4-design-steps/theme-styles-menu.cy.js index c15580ae4..2949d742c 100644 --- a/tests/cypress/integration/4-design-steps/theme-styles-menu.cy.js +++ b/tests/cypress/integration/4-design-steps/theme-styles-menu.cy.js @@ -1,7 +1,9 @@ // import { DrawerActivityForMenu } from '../wp-module-support/drawer.cy'; import { CheckHeadingSubheading } from '../wp-module-support/header.cy'; +import { GetPluginId } from '../wp-module-support/pluginID.cy'; import { + BasicSidebarCheck, CheckHelpPanelLinks, CheckIllustrationPanel, CheckInfoPanel, @@ -18,18 +20,26 @@ describe( 'Theme Styles Menu', function () { it( 'Check Drawer Activity', () => { DrawerActivityForMenu( - 'Onboarding Menu', + 'Onboarding', ':nth-child(1)', 'Theme Styles' ); } ); - it( 'Check to make sure sidebar opens, content is in place and close sidebar', () => { + if(GetPluginId()=='bluehost'){ + it( 'Check to make sure sidebar opens, content is in place and close sidebar', () => { CheckIntroPanel( '__design-theme-styles-menu', 'Theme Styles' ); CheckIllustrationPanel(); CheckInfoPanel( 2 ); CheckHelpPanelLinks(); } ); + } + else{ + it( 'Check to make sure Sidebar opens', () => { + BasicSidebarCheck(); + } ); + }; + it( 'Checks if Heading and Subheading are present', () => { CheckHeadingSubheading(); diff --git a/tests/cypress/integration/4-design-steps/theme-styles-preview.cy.js b/tests/cypress/integration/4-design-steps/theme-styles-preview.cy.js index 9902552ac..fa9242a09 100644 --- a/tests/cypress/integration/4-design-steps/theme-styles-preview.cy.js +++ b/tests/cypress/integration/4-design-steps/theme-styles-preview.cy.js @@ -1,5 +1,7 @@ // +import { GetPluginId } from '../wp-module-support/pluginID.cy'; import { + BasicSidebarCheck, CheckHelpPanelLinks, CheckIllustrationPanel, CheckInfoPanel, @@ -13,13 +15,21 @@ describe( 'Theme Styles Preview', function () { ); cy.wait( 10000 ); } ); - - it( 'Check to make sure sidebar opens, content is in place and close sidebar', () => { - CheckIntroPanel( '__design-theme-styles-preview', 'Theme Styles' ); - CheckIllustrationPanel(); - CheckInfoPanel( 2 ); - CheckHelpPanelLinks(); - } ); + + if(GetPluginId()=='bluehost'){ + it( 'Check to make sure sidebar opens, content is in place and close sidebar', () => { + CheckIntroPanel( '__design-theme-styles-preview', 'Theme Styles' ); + CheckIllustrationPanel(); + CheckInfoPanel( 2 ); + CheckHelpPanelLinks(); + } ); + } + else{ + it( 'Check to make sure Sidebar opens', () => { + BasicSidebarCheck(); + } ); + } + it( 'Check if Theme is selected and content is in place', () => { cy.get( ':nth-child(1) > .theme-styles-preview__title-bar' ).should( diff --git a/tests/cypress/integration/4-design-steps/typography-step.cy.js b/tests/cypress/integration/4-design-steps/typography-step.cy.js index c9df59e5c..7c0a0a267 100644 --- a/tests/cypress/integration/4-design-steps/typography-step.cy.js +++ b/tests/cypress/integration/4-design-steps/typography-step.cy.js @@ -1,6 +1,8 @@ // import { DrawerActivityForSubMenu } from '../wp-module-support/drawer.cy'; +import { GetPluginId } from '../wp-module-support/pluginID.cy'; import { + BasicSidebarCheck, CheckHelpPanelLinks, CheckIllustrationPanel, CheckInfoPanel, @@ -23,12 +25,19 @@ describe( 'Typography Step Test', function () { ); } ); - it.skip( 'Check to make sure sidebar opens, content is in place and close sidebar', () => { - CheckIntroPanel( '__design-fonts', 'Fonts' ); - CheckIllustrationPanel(); - CheckInfoPanel(); - CheckHelpPanelLinks(); - } ); + if(GetPluginId()=='bluehost'){ + it( 'Check to make sure sidebar opens, content is in place and close sidebar', () => { + CheckIntroPanel( '__design-fonts', 'Fonts' ); + CheckIllustrationPanel(); + CheckInfoPanel(); + CheckHelpPanelLinks(); + } ); + } + else{ + it( 'Check to make sure Sidebar opens', () => { + BasicSidebarCheck(); + } ); + }; it( 'Check if Default Typography variations exists and are selectable', () => { let previewCount = 0; diff --git a/tests/cypress/integration/sidebar.cy.js b/tests/cypress/integration/sidebar.cy.js index 8a035dcd7..b4d276e2d 100644 --- a/tests/cypress/integration/sidebar.cy.js +++ b/tests/cypress/integration/sidebar.cy.js @@ -31,7 +31,6 @@ describe( 'Sidebar', function () { cy.get( '.nfd-onboarding-header__end > .components-button' ).click(); cy.get( '.components-panel__header' ) .should( 'be.visible' ) - .should( 'have.text', 'Learn More' ); cy.get( '.navigation-buttons_next' ).click(); cy.url().should( 'not.include', '#/wp-setup/step/get-started/welcome' ); cy.get( '.components-panel__header' ).should( 'be.visible' ); diff --git a/tests/cypress/integration/wp-module-support/drawer.cy.js b/tests/cypress/integration/wp-module-support/drawer.cy.js index 2b7c3d31a..200484492 100644 --- a/tests/cypress/integration/wp-module-support/drawer.cy.js +++ b/tests/cypress/integration/wp-module-support/drawer.cy.js @@ -29,7 +29,6 @@ export const DrawerClose = () => { export const DrawerActivityForMenu = ( text, itemPosition, - itemName, isOpen = true ) => { let href; @@ -41,12 +40,11 @@ export const DrawerActivityForMenu = ( .should( 'be.visible' ); cy.get( '.nfd-onboarding-drawer__panel-back' ) .should( 'be.visible' ) - .should( 'have.text', text ); + .contains( text ); cy.get( itemPosition.concat( ' > .nfd-onboarding-drawer__panel-menu-link' ) ) .should( 'have.class', 'active' ) - .should( 'have.text', itemName ) .and( 'have.attr', 'href' ) .then( ( value ) => ( href = value ) ); cy.url().then( ( url ) => { diff --git a/tests/cypress/integration/wp-module-support/pluginID.cy.js b/tests/cypress/integration/wp-module-support/pluginID.cy.js index 8903e1918..1865c17ea 100644 --- a/tests/cypress/integration/wp-module-support/pluginID.cy.js +++ b/tests/cypress/integration/wp-module-support/pluginID.cy.js @@ -2,3 +2,15 @@ export const GetPluginId = () => { return Cypress.env('pluginId'); } + +export const GetPluginName = () => { + if(GetPluginId()=='bluehost'){ + cy.get( '.nfd-step-card-subheading', {timeout:20000} ).should( 'contain', 'Bluehost'); + }; + if(GetPluginId()=='hostgator'){ + cy.get( '.nfd-step-card-subheading', {timeout:20000} ).should( 'contain', 'HostGator'); + }; + if(GetPluginId()=='crazy-domains'){ + cy.get( '.nfd-step-card-subheading', {timeout:20000} ).should( 'contain', 'Crazy Domains'); + }; +} diff --git a/tests/cypress/integration/wp-module-support/sidebar.cy.js b/tests/cypress/integration/wp-module-support/sidebar.cy.js index d4b80f944..778e8898f 100644 --- a/tests/cypress/integration/wp-module-support/sidebar.cy.js +++ b/tests/cypress/integration/wp-module-support/sidebar.cy.js @@ -64,3 +64,13 @@ export const CheckHelpPanelLinks = ( .click() .and( 'not.have.class', 'is-pressed' ); }; + +export const BasicSidebarCheck = () => { + cy.get('.nfd-onboarding-sidebar-learn-more__menu-button') + .should('be.visible') + .click(); + cy.get('.nfd-onboarding-sidebar-learn-more--help-panel__links', {timeout:15000}) + .should('be.visible'); + cy.get('.nfd-onboarding-sidebar-learn-more__menu-button') + .click(); +} diff --git a/tests/cypress/integration/wp-module-support/socialMedia.cy.js b/tests/cypress/integration/wp-module-support/socialMedia.cy.js index 48c75f92d..b837d59dc 100644 --- a/tests/cypress/integration/wp-module-support/socialMedia.cy.js +++ b/tests/cypress/integration/wp-module-support/socialMedia.cy.js @@ -1,5 +1,7 @@ // +import { GetPluginId } from "./pluginID.cy"; + export const SocialMediaTextValidations = ( URL, ToolTipText, ModalHeaderText ) => { const NextButton = '.navigation-buttons_next'; const socialTest = '#facebook'; @@ -7,12 +9,21 @@ export const SocialMediaTextValidations = ( URL, ToolTipText, ModalHeaderText ) cy.get(socialTest).clear(); cy.get(socialTest).type( URL ); cy.get('#twitter').focus(); - cy.get( '.Tooltip-Tip' , { timeout: 3000 }) + if(GetPluginId()=='hostgator'){ + cy.get( '.Tooltip-Tip' , { timeout: 3000 }) + .should('be.visible'); + cy.get(NextButton).click(); + cy.get( '.components-modal__content' ).should('be.visible'); + cy.get( '.components-modal__header-heading' ).should('be.visible'); + } + else{ + cy.get( '.Tooltip-Tip' , { timeout: 3000 }) .should('be.visible') .should('contain', ToolTipText); - cy.get(NextButton).click(); - cy.get( '.components-modal__content' ).should('be.visible'); - cy.get( '.components-modal__header-heading' ).should('have.text', ModalHeaderText); + cy.get(NextButton).click(); + cy.get( '.components-modal__content' ).should('be.visible'); + cy.get( '.components-modal__header-heading' ).should('have.text', ModalHeaderText); + }; cy.get(':nth-child(2) > .components-button-group > .is-secondary').click(); cy.get(NextButton).click(); cy.get('.components-modal__header button', {timeout: 10000}).click()