From f145f1db77271003873434cbfef485a56ee11db5 Mon Sep 17 00:00:00 2001 From: Devagouda <40405790+dpatil-magento@users.noreply.github.com> Date: Tue, 22 Mar 2022 11:44:00 -0500 Subject: [PATCH] update cypress (#3736) * update cypress * revert ide updates * Update package.json * update prettier * test fail case * update snapshot path * revert fails * Update package.json * update imge path * update typo --- venia-integration-tests/.gitignore | 2 +- venia-integration-tests/package.json | 2 ++ venia-integration-tests/run-tests.js | 21 +++++++++++++++++- .../fixtures/pageBuilder/banner/banner6.json | 2 +- .../fixtures/pageBuilder/banner/banner7.json | 2 +- .../fixtures/pageBuilder/banner/banner8.json | 2 +- .../fixtures/pageBuilder/banner/banner9.json | 2 +- .../fixtures/pageBuilder/slider/slider10.json | 2 +- .../fixtures/pageBuilder/slider/slider11.json | 2 +- .../fixtures/pageBuilder/slider/slider3.json | 2 +- .../fixtures/pageBuilder/slider/slider4.json | 2 +- .../fixtures/pageBuilder/slider/slider5.json | 2 +- .../fixtures/pageBuilder/slider/slider6.json | 2 +- .../aboutUsPage.spec.js/AboutUs.snap.png | Bin .../Customer-Service-Page.snap.png | Bin .../Banner-media-query-(Desktop).snap.png | Bin .../Banner-media-query-(Mobile).snap.png | Bin .../Page-Builder-Home-Page.snap.png | Bin .../Page-Builder-Home-Page10.snap.png | Bin .../Page-Builder-Home-Page2.snap.png | Bin .../Page-Builder-Home-Page3.snap.png | Bin .../Page-Builder-Home-Page4.snap.png | Bin .../Page-Builder-Home-Page5.snap.png | Bin .../Page-Builder-Home-Page6.snap.png | Bin .../Page-Builder-Home-Page7.snap.png | Bin .../Page-Builder-Home-Page8.snap.png | Bin .../Page-Builder-Home-Page9.snap.png | Bin .../Page-Builder-Block-Page.snap.png | Bin .../Page-Builder-CMS-Block.snap.png | Bin .../Page-Builder-CMS-Page.snap.png | Bin .../Page-Builder-Dynamic-Block.snap.png | Bin .../Page-Builder-Buttons-Page.snap.png | Bin .../Column-media-query-(Desktop).snap.png | Bin .../Column-media-query-(Mobile).snap.png | Bin .../Page-Builder-Column-Page.snap.png | Bin .../Page-Builder-Divider-Page.snap.png | Bin ...ge-Builder-Dynamic-Block-Snapshot.snap.png | Bin ...age-Builder-Image-Snapshot-Mobile.snap.png | Bin .../Page-Builder-Image-Snapshot.snap.png | Bin ...-Builder-Verify-Map---2-Locations.snap.png | Bin ...-Builder-Verify-Map---All-content.snap.png | Bin .../PB-Products-Carousel-Alignment.snap.png | Bin ...Products-Carousel-Continuous-Mode.snap.png | Bin ...PB-Products-Carousel-Default-Mode.snap.png | Bin .../PB-Products-Carousel-Mobile.snap.png | Bin .../PB-Products-Carousel-Styles.snap.png | Bin .../PB-Products-Carousel.snap.png | Bin .../PB-Products-Grid-Mobile.snap.png | Bin .../PB-Products-Grid-Sorting.snap.png | Bin .../PB-Products-Grid.snap.png | Bin .../Page-Builder-Row-Min-Height.snap.png | Bin ...Page-Builder-Row-Video-Background.snap.png | Bin ...age-Builder-Row-Video-Background2.snap.png | Bin ...age-Builder-Row-Video-Background3.snap.png | Bin .../row.spec.js/Page-Builder-Row.snap.png | Bin .../row.spec.js/Page-Builder-Row2.snap.png | Bin .../Row-media-query-(Desktop).snap.png | Bin .../Row-media-query-(Mobile).snap.png | Bin .../Page-Builder-Slider-Page-10.snap.png | Bin .../Page-Builder-Slider-Page-11.snap.png | Bin .../Page-Builder-Slider-Page-12.snap.png | Bin .../Page-Builder-Slider-Page-2.snap.png | Bin .../Page-Builder-Slider-Page-3.snap.png | Bin .../Page-Builder-Slider-Page-4.snap.png | Bin .../Page-Builder-Slider-Page-5.snap.png | Bin .../Page-Builder-Slider-Page-6.snap.png | Bin .../Page-Builder-Slider-Page-7.snap.png | Bin .../Page-Builder-Slider-Page-8.snap.png | Bin .../Page-Builder-Slider-Page-9.snap.png | Bin .../Page-Builder-Slider-Page.snap.png | Bin .../Slider-media-query-(Desktop).snap.png | Bin .../Slider-media-query-(Mobile).snap.png | Bin ...lder-Smoke-Test-CMS-Block-Content.snap.png | Bin ...-Smoke-Test-Dynamic-Block-Content.snap.png | Bin .../Page-Builder-Smoke-Test.snap.png | Bin .../Page-Builder-Tabs-Page.snap.png | Bin .../Tabs-media-query-(Desktop).snap.png | Bin .../Tabs-media-query-(Mobile).snap.png | Bin .../Page-Builder-Text-Page.snap.png | Bin ...Page-Builder-Video-Alignment-Page.snap.png | Bin .../aboutUsPage/aboutUsPage.spec.js | 0 .../customerService/customerService.spec.js | 0 .../pageBuilder/banner.spec.js | 0 .../pageBuilder/block.spec.js | 0 .../pageBuilder/buttons.spec.js | 0 .../pageBuilder/column.spec.js | 0 .../pageBuilder/divider.spec.js | 0 .../pageBuilder/dynamicBlock.spec.js | 0 .../pageBuilder/image.spec.js | 0 .../pageBuilder/map.spec.js | 0 .../pageBuilder/products.spec.js | 0 .../pageBuilder/row.spec.js | 0 .../pageBuilder/slider.spec.js | 0 .../pageBuilder/smokeTest.spec.js | 0 .../pageBuilder/tabs.spec.js | 0 .../pageBuilder/text.spec.js | 0 .../pageBuilder/video.spec.js | 0 97 files changed, 33 insertions(+), 12 deletions(-) rename venia-integration-tests/src/snapshots/{integrationTests => snapshotTests}/aboutUsPage/aboutUsPage.spec.js/AboutUs.snap.png (100%) rename venia-integration-tests/src/snapshots/{integrationTests => snapshotTests}/customerService/customerService.spec.js/Customer-Service-Page.snap.png (100%) rename venia-integration-tests/src/snapshots/{integrationTests => snapshotTests}/pageBuilder/banner.spec.js/Banner-media-query-(Desktop).snap.png (100%) rename venia-integration-tests/src/snapshots/{integrationTests => snapshotTests}/pageBuilder/banner.spec.js/Banner-media-query-(Mobile).snap.png (100%) rename venia-integration-tests/src/snapshots/{integrationTests => snapshotTests}/pageBuilder/banner.spec.js/Page-Builder-Home-Page.snap.png (100%) rename venia-integration-tests/src/snapshots/{integrationTests => snapshotTests}/pageBuilder/banner.spec.js/Page-Builder-Home-Page10.snap.png (100%) rename venia-integration-tests/src/snapshots/{integrationTests => snapshotTests}/pageBuilder/banner.spec.js/Page-Builder-Home-Page2.snap.png (100%) rename venia-integration-tests/src/snapshots/{integrationTests => snapshotTests}/pageBuilder/banner.spec.js/Page-Builder-Home-Page3.snap.png (100%) rename venia-integration-tests/src/snapshots/{integrationTests => snapshotTests}/pageBuilder/banner.spec.js/Page-Builder-Home-Page4.snap.png (100%) rename venia-integration-tests/src/snapshots/{integrationTests => snapshotTests}/pageBuilder/banner.spec.js/Page-Builder-Home-Page5.snap.png (100%) rename venia-integration-tests/src/snapshots/{integrationTests => snapshotTests}/pageBuilder/banner.spec.js/Page-Builder-Home-Page6.snap.png (100%) rename venia-integration-tests/src/snapshots/{integrationTests => snapshotTests}/pageBuilder/banner.spec.js/Page-Builder-Home-Page7.snap.png (100%) rename venia-integration-tests/src/snapshots/{integrationTests => snapshotTests}/pageBuilder/banner.spec.js/Page-Builder-Home-Page8.snap.png (100%) rename venia-integration-tests/src/snapshots/{integrationTests => snapshotTests}/pageBuilder/banner.spec.js/Page-Builder-Home-Page9.snap.png (100%) rename venia-integration-tests/src/snapshots/{integrationTests => snapshotTests}/pageBuilder/block.spec.js/Page-Builder-Block-Page.snap.png (100%) rename venia-integration-tests/src/snapshots/{integrationTests => snapshotTests}/pageBuilder/block.spec.js/Page-Builder-CMS-Block.snap.png (100%) rename venia-integration-tests/src/snapshots/{integrationTests => snapshotTests}/pageBuilder/block.spec.js/Page-Builder-CMS-Page.snap.png (100%) rename venia-integration-tests/src/snapshots/{integrationTests => snapshotTests}/pageBuilder/block.spec.js/Page-Builder-Dynamic-Block.snap.png (100%) rename venia-integration-tests/src/snapshots/{integrationTests => snapshotTests}/pageBuilder/buttons.spec.js/Page-Builder-Buttons-Page.snap.png (100%) rename venia-integration-tests/src/snapshots/{integrationTests => snapshotTests}/pageBuilder/column.spec.js/Column-media-query-(Desktop).snap.png (100%) rename venia-integration-tests/src/snapshots/{integrationTests => snapshotTests}/pageBuilder/column.spec.js/Column-media-query-(Mobile).snap.png (100%) rename venia-integration-tests/src/snapshots/{integrationTests => snapshotTests}/pageBuilder/column.spec.js/Page-Builder-Column-Page.snap.png (100%) rename venia-integration-tests/src/snapshots/{integrationTests => snapshotTests}/pageBuilder/divider.spec.js/Page-Builder-Divider-Page.snap.png (100%) rename venia-integration-tests/src/snapshots/{integrationTests => snapshotTests}/pageBuilder/dynamicBlock.spec.js/Page-Builder-Dynamic-Block-Snapshot.snap.png (100%) rename venia-integration-tests/src/snapshots/{integrationTests => snapshotTests}/pageBuilder/image.spec.js/Page-Builder-Image-Snapshot-Mobile.snap.png (100%) rename venia-integration-tests/src/snapshots/{integrationTests => snapshotTests}/pageBuilder/image.spec.js/Page-Builder-Image-Snapshot.snap.png (100%) rename venia-integration-tests/src/snapshots/{integrationTests => snapshotTests}/pageBuilder/map.spec.js/Page-Builder-Verify-Map---2-Locations.snap.png (100%) rename venia-integration-tests/src/snapshots/{integrationTests => snapshotTests}/pageBuilder/map.spec.js/Page-Builder-Verify-Map---All-content.snap.png (100%) rename venia-integration-tests/src/snapshots/{integrationTests => snapshotTests}/pageBuilder/products.spec.js/PB-Products-Carousel-Alignment.snap.png (100%) rename venia-integration-tests/src/snapshots/{integrationTests => snapshotTests}/pageBuilder/products.spec.js/PB-Products-Carousel-Continuous-Mode.snap.png (100%) rename venia-integration-tests/src/snapshots/{integrationTests => snapshotTests}/pageBuilder/products.spec.js/PB-Products-Carousel-Default-Mode.snap.png (100%) rename venia-integration-tests/src/snapshots/{integrationTests => snapshotTests}/pageBuilder/products.spec.js/PB-Products-Carousel-Mobile.snap.png (100%) rename venia-integration-tests/src/snapshots/{integrationTests => snapshotTests}/pageBuilder/products.spec.js/PB-Products-Carousel-Styles.snap.png (100%) rename venia-integration-tests/src/snapshots/{integrationTests => snapshotTests}/pageBuilder/products.spec.js/PB-Products-Carousel.snap.png (100%) rename venia-integration-tests/src/snapshots/{integrationTests => snapshotTests}/pageBuilder/products.spec.js/PB-Products-Grid-Mobile.snap.png (100%) rename venia-integration-tests/src/snapshots/{integrationTests => snapshotTests}/pageBuilder/products.spec.js/PB-Products-Grid-Sorting.snap.png (100%) rename venia-integration-tests/src/snapshots/{integrationTests => snapshotTests}/pageBuilder/products.spec.js/PB-Products-Grid.snap.png (100%) rename venia-integration-tests/src/snapshots/{integrationTests => snapshotTests}/pageBuilder/row.spec.js/Page-Builder-Row-Min-Height.snap.png (100%) rename venia-integration-tests/src/snapshots/{integrationTests => snapshotTests}/pageBuilder/row.spec.js/Page-Builder-Row-Video-Background.snap.png (100%) rename venia-integration-tests/src/snapshots/{integrationTests => snapshotTests}/pageBuilder/row.spec.js/Page-Builder-Row-Video-Background2.snap.png (100%) rename venia-integration-tests/src/snapshots/{integrationTests => snapshotTests}/pageBuilder/row.spec.js/Page-Builder-Row-Video-Background3.snap.png (100%) rename venia-integration-tests/src/snapshots/{integrationTests => snapshotTests}/pageBuilder/row.spec.js/Page-Builder-Row.snap.png (100%) rename venia-integration-tests/src/snapshots/{integrationTests => snapshotTests}/pageBuilder/row.spec.js/Page-Builder-Row2.snap.png (100%) rename venia-integration-tests/src/snapshots/{integrationTests => snapshotTests}/pageBuilder/row.spec.js/Row-media-query-(Desktop).snap.png (100%) rename venia-integration-tests/src/snapshots/{integrationTests => snapshotTests}/pageBuilder/row.spec.js/Row-media-query-(Mobile).snap.png (100%) rename venia-integration-tests/src/snapshots/{integrationTests => snapshotTests}/pageBuilder/slider.spec.js/Page-Builder-Slider-Page-10.snap.png (100%) rename venia-integration-tests/src/snapshots/{integrationTests => snapshotTests}/pageBuilder/slider.spec.js/Page-Builder-Slider-Page-11.snap.png (100%) rename venia-integration-tests/src/snapshots/{integrationTests => snapshotTests}/pageBuilder/slider.spec.js/Page-Builder-Slider-Page-12.snap.png (100%) rename venia-integration-tests/src/snapshots/{integrationTests => snapshotTests}/pageBuilder/slider.spec.js/Page-Builder-Slider-Page-2.snap.png (100%) rename venia-integration-tests/src/snapshots/{integrationTests => snapshotTests}/pageBuilder/slider.spec.js/Page-Builder-Slider-Page-3.snap.png (100%) rename venia-integration-tests/src/snapshots/{integrationTests => snapshotTests}/pageBuilder/slider.spec.js/Page-Builder-Slider-Page-4.snap.png (100%) rename venia-integration-tests/src/snapshots/{integrationTests => snapshotTests}/pageBuilder/slider.spec.js/Page-Builder-Slider-Page-5.snap.png (100%) rename venia-integration-tests/src/snapshots/{integrationTests => snapshotTests}/pageBuilder/slider.spec.js/Page-Builder-Slider-Page-6.snap.png (100%) rename venia-integration-tests/src/snapshots/{integrationTests => snapshotTests}/pageBuilder/slider.spec.js/Page-Builder-Slider-Page-7.snap.png (100%) rename venia-integration-tests/src/snapshots/{integrationTests => snapshotTests}/pageBuilder/slider.spec.js/Page-Builder-Slider-Page-8.snap.png (100%) rename venia-integration-tests/src/snapshots/{integrationTests => snapshotTests}/pageBuilder/slider.spec.js/Page-Builder-Slider-Page-9.snap.png (100%) rename venia-integration-tests/src/snapshots/{integrationTests => snapshotTests}/pageBuilder/slider.spec.js/Page-Builder-Slider-Page.snap.png (100%) rename venia-integration-tests/src/snapshots/{integrationTests => snapshotTests}/pageBuilder/slider.spec.js/Slider-media-query-(Desktop).snap.png (100%) rename venia-integration-tests/src/snapshots/{integrationTests => snapshotTests}/pageBuilder/slider.spec.js/Slider-media-query-(Mobile).snap.png (100%) rename venia-integration-tests/src/snapshots/{integrationTests => snapshotTests}/pageBuilder/smokeTest.spec.js/Page-Builder-Smoke-Test-CMS-Block-Content.snap.png (100%) rename venia-integration-tests/src/snapshots/{integrationTests => snapshotTests}/pageBuilder/smokeTest.spec.js/Page-Builder-Smoke-Test-Dynamic-Block-Content.snap.png (100%) rename venia-integration-tests/src/snapshots/{integrationTests => snapshotTests}/pageBuilder/smokeTest.spec.js/Page-Builder-Smoke-Test.snap.png (100%) rename venia-integration-tests/src/snapshots/{integrationTests => snapshotTests}/pageBuilder/tabs.spec.js/Page-Builder-Tabs-Page.snap.png (100%) rename venia-integration-tests/src/snapshots/{integrationTests => snapshotTests}/pageBuilder/tabs.spec.js/Tabs-media-query-(Desktop).snap.png (100%) rename venia-integration-tests/src/snapshots/{integrationTests => snapshotTests}/pageBuilder/tabs.spec.js/Tabs-media-query-(Mobile).snap.png (100%) rename venia-integration-tests/src/snapshots/{integrationTests => snapshotTests}/pageBuilder/text.spec.js/Page-Builder-Text-Page.snap.png (100%) rename venia-integration-tests/src/snapshots/{integrationTests => snapshotTests}/pageBuilder/video.spec.js/Page-Builder-Video-Alignment-Page.snap.png (100%) rename venia-integration-tests/src/tests/{integrationTests => snapshotTests}/aboutUsPage/aboutUsPage.spec.js (100%) rename venia-integration-tests/src/tests/{integrationTests => snapshotTests}/customerService/customerService.spec.js (100%) rename venia-integration-tests/src/tests/{integrationTests => snapshotTests}/pageBuilder/banner.spec.js (100%) rename venia-integration-tests/src/tests/{integrationTests => snapshotTests}/pageBuilder/block.spec.js (100%) rename venia-integration-tests/src/tests/{integrationTests => snapshotTests}/pageBuilder/buttons.spec.js (100%) rename venia-integration-tests/src/tests/{integrationTests => snapshotTests}/pageBuilder/column.spec.js (100%) rename venia-integration-tests/src/tests/{integrationTests => snapshotTests}/pageBuilder/divider.spec.js (100%) rename venia-integration-tests/src/tests/{integrationTests => snapshotTests}/pageBuilder/dynamicBlock.spec.js (100%) rename venia-integration-tests/src/tests/{integrationTests => snapshotTests}/pageBuilder/image.spec.js (100%) rename venia-integration-tests/src/tests/{integrationTests => snapshotTests}/pageBuilder/map.spec.js (100%) rename venia-integration-tests/src/tests/{integrationTests => snapshotTests}/pageBuilder/products.spec.js (100%) rename venia-integration-tests/src/tests/{integrationTests => snapshotTests}/pageBuilder/row.spec.js (100%) rename venia-integration-tests/src/tests/{integrationTests => snapshotTests}/pageBuilder/slider.spec.js (100%) rename venia-integration-tests/src/tests/{integrationTests => snapshotTests}/pageBuilder/smokeTest.spec.js (100%) rename venia-integration-tests/src/tests/{integrationTests => snapshotTests}/pageBuilder/tabs.spec.js (100%) rename venia-integration-tests/src/tests/{integrationTests => snapshotTests}/pageBuilder/text.spec.js (100%) rename venia-integration-tests/src/tests/{integrationTests => snapshotTests}/pageBuilder/video.spec.js (100%) diff --git a/venia-integration-tests/.gitignore b/venia-integration-tests/.gitignore index 6734ca58b7..e7faec723b 100644 --- a/venia-integration-tests/.gitignore +++ b/venia-integration-tests/.gitignore @@ -1,6 +1,6 @@ node_modules .DS_Store .idea -/src/snapshots/integrationTests/pageBuilder/**/__diff_output__/ +/src/snapshots/snapshotTests/**/**/__diff_output__/ cypress/results/* cypress-test-results.json diff --git a/venia-integration-tests/package.json b/venia-integration-tests/package.json index c3f95862d8..03052ace57 100644 --- a/venia-integration-tests/package.json +++ b/venia-integration-tests/package.json @@ -8,6 +8,8 @@ "posttest:headless": "./report-results.js", "test": "cypress open --browser chrome --config-file cypress.config.json", "test:ci": "./run-tests.js -t 4", + "test:ci:functional": "FunctionalTests=true ./run-tests.js -t 6", + "test:ci:snapshot": "SanpshotTests=true ./run-tests.js -t 4", "test:debug": "node --inspect-brk ./node_modules/cypress/bin/cypress run --browser chrome --config-file cypress.config.json", "test:devTest": "jest", "test:firefox": "cypress open --browser firefox --config-file cypress.config.json", diff --git a/venia-integration-tests/run-tests.js b/venia-integration-tests/run-tests.js index 92a263d358..1c65f1b7fa 100755 --- a/venia-integration-tests/run-tests.js +++ b/venia-integration-tests/run-tests.js @@ -49,7 +49,26 @@ if (!baseUrl) { process.exit(1); } -const files = spec ? spec.split(',') : glob.sync('./src/tests/**/*.spec.js'); +let files = null; + +if (process.env.FunctionalTests) { + files = spec + ? spec.split(',') + : glob.sync('./src/tests/**/*.spec.js', { + ignore: ['./src/tests/snapshotTests/**/*'] + }); +} else if (process.env.SanpshotTests) { + files = spec + ? spec.split(',') + : glob.sync('./src/tests/**/*.spec.js', { + ignore: [ + './src/tests/e2eTests/**/*', + './src/tests/integrationTests/**/*' + ] + }); +} else { + files = spec ? spec.split(',') : glob.sync('./src/tests/**/*.spec.js'); +} const threadCount = Math.min(files.length, threads); const testsPerRun = files.length / threadCount; diff --git a/venia-integration-tests/src/fixtures/pageBuilder/banner/banner6.json b/venia-integration-tests/src/fixtures/pageBuilder/banner/banner6.json index 2b21b7f9cb..2b0c6142d9 100644 --- a/venia-integration-tests/src/fixtures/pageBuilder/banner/banner6.json +++ b/venia-integration-tests/src/fixtures/pageBuilder/banner/banner6.json @@ -2,7 +2,7 @@ "data": { "cmsPage": { "url_key": "home", - "content": "

All Default Alignments should be Center from Row<\/h2>

Poster Alignment Tests<\/h3>

Default Alignment<\/p>

Left<\/p>

Center<\/p>

Right<\/p><\/div>