From b3b48b685744b88d8abba2c1afa0d01e65b2e1f3 Mon Sep 17 00:00:00 2001 From: wpalani Date: Tue, 10 Oct 2023 15:45:36 -0700 Subject: [PATCH 1/4] Remove "Additional Features" section from the app home page. --- src/app/pages/home/index.js | 3 +-- tests/cypress/integration/home.cy.js | 9 ++++++--- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/src/app/pages/home/index.js b/src/app/pages/home/index.js index f7d482d08..81625333d 100644 --- a/src/app/pages/home/index.js +++ b/src/app/pages/home/index.js @@ -1,7 +1,7 @@ import { Page } from '../../components/page'; import { SectionContainer, SectionContent } from '../../components/section'; import { AccountCard } from './accountCard'; -import { FreeAddonsSection } from './freeAddonsSection'; +// import { FreeAddonsSection } from './freeAddonsSection'; import { HelpCard } from './helpCard'; import './stylesheet.scss'; import { WelcomeSection } from './welcomeSection'; @@ -10,7 +10,6 @@ const Home = () => { return ( -
diff --git a/tests/cypress/integration/home.cy.js b/tests/cypress/integration/home.cy.js index 9bd0e12e9..81c3eecef 100644 --- a/tests/cypress/integration/home.cy.js +++ b/tests/cypress/integration/home.cy.js @@ -1,16 +1,19 @@ // describe('Home Page', function () { + let runtimeData; before(() => { cy.visit('/wp-admin/admin.php?page=' + Cypress.env('pluginId') + '#/home'); + cy.window().its('NewfoldRuntime').then(data => { + runtimeData = data; + }); cy.injectAxe(); - }); it('Site Info Exists', () => { cy - .get('.wppbh-app-site-info').contains('h3', 'bluehost-wordpress-plugin') + .get('.wppbh-app-site-info').contains('h3', runtimeData.site.title) .scrollIntoView() .should('be.visible'); }); @@ -27,7 +30,7 @@ describe('Home Page', function () { .should('be.visible'); }); - it('Additional Features Section Exists', () => { + it.skip('Additional Features Section Exists', () => { cy .get('.nfd-app-section-container').contains('h2', 'Additional Features') .scrollIntoView() From a7de432721a16f53d789e18346a8a14ee5d7588d Mon Sep 17 00:00:00 2001 From: wpalani Date: Tue, 10 Oct 2023 15:55:50 -0700 Subject: [PATCH 2/4] composer validate --- composer.lock | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/composer.lock b/composer.lock index 944db411e..35ca3d348 100644 --- a/composer.lock +++ b/composer.lock @@ -4,7 +4,7 @@ "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies", "This file is @generated automatically" ], - "content-hash": "f33ae9406e76a602c9b0c476871d3167", + "content-hash": "03720319bd4ffd82050204cab231811f", "packages": [ { "name": "doctrine/inflector", @@ -2693,7 +2693,7 @@ "openmage/magento-lts": "<=19.5|>=20,<=20.1", "opensource-workshop/connect-cms": "<1.7.2|>=2,<2.3.2", "orchid/platform": ">=9,<9.4.4|>=14.0.0.0-alpha4,<14.5", - "oro/commerce": ">=4.1,<5.0.6", + "oro/commerce": ">=4.1,<5.0.11|>=5.1,<5.1.1", "oro/crm": ">=1.7,<1.7.4|>=3.1,<4.1.17|>=4.2,<4.2.7", "oro/platform": ">=1.7,<1.7.4|>=3.1,<3.1.29|>=4.1,<4.1.17|>=4.2,<4.2.8", "oxid-esales/oxideshop-ce": "<4.5", @@ -2814,7 +2814,7 @@ "slim/slim": "<2.6", "slub/slub-events": "<3.0.3", "smarty/smarty": "<3.1.48|>=4,<4.3.1", - "snipe/snipe-it": "<=6.0.14", + "snipe/snipe-it": "<=6.2.1", "socalnick/scn-social-auth": "<1.15.2", "socialiteproviders/steam": "<1.1", "spatie/browsershot": "<3.57.4", @@ -3528,5 +3528,5 @@ "platform-overrides": { "php": "7.1.0" }, - "plugin-api-version": "2.3.0" + "plugin-api-version": "2.6.0" } From b5608c51c5f2e32b5e777c020118e2b39fa59fbe Mon Sep 17 00:00:00 2001 From: wpalani Date: Tue, 10 Oct 2023 15:58:26 -0700 Subject: [PATCH 3/4] Change `runtimeData` to `NewfoldRuntime` to match the window --- tests/cypress/integration/home.cy.js | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/tests/cypress/integration/home.cy.js b/tests/cypress/integration/home.cy.js index 81c3eecef..1927225b6 100644 --- a/tests/cypress/integration/home.cy.js +++ b/tests/cypress/integration/home.cy.js @@ -1,19 +1,19 @@ // describe('Home Page', function () { - let runtimeData; + let NewfoldRuntime; before(() => { cy.visit('/wp-admin/admin.php?page=' + Cypress.env('pluginId') + '#/home'); cy.window().its('NewfoldRuntime').then(data => { - runtimeData = data; + NewfoldRuntime = data; }); cy.injectAxe(); }); it('Site Info Exists', () => { cy - .get('.wppbh-app-site-info').contains('h3', runtimeData.site.title) + .get('.wppbh-app-site-info').contains('h3', NewfoldRuntime.site.title) .scrollIntoView() .should('be.visible'); }); From f4c9a0cc660c6a2fe8e1647d7e935253eaa9d42c Mon Sep 17 00:00:00 2001 From: wpalani Date: Tue, 10 Oct 2023 16:54:37 -0700 Subject: [PATCH 4/4] Remove previously commented out line --- src/app/pages/home/index.js | 1 - 1 file changed, 1 deletion(-) diff --git a/src/app/pages/home/index.js b/src/app/pages/home/index.js index 81625333d..cf1ffef8d 100644 --- a/src/app/pages/home/index.js +++ b/src/app/pages/home/index.js @@ -1,7 +1,6 @@ import { Page } from '../../components/page'; import { SectionContainer, SectionContent } from '../../components/section'; import { AccountCard } from './accountCard'; -// import { FreeAddonsSection } from './freeAddonsSection'; import { HelpCard } from './helpCard'; import './stylesheet.scss'; import { WelcomeSection } from './welcomeSection';