From bdb729a1f2e8c99cbefdc502269754cef4b2e753 Mon Sep 17 00:00:00 2001 From: Avneet Raj Date: Wed, 17 Jan 2024 19:18:43 +0530 Subject: [PATCH 1/6] Update Tests to pass across plugins --- .../1-Initial-steps/branding.cy.js | 39 ++++++----- .../1-Initial-steps/whats-next.cy.js | 66 ++++++++++-------- .../basic-info.cy.js | 67 +++++++++++-------- .../exit-to-wordpress.cy.js | 15 +++-- .../get-started-experience.cy.js | 28 +++++--- .../get-started-welcome.cy.js | 43 +++++++----- .../site-features.cy.js | 14 +++- .../sitetype-primary.cy.js | 23 +++++-- .../sitetype-secondary.cy.js | 21 ++++-- .../3-ecommerce-onboarding-flow/address.cy.js | 33 +++++---- .../basic-info.cy.js | 55 +++++++++------ .../exit-to-wordpress.cy.js | 10 +-- .../get-started-experience.cy.js | 44 ++++++------ .../get-started-welcome.cy.js | 44 ++++++------ .../products.cy.js | 24 ++++--- .../site-features.cy.js | 27 +++++--- .../sitetype-primary.cy.js | 41 +++++++----- .../sitetype-secondary.cy.js | 47 +++++++------ .../4-design-steps/colors-step.cy.js | 22 ++++-- .../4-design-steps/header-menu.cy.js | 22 ++++-- .../4-design-steps/homepage-styles.cy.js | 11 ++- .../4-design-steps/site-pages.cy.js | 11 ++- .../4-design-steps/theme-styles-menu.cy.js | 14 +++- .../4-design-steps/theme-styles-preview.cy.js | 24 +++++-- .../4-design-steps/typography-step.cy.js | 21 ++++-- tests/cypress/integration/sidebar.cy.js | 1 - .../wp-module-support/drawer.cy.js | 4 +- .../wp-module-support/pluginID.cy.js | 12 ++++ .../wp-module-support/sidebar.cy.js | 10 +++ .../wp-module-support/socialMedia.cy.js | 19 ++++-- 30 files changed, 519 insertions(+), 293 deletions(-) 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..b8dbca57c 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()!='hostgator'){ + 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..9c9a3ed26 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()!='hostgator'){ + 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..36618d9f9 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()!='hostgator'){ 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..0242e725b 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,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()!='hostgator'){ + 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') + .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 +80,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 +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/2-general-onboarding-flow/site-features.cy.js b/tests/cypress/integration/2-general-onboarding-flow/site-features.cy.js index e565c7ce8..41c26bb9d 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()!='hostgator'){ 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..b9343ce9f 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()!='hostgator'){ + 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..18f6b76b3 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()!='hostgator'){ + 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..a3c5766ed 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()!='hostgator'){ + 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..b80171f9e 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()!='hostgator'){ + 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..bb33752fc 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()!='hostgator'){ + 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..872ffd3ad 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,25 @@ 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()!='hostgator'){ + 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') + .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 +79,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 +92,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..04c482acd 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()!='hostgator'){ + 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..59573651d 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()!='hostgator'){ + 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..b0d984c89 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()!='hostgator'){ + 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..8c03b24f7 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()!='hostgator'){ + 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..d1fb04e5f 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()!='hostgator'){ + 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..697ad9e07 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()!='hostgator'){ + 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..b50c779c4 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()!='hostgator'){ 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..6bfbd36ac 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()!='hostgator'){ 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..9aa61ef36 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()!='hostgator'){ + 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..d3c8a84a7 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()!='hostgator'){ + 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..c733495dc 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()!='hostgator'){ + 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() From c0acfd40692fb64d2c50ec9c18100c1e97d93c54 Mon Sep 17 00:00:00 2001 From: Avneet Raj Date: Thu, 18 Jan 2024 12:32:45 +0530 Subject: [PATCH 2/6] update tests with scrollIntoView() --- .../2-general-onboarding-flow/get-started-welcome.cy.js | 1 + .../3-ecommerce-onboarding-flow/get-started-welcome.cy.js | 1 + 2 files changed, 2 insertions(+) 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 0242e725b..0e10e6fdc 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 @@ -60,6 +60,7 @@ describe( 'Get Started Welcome Page', function () { it( 'Check if `website` appears in heading', () => { cy.get('.nfd-step-card-heading') + .scrollIntoView() .should('be.visible') .contains('website'); }); 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 872ffd3ad..143db3bf8 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 @@ -60,6 +60,7 @@ describe( 'Get Started Welcome Page', function () { it( 'Check if `store` appears in heading', () => { cy.get('.nfd-step-card-heading') + .scrollIntoView() .should('be.visible') .contains('store'); } ); From 3ddbb47a2efffdd7fc4ae475d602a838e74ac4bc Mon Sep 17 00:00:00 2001 From: Avneet Raj Date: Fri, 19 Jan 2024 12:17:25 +0530 Subject: [PATCH 3/6] update workflow to pick specific branch from CD & HG plugin --- .github/workflows/brand-plugin-test.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.github/workflows/brand-plugin-test.yml b/.github/workflows/brand-plugin-test.yml index 024e1e6e8..0f5da41c9 100644 --- a/.github/workflows/brand-plugin-test.yml +++ b/.github/workflows/brand-plugin-test.yml @@ -39,6 +39,7 @@ jobs: needs: setup uses: newfold-labs/workflows/.github/workflows/module-plugin-test.yml@main with: + plugin-branch: 'add/tests-for-onboarding' module-repo: ${{ github.repository }} module-branch: ${{ needs.setup.outputs.branch }} plugin-repo: "newfold-labs/wp-plugin-hostgator" @@ -49,6 +50,7 @@ jobs: needs: setup uses: newfold-labs/workflows/.github/workflows/module-plugin-test.yml@main with: + plugin-branch: 'add/tests-for-onboarding' module-repo: ${{ github.repository }} module-branch: ${{ needs.setup.outputs.branch }} plugin-repo: "newfold-labs/wp-plugin-crazy-domains" From 1a469f16e4ab3a09a4c43a7dba6c5bf8cebd6704 Mon Sep 17 00:00:00 2001 From: Avneet Raj Date: Fri, 19 Jan 2024 13:41:27 +0530 Subject: [PATCH 4/6] Update tests to pass for CD plugin --- tests/cypress/integration/1-Initial-steps/whats-next.cy.js | 2 +- .../integration/2-general-onboarding-flow/basic-info.cy.js | 2 +- .../2-general-onboarding-flow/get-started-experience.cy.js | 2 +- .../2-general-onboarding-flow/get-started-welcome.cy.js | 2 +- .../integration/2-general-onboarding-flow/site-features.cy.js | 2 +- .../2-general-onboarding-flow/sitetype-primary.cy.js | 2 +- .../2-general-onboarding-flow/sitetype-secondary.cy.js | 2 +- .../integration/3-ecommerce-onboarding-flow/address.cy.js | 2 +- .../integration/3-ecommerce-onboarding-flow/basic-info.cy.js | 2 +- .../3-ecommerce-onboarding-flow/get-started-experience.cy.js | 2 +- .../3-ecommerce-onboarding-flow/get-started-welcome.cy.js | 2 +- .../integration/3-ecommerce-onboarding-flow/products.cy.js | 2 +- .../integration/3-ecommerce-onboarding-flow/site-features.cy.js | 2 +- .../3-ecommerce-onboarding-flow/sitetype-primary.cy.js | 2 +- .../3-ecommerce-onboarding-flow/sitetype-secondary.cy.js | 2 +- tests/cypress/integration/4-design-steps/colors-step.cy.js | 2 +- tests/cypress/integration/4-design-steps/header-menu.cy.js | 2 +- tests/cypress/integration/4-design-steps/homepage-styles.cy.js | 2 +- tests/cypress/integration/4-design-steps/site-pages.cy.js | 2 +- .../cypress/integration/4-design-steps/theme-styles-menu.cy.js | 2 +- .../integration/4-design-steps/theme-styles-preview.cy.js | 2 +- tests/cypress/integration/4-design-steps/typography-step.cy.js | 2 +- 22 files changed, 22 insertions(+), 22 deletions(-) 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 b8dbca57c..28dd76e9f 100644 --- a/tests/cypress/integration/1-Initial-steps/whats-next.cy.js +++ b/tests/cypress/integration/1-Initial-steps/whats-next.cy.js @@ -26,7 +26,7 @@ describe( 'What Next Page', function () { ); } ); - if(GetPluginId()!='hostgator'){ + 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' ); 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 9c9a3ed26..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 @@ -50,7 +50,7 @@ describe( 'Basic Info Page', function () { CheckHeadingSubheading(); } ); - if(GetPluginId()!='hostgator'){ + if(GetPluginId()=='bluehost'){ it( 'Check to make sure sidebar opens, content is in place and close sidebar', () => { CheckIntroPanel( '__basic-info', 'Basic Info' ); CheckIllustrationPanel(); 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 36618d9f9..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 @@ -22,7 +22,7 @@ describe( 'Start Setup WP Experience Page', function () { CheckDrawerDisabled(); } ); - if(GetPluginId()!='hostgator'){ + if(GetPluginId()=='bluehost'){ it( 'Check to make sure sidebar opens, content is in place and close sidebar', () => { CheckIntroPanel( '__get-started-wp-experience', 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 0e10e6fdc..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 @@ -50,7 +50,7 @@ describe( 'Get Started Welcome Page', function () { CheckDrawerDisabled(); } ); - if(GetPluginId()!='hostgator'){ + if(GetPluginId()=='bluehost'){ it( 'Check to make sure sidebar opens, content is in place and close sidebar', () => { CheckIntroPanel( '__get-started-welcome', 'Start Setup' ); CheckIllustrationPanel(); 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 41c26bb9d..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 @@ -36,7 +36,7 @@ describe( 'Site Features', function () { ); } ); - if(GetPluginId()!='hostgator'){ + if(GetPluginId()=='bluehost'){ it( 'Check to make sure sidebar opens, content is in place and close sidebar', () => { CheckIntroPanel( '__site-features', 'Features' ); CheckIllustrationPanel(); 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 b9343ce9f..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 @@ -27,7 +27,7 @@ describe( 'Get Started Site Type Primary', function () { CheckCardHeadingSubheading( true ); } ); - if(GetPluginId()!='hostgator'){ + 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(); 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 18f6b76b3..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 @@ -27,7 +27,7 @@ describe( 'Get Started Site Type Secondary', function () { CheckCardHeadingSubheading( true ); } ); - if(GetPluginId()!='hostgator'){ + 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(); 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 a3c5766ed..c3c19372b 100644 --- a/tests/cypress/integration/3-ecommerce-onboarding-flow/address.cy.js +++ b/tests/cypress/integration/3-ecommerce-onboarding-flow/address.cy.js @@ -28,7 +28,7 @@ describe( 'Step Ecommerce Address/Store Details', function () { ); } ); - if(GetPluginId()!='hostgator'){ + if(GetPluginId()=='bluehost'){ it( 'Check to make sure sidebar opens, content is in place and close sidebar', () => { CheckIntroPanel( '__ecommerce-address', 'Street Address' ); CheckIllustrationPanel(); 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 b80171f9e..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 @@ -52,7 +52,7 @@ describe( 'Basic Info Page', function () { CheckHeadingSubheading(); } ); - if(GetPluginId()!='hostgator'){ + if(GetPluginId()=='bluehost'){ it( 'Check to make sure sidebar opens, content is in place and close sidebar', () => { CheckIntroPanel( '__basic-info', 'Basic Info' ); CheckIllustrationPanel(); 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 bb33752fc..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 @@ -22,7 +22,7 @@ describe( 'Start Setup WP Experience Page', function () { CheckDrawerDisabled(); } ); - if(GetPluginId()!='hostgator'){ + if(GetPluginId()=='bluehost'){ it( 'Check to make sure sidebar opens, content is in place and close sidebar', () => { CheckIntroPanel( '__get-started-wp-experience', 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 143db3bf8..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 @@ -50,7 +50,7 @@ describe( 'Get Started Welcome Page', function () { CheckDrawerDisabled(); } ); - if(GetPluginId()!='hostgator'){ + if(GetPluginId()=='bluehost'){ it( 'Check to make sure sidebar opens, content is in place and close sidebar', () => { CheckIntroPanel( '__get-started-welcome', 'Start Setup' ); CheckIllustrationPanel(); 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 04c482acd..d161e1d40 100644 --- a/tests/cypress/integration/3-ecommerce-onboarding-flow/products.cy.js +++ b/tests/cypress/integration/3-ecommerce-onboarding-flow/products.cy.js @@ -26,7 +26,7 @@ describe( 'Step Ecommerce Products Info', function () { ); } ); - if(GetPluginId()!='hostgator'){ + if(GetPluginId()=='bluehost'){ it( 'Check to make sure sidebar opens, content is in place and close sidebar', () => { CheckIntroPanel( '__ecommerce-products', 'Products Info' ); CheckIllustrationPanel(); 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 59573651d..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 @@ -30,7 +30,7 @@ describe( 'Site Features', function () { ); } ); - if(GetPluginId()!='hostgator'){ + if(GetPluginId()=='bluehost'){ it( 'Check to make sure sidebar opens, content is in place and close sidebar', () => { CheckIntroPanel( '__site-features', 'Features' ); CheckIllustrationPanel(); 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 b0d984c89..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 @@ -27,7 +27,7 @@ describe( 'Get Started Site Type Primary', function () { CheckCardHeadingSubheading( true ); } ); - if(GetPluginId()!='hostgator'){ + if(GetPluginId()=='bluehost'){ it( 'Check if `store` appears in heading', () => { cy.get('.nfd-step-card-heading') .should('be.visible') 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 8c03b24f7..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 @@ -27,7 +27,7 @@ describe( 'Get Started Site Type Secondary', function () { CheckCardHeadingSubheading( true ); } ); - if(GetPluginId()!='hostgator'){ + if(GetPluginId()=='bluehost'){ it( 'Check if `store` appears in heading', () => { cy.get('.nfd-step-card-heading') .should('be.visible') 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 d1fb04e5f..3d15da0da 100644 --- a/tests/cypress/integration/4-design-steps/colors-step.cy.js +++ b/tests/cypress/integration/4-design-steps/colors-step.cy.js @@ -26,7 +26,7 @@ describe( 'Colors Step Test', function () { ); } ); - if(GetPluginId()!='hostgator'){ + if(GetPluginId()=='bluehost'){ it( 'Check to make sure sidebar opens, content is in place and close sidebar', () => { CheckIntroPanel( '__design-colors', 'Colors' ); CheckIllustrationPanel(); 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 697ad9e07..3f6131961 100644 --- a/tests/cypress/integration/4-design-steps/header-menu.cy.js +++ b/tests/cypress/integration/4-design-steps/header-menu.cy.js @@ -30,7 +30,7 @@ describe( 'Header menu Page', function () { cy.contains( 'button', 'Design' ).should( 'be.visible' ); } ); - if(GetPluginId()!='hostgator'){ + if(GetPluginId()=='bluehost'){ it( 'Check to make sure sidebar opens, content is in place and close sidebar', () => { CheckIntroPanel( '__design-header-menu', 'Header & Menu' ); CheckIllustrationPanel(); 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 b50c779c4..1012a91f0 100644 --- a/tests/cypress/integration/4-design-steps/homepage-styles.cy.js +++ b/tests/cypress/integration/4-design-steps/homepage-styles.cy.js @@ -31,7 +31,7 @@ describe( 'Homepage Styles Page', function () { ); } ); - if(GetPluginId()!='hostgator'){ + if(GetPluginId()=='bluehost'){ it( 'Check to make sure sidebar opens, content is in place and close sidebar', () => { CheckIntroPanel( '__design-homepage', 'Home Page' ); CheckIllustrationPanel(); 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 6bfbd36ac..66b5ea6c2 100644 --- a/tests/cypress/integration/4-design-steps/site-pages.cy.js +++ b/tests/cypress/integration/4-design-steps/site-pages.cy.js @@ -30,7 +30,7 @@ describe( 'Site Pages', function () { ); } ); - if(GetPluginId()!='hostgator'){ + if(GetPluginId()=='bluehost'){ it( 'Check to make sure sidebar opens, content is in place and close sidebar', () => { CheckIntroPanel( '__site-pages', 'Pages' ); CheckIllustrationPanel(); 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 9aa61ef36..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 @@ -26,7 +26,7 @@ describe( 'Theme Styles Menu', function () { ); } ); - if(GetPluginId()!='hostgator'){ + 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(); 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 d3c8a84a7..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 @@ -16,7 +16,7 @@ describe( 'Theme Styles Preview', function () { cy.wait( 10000 ); } ); - if(GetPluginId()!='hostgator'){ + 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(); 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 c733495dc..7c0a0a267 100644 --- a/tests/cypress/integration/4-design-steps/typography-step.cy.js +++ b/tests/cypress/integration/4-design-steps/typography-step.cy.js @@ -25,7 +25,7 @@ describe( 'Typography Step Test', function () { ); } ); - if(GetPluginId()!='hostgator'){ + if(GetPluginId()=='bluehost'){ it( 'Check to make sure sidebar opens, content is in place and close sidebar', () => { CheckIntroPanel( '__design-fonts', 'Fonts' ); CheckIllustrationPanel(); From ee7207fc485b8d2cb3f611cf89ec99acd6d0ce20 Mon Sep 17 00:00:00 2001 From: Avneet Raj Date: Thu, 25 Jan 2024 11:54:36 +0530 Subject: [PATCH 5/6] remove plugin-branch param --- .github/workflows/brand-plugin-test.yml | 2 -- 1 file changed, 2 deletions(-) diff --git a/.github/workflows/brand-plugin-test.yml b/.github/workflows/brand-plugin-test.yml index 0f5da41c9..024e1e6e8 100644 --- a/.github/workflows/brand-plugin-test.yml +++ b/.github/workflows/brand-plugin-test.yml @@ -39,7 +39,6 @@ jobs: needs: setup uses: newfold-labs/workflows/.github/workflows/module-plugin-test.yml@main with: - plugin-branch: 'add/tests-for-onboarding' module-repo: ${{ github.repository }} module-branch: ${{ needs.setup.outputs.branch }} plugin-repo: "newfold-labs/wp-plugin-hostgator" @@ -50,7 +49,6 @@ jobs: needs: setup uses: newfold-labs/workflows/.github/workflows/module-plugin-test.yml@main with: - plugin-branch: 'add/tests-for-onboarding' module-repo: ${{ github.repository }} module-branch: ${{ needs.setup.outputs.branch }} plugin-repo: "newfold-labs/wp-plugin-crazy-domains" From 4ab1096201efee64c589f57b285d6c651e13dbb3 Mon Sep 17 00:00:00 2001 From: arunshenoy99 Date: Mon, 29 Jan 2024 12:29:47 +0530 Subject: [PATCH 6/6] Bump Onboarding to 1.12.1 --- bootstrap.php | 2 +- build/{1.12.0 => 1.12.1}/111.js | 0 build/{1.12.0 => 1.12.1}/128.js | 0 build/{1.12.0 => 1.12.1}/244.js | 0 build/{1.12.0 => 1.12.1}/310.js | 0 build/{1.12.0 => 1.12.1}/33.js | 0 build/{1.12.0 => 1.12.1}/405.js | 0 build/{1.12.0 => 1.12.1}/420.js | 0 build/{1.12.0 => 1.12.1}/449.js | 0 build/{1.12.0 => 1.12.1}/465.js | 0 build/{1.12.0 => 1.12.1}/491.js | 0 build/{1.12.0 => 1.12.1}/537.js | 0 build/{1.12.0 => 1.12.1}/574.js | 0 build/{1.12.0 => 1.12.1}/58.js | 0 build/{1.12.0 => 1.12.1}/657.js | 0 build/{1.12.0 => 1.12.1}/662.js | 0 build/{1.12.0 => 1.12.1}/696.js | 0 build/{1.12.0 => 1.12.1}/704.js | 0 build/{1.12.0 => 1.12.1}/719.js | 0 build/{1.12.0 => 1.12.1}/73.js | 0 build/{1.12.0 => 1.12.1}/76.js | 0 build/{1.12.0 => 1.12.1}/792.js | 0 build/{1.12.0 => 1.12.1}/849.js | 0 build/{1.12.0 => 1.12.1}/856.js | 0 build/{1.12.0 => 1.12.1}/993.js | 0 build/{1.12.0 => 1.12.1}/994.js | 0 .../images/bluesky.733ebcbf.png | Bin .../images/content.fb050ea1.png | Bin .../images/design.cc6a697f.png | Bin .../images/features.593fb09c.png | Bin .../images/full-service.7f58f410.png | Bin .../images/full-service.adb3abd6.png | Bin .../{1.12.0 => 1.12.1}/images/help.19cc7e75.png | Bin .../images/step-interstitial.00b15f9e.png | Bin .../images/wp-admin.2908b886.png | Bin .../images/wp-admin.6c8af0b4.png | Bin .../images/wp-admin.d8650899.png | Bin build/{1.12.0 => 1.12.1}/onboarding.asset.php | 0 build/{1.12.0 => 1.12.1}/onboarding.css | 0 build/{1.12.0 => 1.12.1}/onboarding.js | 0 package-lock.json | 16 +++++++--------- package.json | 2 +- 42 files changed, 9 insertions(+), 11 deletions(-) rename build/{1.12.0 => 1.12.1}/111.js (100%) rename build/{1.12.0 => 1.12.1}/128.js (100%) rename build/{1.12.0 => 1.12.1}/244.js (100%) rename build/{1.12.0 => 1.12.1}/310.js (100%) rename build/{1.12.0 => 1.12.1}/33.js (100%) rename build/{1.12.0 => 1.12.1}/405.js (100%) rename build/{1.12.0 => 1.12.1}/420.js (100%) rename build/{1.12.0 => 1.12.1}/449.js (100%) rename build/{1.12.0 => 1.12.1}/465.js (100%) rename build/{1.12.0 => 1.12.1}/491.js (100%) rename build/{1.12.0 => 1.12.1}/537.js (100%) rename build/{1.12.0 => 1.12.1}/574.js (100%) rename build/{1.12.0 => 1.12.1}/58.js (100%) rename build/{1.12.0 => 1.12.1}/657.js (100%) rename build/{1.12.0 => 1.12.1}/662.js (100%) rename build/{1.12.0 => 1.12.1}/696.js (100%) rename build/{1.12.0 => 1.12.1}/704.js (100%) rename build/{1.12.0 => 1.12.1}/719.js (100%) rename build/{1.12.0 => 1.12.1}/73.js (100%) rename build/{1.12.0 => 1.12.1}/76.js (100%) rename build/{1.12.0 => 1.12.1}/792.js (100%) rename build/{1.12.0 => 1.12.1}/849.js (100%) rename build/{1.12.0 => 1.12.1}/856.js (100%) rename build/{1.12.0 => 1.12.1}/993.js (100%) rename build/{1.12.0 => 1.12.1}/994.js (100%) rename build/{1.12.0 => 1.12.1}/images/bluesky.733ebcbf.png (100%) rename build/{1.12.0 => 1.12.1}/images/content.fb050ea1.png (100%) rename build/{1.12.0 => 1.12.1}/images/design.cc6a697f.png (100%) rename build/{1.12.0 => 1.12.1}/images/features.593fb09c.png (100%) rename build/{1.12.0 => 1.12.1}/images/full-service.7f58f410.png (100%) rename build/{1.12.0 => 1.12.1}/images/full-service.adb3abd6.png (100%) rename build/{1.12.0 => 1.12.1}/images/help.19cc7e75.png (100%) rename build/{1.12.0 => 1.12.1}/images/step-interstitial.00b15f9e.png (100%) rename build/{1.12.0 => 1.12.1}/images/wp-admin.2908b886.png (100%) rename build/{1.12.0 => 1.12.1}/images/wp-admin.6c8af0b4.png (100%) rename build/{1.12.0 => 1.12.1}/images/wp-admin.d8650899.png (100%) rename build/{1.12.0 => 1.12.1}/onboarding.asset.php (100%) rename build/{1.12.0 => 1.12.1}/onboarding.css (100%) rename build/{1.12.0 => 1.12.1}/onboarding.js (100%) diff --git a/bootstrap.php b/bootstrap.php index cb9ef597a..caa964389 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 4079db581..d6d0036b5 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": { @@ -4723,14 +4723,6 @@ "webpack-bundle-analyzer": "^4.9.1", "webpack-cli": "^5.1.4", "webpack-dev-server": "^4.15.1" - }, - "dependencies": { - "prettier": { - "version": "npm:wp-prettier@3.0.3", - "resolved": "https://registry.npmjs.org/wp-prettier/-/wp-prettier-3.0.3.tgz", - "integrity": "sha512-X4UlrxDTH8oom9qXlcjnydsjAOD2BmB6yFmvS4Z2zdTzqqpRWb+fbqrH412+l+OUXmbzJlSXjlMFYPgYG12IAA==", - "dev": true - } } }, "@wordpress/style-engine": { @@ -13314,6 +13306,12 @@ "integrity": "sha512-vkcDPrRZo1QZLbn5RLGPpg/WmIQ65qoWWhcGKf/b5eplkkarX0m9z8ppCat4mlOqUsWpyNuYgO3VRyrYHSzX5g==", "dev": true }, + "prettier": { + "version": "npm:wp-prettier@3.0.3", + "resolved": "https://registry.npmjs.org/wp-prettier/-/wp-prettier-3.0.3.tgz", + "integrity": "sha512-X4UlrxDTH8oom9qXlcjnydsjAOD2BmB6yFmvS4Z2zdTzqqpRWb+fbqrH412+l+OUXmbzJlSXjlMFYPgYG12IAA==", + "dev": true + }, "prettier-linter-helpers": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/prettier-linter-helpers/-/prettier-linter-helpers-1.0.0.tgz", diff --git a/package.json b/package.json index c0f9ae6ed..2a4196e49 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,