From deb86efb0d61f7c37d98a0dd1264ef735b9fed8c Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 6 Jul 2022 17:53:13 -0400 Subject: [PATCH] Bump cypress and @knapsack-pro/cypress (#18025) Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Suzanne Aitchison --- .travis.yml | 6 +++--- bin/e2e | 4 ++-- cypress.config.js | 14 ++++++++++++++ cypress.dev.config.js | 13 +++++++++++++ cypress.dev.json | 1 - cypress.json | 6 ------ .../creatorOnboardingFlows/confirmEmail.spec.js | 0 .../creatorSettings.spec.js | 0 .../creatorOnboardingFlows/creatorSignup.spec.js | 0 .../adminFlows/apps/editListingCategory.spec.js | 0 .../adminFlows/articles/pinArticle.spec.js | 0 .../adminFlows/articles/unpinArticle.spec.js | 0 .../adminFlows/badges/badgeAchievements.spec.js | 0 .../adminFlows/broadcasts/broadcasts.spec.js | 0 .../config/authenticationSection.spec.js | 2 +- .../adminFlows/config/campaignSection.spec.js | 0 .../adminFlows/config/communitySection.spec.js | 0 .../config/emailDigestFrequencySection.spec.js | 0 .../config/emailServerSettingsSection.spec.js | 0 .../adminFlows/config/mascotSection.spec.js | 0 .../adminFlows/config/rateLimitSection.spec.js | 0 .../config/userExperienceSection.spec.js | 0 .../consumerApps/createConsumerApp.spec.js | 0 .../adminFlows/displayAds/displayAds.spec.js | 0 .../navigationLinks/navigationLinks.spec.js | 0 .../adminFlows/pages/landingPage.spec.js | 0 .../adminFlows/tags/createATag.spec.js | 0 .../adminFlows/users/filterUserIndex.spec.js | 0 .../adminFlows/users/gdprDeleteRequests.spec.js | 0 .../adminFlows/users/invitedUsers.spec.js | 0 .../adminFlows/users/manageCredits.spec.js | 0 .../adminFlows/users/manageOrganizations.spec.js | 0 .../adminFlows/users/manageRoles.spec.js | 0 .../adminFlows/users/manageUserOptions.spec.js | 0 .../adminFlows/users/navigateTabs.spec.js | 0 .../adminFlows/users/userAdminUtilitites.js | 0 .../adminFlows/users/userIndexView.spec.js | 0 .../analyticsFlows/analyticsNavigation.spec.js | 0 .../articleFlows/adminButtonArticle.spec.js | 0 .../articleFlows/commentOnArticle.spec.js | 0 .../articleFlows/followAuthor.spec.js | 0 .../articleFlows/followOrganization.spec.js | 0 .../articleFlows/hideArticleComments.spec.js | 0 .../followFromArticleLiquidTag.spec.js | 0 ...bscriptionLiquidTagWithAppleAuthEmail.spec.js | 0 ...rSubscriptionTagWithSubscribableEmail.spec.js | 0 .../manageFlows/lockDiscussion.spec.js | 0 .../manageFlows/unlockDiscussion.spec.js | 0 .../playOrPauseAnimatedImages.spec.js | 0 .../articleFlows/postModerationTools.spec.js | 0 .../articleFlows/postShareOptions.spec.js | 0 .../articleFlows/postSidebarActions.spec.js | 0 .../articleFlows/removeMainImage.spec.js | 0 .../seriesFlows/previewProfileFromSeries.spec.js | 0 .../subscribeToArticleComments.spec.js | 0 .../articleFlows/viewArticleDiscussion.spec.js | 0 .../dashboardFlows/dashboardNavigation.spec.js | 0 .../dashboardFlows/managePost.spec.js | 0 .../dashboardFlows/postsDashboard.spec.js | 0 .../homeFeedFlows/feedNavigation.spec.js | 0 .../homeFeedFlows/profilePreviewCards.spec.js | 0 .../listingFlows/deleteListing.spec.js | 0 .../seededFlows/listingFlows/viewListing.spec.js | 0 .../seededFlows/loggedOutFlows/homeFeed.spec.js | 0 .../loggedOutFlows/showLoginModal.spec.js | 0 .../seededFlows/loggedOutFlows/tagIndex.spec.js | 0 .../loginFlows/userChangePassword.spec.js | 0 .../seededFlows/loginFlows/userLogin.spec.js | 0 .../seededFlows/loginFlows/userLogout.spec.js | 0 .../mobileFlows/namespacedForemMobile.spec.js | 0 .../mobileFlows/runtimeBannerDeepLinking.spec.js | 0 .../mobileFlows/runtimeContext.spec.js | 0 .../moderationFlows/adjustPostTags.spec.js | 0 .../moderationFlows/modNavigation.spec.js | 0 .../commentNotifications.spec.js | 0 .../followUserFromNotifications.spec.js | 0 .../notificationNavigation.spec.js | 0 .../podcastFlows/followPodcast.spec.js | 0 .../podcastFlows/togglePodcastPlayback.spec.js | 0 .../limitPostCreationToAdmins.spec.js | 0 .../profileFlows/followOrganisation.spec.js | 0 .../seededFlows/profileFlows/followUser.spec.js | 0 .../profileFlows/profileUserActionsMenu.spec.js | 0 .../userUpdateSettingsProfile.spec.js | 0 .../publishingFlows/addTagsToArticle.spec.js | 0 .../publishingFlows/markdownToolbar.spec.js | 0 .../publishingFlows/mentionUser.spec.js | 0 .../postBrowserPersistence.spec.js | 0 .../publishingFlows/postOptions.spec.js | 0 .../publishingFlows/previewPost.spec.js | 0 .../publishingFlows/publishOrSavePost.spec.js | 0 .../publishingFlows/uploadImage.spec.js | 0 .../readingListFlows/readingList.spec.js | 0 .../readingListFlows/readingListArchive.spec.js | 0 .../registrationFlows/emailRegistration.spec.js | 0 .../seededFlows/searchFlows/followUser.spec.js | 0 .../previewProfileFromPostSearchResults.spec.js | 0 .../seededFlows/searchFlows/searchForm.spec.js | 0 .../searchFlows/searchTimeFiltering.spec.js | 0 .../settingsFlows/organisationSettings.spec.js | 0 .../settingsFlows/updateProfileSettings.spec.js | 0 .../seededFlows/tagsFlows/editTag.spec.js | 0 .../seededFlows/tagsFlows/followTag.spec.js | 0 .../tagsFlows/previewProfileFromTagIndex.spec.js | 0 .../tagsFlows/tagIndexNavigation.spec.js | 0 .../seededFlows/toggleFeatureFlags.spec.js | 0 .../MemberDropDownButton.spec.js | 0 cypress/plugins/index.js | 2 +- cypress/support/{index.js => e2e.js} | 0 package.json | 4 ++-- yarn.lock | 16 ++++++++-------- 111 files changed, 44 insertions(+), 24 deletions(-) create mode 100644 cypress.config.js create mode 100644 cypress.dev.config.js delete mode 100644 cypress.dev.json delete mode 100644 cypress.json rename cypress/{integration => e2e}/creatorOnboardingFlows/confirmEmail.spec.js (100%) rename cypress/{integration => e2e}/creatorOnboardingFlows/creatorSettings.spec.js (100%) rename cypress/{integration => e2e}/creatorOnboardingFlows/creatorSignup.spec.js (100%) rename cypress/{integration => e2e}/seededFlows/adminFlows/apps/editListingCategory.spec.js (100%) rename cypress/{integration => e2e}/seededFlows/adminFlows/articles/pinArticle.spec.js (100%) rename cypress/{integration => e2e}/seededFlows/adminFlows/articles/unpinArticle.spec.js (100%) rename cypress/{integration => e2e}/seededFlows/adminFlows/badges/badgeAchievements.spec.js (100%) rename cypress/{integration => e2e}/seededFlows/adminFlows/broadcasts/broadcasts.spec.js (100%) rename cypress/{integration => e2e}/seededFlows/adminFlows/config/authenticationSection.spec.js (99%) rename cypress/{integration => e2e}/seededFlows/adminFlows/config/campaignSection.spec.js (100%) rename cypress/{integration => e2e}/seededFlows/adminFlows/config/communitySection.spec.js (100%) rename cypress/{integration => e2e}/seededFlows/adminFlows/config/emailDigestFrequencySection.spec.js (100%) rename cypress/{integration => e2e}/seededFlows/adminFlows/config/emailServerSettingsSection.spec.js (100%) rename cypress/{integration => e2e}/seededFlows/adminFlows/config/mascotSection.spec.js (100%) rename cypress/{integration => e2e}/seededFlows/adminFlows/config/rateLimitSection.spec.js (100%) rename cypress/{integration => e2e}/seededFlows/adminFlows/config/userExperienceSection.spec.js (100%) rename cypress/{integration => e2e}/seededFlows/adminFlows/consumerApps/createConsumerApp.spec.js (100%) rename cypress/{integration => e2e}/seededFlows/adminFlows/displayAds/displayAds.spec.js (100%) rename cypress/{integration => e2e}/seededFlows/adminFlows/navigationLinks/navigationLinks.spec.js (100%) rename cypress/{integration => e2e}/seededFlows/adminFlows/pages/landingPage.spec.js (100%) rename cypress/{integration => e2e}/seededFlows/adminFlows/tags/createATag.spec.js (100%) rename cypress/{integration => e2e}/seededFlows/adminFlows/users/filterUserIndex.spec.js (100%) rename cypress/{integration => e2e}/seededFlows/adminFlows/users/gdprDeleteRequests.spec.js (100%) rename cypress/{integration => e2e}/seededFlows/adminFlows/users/invitedUsers.spec.js (100%) rename cypress/{integration => e2e}/seededFlows/adminFlows/users/manageCredits.spec.js (100%) rename cypress/{integration => e2e}/seededFlows/adminFlows/users/manageOrganizations.spec.js (100%) rename cypress/{integration => e2e}/seededFlows/adminFlows/users/manageRoles.spec.js (100%) rename cypress/{integration => e2e}/seededFlows/adminFlows/users/manageUserOptions.spec.js (100%) rename cypress/{integration => e2e}/seededFlows/adminFlows/users/navigateTabs.spec.js (100%) rename cypress/{integration => e2e}/seededFlows/adminFlows/users/userAdminUtilitites.js (100%) rename cypress/{integration => e2e}/seededFlows/adminFlows/users/userIndexView.spec.js (100%) rename cypress/{integration => e2e}/seededFlows/analyticsFlows/analyticsNavigation.spec.js (100%) rename cypress/{integration => e2e}/seededFlows/articleFlows/adminButtonArticle.spec.js (100%) rename cypress/{integration => e2e}/seededFlows/articleFlows/commentOnArticle.spec.js (100%) rename cypress/{integration => e2e}/seededFlows/articleFlows/followAuthor.spec.js (100%) rename cypress/{integration => e2e}/seededFlows/articleFlows/followOrganization.spec.js (100%) rename cypress/{integration => e2e}/seededFlows/articleFlows/hideArticleComments.spec.js (100%) rename cypress/{integration => e2e}/seededFlows/articleFlows/liquidTagFlows/followFromArticleLiquidTag.spec.js (100%) rename cypress/{integration => e2e}/seededFlows/articleFlows/liquidTagFlows/userSubscriptionLiquidTagWithAppleAuthEmail.spec.js (100%) rename cypress/{integration => e2e}/seededFlows/articleFlows/liquidTagFlows/userSubscriptionTagWithSubscribableEmail.spec.js (100%) rename cypress/{integration => e2e}/seededFlows/articleFlows/manageFlows/lockDiscussion.spec.js (100%) rename cypress/{integration => e2e}/seededFlows/articleFlows/manageFlows/unlockDiscussion.spec.js (100%) rename cypress/{integration => e2e}/seededFlows/articleFlows/playOrPauseAnimatedImages.spec.js (100%) rename cypress/{integration => e2e}/seededFlows/articleFlows/postModerationTools.spec.js (100%) rename cypress/{integration => e2e}/seededFlows/articleFlows/postShareOptions.spec.js (100%) rename cypress/{integration => e2e}/seededFlows/articleFlows/postSidebarActions.spec.js (100%) rename cypress/{integration => e2e}/seededFlows/articleFlows/removeMainImage.spec.js (100%) rename cypress/{integration => e2e}/seededFlows/articleFlows/seriesFlows/previewProfileFromSeries.spec.js (100%) rename cypress/{integration => e2e}/seededFlows/articleFlows/subscribeToArticleComments.spec.js (100%) rename cypress/{integration => e2e}/seededFlows/articleFlows/viewArticleDiscussion.spec.js (100%) rename cypress/{integration => e2e}/seededFlows/dashboardFlows/dashboardNavigation.spec.js (100%) rename cypress/{integration => e2e}/seededFlows/dashboardFlows/managePost.spec.js (100%) rename cypress/{integration => e2e}/seededFlows/dashboardFlows/postsDashboard.spec.js (100%) rename cypress/{integration => e2e}/seededFlows/homeFeedFlows/feedNavigation.spec.js (100%) rename cypress/{integration => e2e}/seededFlows/homeFeedFlows/profilePreviewCards.spec.js (100%) rename cypress/{integration => e2e}/seededFlows/listingFlows/deleteListing.spec.js (100%) rename cypress/{integration => e2e}/seededFlows/listingFlows/viewListing.spec.js (100%) rename cypress/{integration => e2e}/seededFlows/loggedOutFlows/homeFeed.spec.js (100%) rename cypress/{integration => e2e}/seededFlows/loggedOutFlows/showLoginModal.spec.js (100%) rename cypress/{integration => e2e}/seededFlows/loggedOutFlows/tagIndex.spec.js (100%) rename cypress/{integration => e2e}/seededFlows/loginFlows/userChangePassword.spec.js (100%) rename cypress/{integration => e2e}/seededFlows/loginFlows/userLogin.spec.js (100%) rename cypress/{integration => e2e}/seededFlows/loginFlows/userLogout.spec.js (100%) rename cypress/{integration => e2e}/seededFlows/mobileFlows/namespacedForemMobile.spec.js (100%) rename cypress/{integration => e2e}/seededFlows/mobileFlows/runtimeBannerDeepLinking.spec.js (100%) rename cypress/{integration => e2e}/seededFlows/mobileFlows/runtimeContext.spec.js (100%) rename cypress/{integration => e2e}/seededFlows/moderationFlows/adjustPostTags.spec.js (100%) rename cypress/{integration => e2e}/seededFlows/moderationFlows/modNavigation.spec.js (100%) rename cypress/{integration => e2e}/seededFlows/notificationsFlows/commentNotifications.spec.js (100%) rename cypress/{integration => e2e}/seededFlows/notificationsFlows/followUserFromNotifications.spec.js (100%) rename cypress/{integration => e2e}/seededFlows/notificationsFlows/notificationNavigation.spec.js (100%) rename cypress/{integration => e2e}/seededFlows/podcastFlows/followPodcast.spec.js (100%) rename cypress/{integration => e2e}/seededFlows/podcastFlows/togglePodcastPlayback.spec.js (100%) rename cypress/{integration => e2e}/seededFlows/policyFlows/limitPostCreationToAdmins.spec.js (100%) rename cypress/{integration => e2e}/seededFlows/profileFlows/followOrganisation.spec.js (100%) rename cypress/{integration => e2e}/seededFlows/profileFlows/followUser.spec.js (100%) rename cypress/{integration => e2e}/seededFlows/profileFlows/profileUserActionsMenu.spec.js (100%) rename cypress/{integration => e2e}/seededFlows/profileFlows/userUpdateSettingsProfile.spec.js (100%) rename cypress/{integration => e2e}/seededFlows/publishingFlows/addTagsToArticle.spec.js (100%) rename cypress/{integration => e2e}/seededFlows/publishingFlows/markdownToolbar.spec.js (100%) rename cypress/{integration => e2e}/seededFlows/publishingFlows/mentionUser.spec.js (100%) rename cypress/{integration => e2e}/seededFlows/publishingFlows/postBrowserPersistence.spec.js (100%) rename cypress/{integration => e2e}/seededFlows/publishingFlows/postOptions.spec.js (100%) rename cypress/{integration => e2e}/seededFlows/publishingFlows/previewPost.spec.js (100%) rename cypress/{integration => e2e}/seededFlows/publishingFlows/publishOrSavePost.spec.js (100%) rename cypress/{integration => e2e}/seededFlows/publishingFlows/uploadImage.spec.js (100%) rename cypress/{integration => e2e}/seededFlows/readingListFlows/readingList.spec.js (100%) rename cypress/{integration => e2e}/seededFlows/readingListFlows/readingListArchive.spec.js (100%) rename cypress/{integration => e2e}/seededFlows/registrationFlows/emailRegistration.spec.js (100%) rename cypress/{integration => e2e}/seededFlows/searchFlows/followUser.spec.js (100%) rename cypress/{integration => e2e}/seededFlows/searchFlows/previewProfileFromPostSearchResults.spec.js (100%) rename cypress/{integration => e2e}/seededFlows/searchFlows/searchForm.spec.js (100%) rename cypress/{integration => e2e}/seededFlows/searchFlows/searchTimeFiltering.spec.js (100%) rename cypress/{integration => e2e}/seededFlows/settingsFlows/organisationSettings.spec.js (100%) rename cypress/{integration => e2e}/seededFlows/settingsFlows/updateProfileSettings.spec.js (100%) rename cypress/{integration => e2e}/seededFlows/tagsFlows/editTag.spec.js (100%) rename cypress/{integration => e2e}/seededFlows/tagsFlows/followTag.spec.js (100%) rename cypress/{integration => e2e}/seededFlows/tagsFlows/previewProfileFromTagIndex.spec.js (100%) rename cypress/{integration => e2e}/seededFlows/tagsFlows/tagIndexNavigation.spec.js (100%) rename cypress/{integration => e2e}/seededFlows/toggleFeatureFlags.spec.js (100%) rename cypress/{integration => e2e}/seededFlows/topNavigationFlows/MemberDropDownButton.spec.js (100%) rename cypress/support/{index.js => e2e.js} (100%) diff --git a/.travis.yml b/.travis.yml index 3d5f3d492..a0382eaf5 100644 --- a/.travis.yml +++ b/.travis.yml @@ -91,7 +91,7 @@ jobs: env: - KNAPSACK_PRO_CI_NODE_TOTAL=3 - KNAPSACK_PRO_CI_NODE_INDEX=0 - - KNAPSACK_PRO_TEST_FILE_PATTERN="cypress/integration/seededFlows/**/*.spec.js" + - KNAPSACK_PRO_TEST_FILE_PATTERN="cypress/e2e/seededFlows/**/*.spec.js" script: - bundle exec rails db:create db:schema:load assets:precompile - yarn cypress install @@ -101,7 +101,7 @@ jobs: env: - KNAPSACK_PRO_CI_NODE_TOTAL=3 - KNAPSACK_PRO_CI_NODE_INDEX=1 - - KNAPSACK_PRO_TEST_FILE_PATTERN="cypress/integration/seededFlows/**/*.spec.js" + - KNAPSACK_PRO_TEST_FILE_PATTERN="cypress/e2e/seededFlows/**/*.spec.js" script: - bundle exec rails db:create db:schema:load assets:precompile - yarn cypress install @@ -111,7 +111,7 @@ jobs: env: - KNAPSACK_PRO_CI_NODE_TOTAL=3 - KNAPSACK_PRO_CI_NODE_INDEX=2 - - KNAPSACK_PRO_TEST_FILE_PATTERN="cypress/integration/seededFlows/**/*.spec.js" + - KNAPSACK_PRO_TEST_FILE_PATTERN="cypress/e2e/seededFlows/**/*.spec.js" script: - bundle exec rails db:create db:schema:load assets:precompile - yarn cypress install diff --git a/bin/e2e b/bin/e2e index add9c1f1b..793edfe81 100755 --- a/bin/e2e +++ b/bin/e2e @@ -32,7 +32,7 @@ bundle exec rails assets:precompile; if [ "$1" = "--creator-onboarding-seed" ]; then echo "Running E2E tests with creator onboarding seed data" - CYPRESS_RAILS_CYPRESS_OPTS="--config-file cypress.dev.json" RAILS_ENV=test E2E=true CREATOR_ONBOARDING_SEED_DATA=1 E2E_FOLDER=creatorOnboardingFlows bundle exec rake cypress:open + CYPRESS_RAILS_CYPRESS_OPTS="--config-file cypress.dev.config.js --e2e" RAILS_ENV=test E2E=true CREATOR_ONBOARDING_SEED_DATA=1 E2E_FOLDER=creatorOnboardingFlows bundle exec rake cypress:open else - CYPRESS_RAILS_CYPRESS_OPTS="--config-file cypress.dev.json" RAILS_ENV=test E2E=true bundle exec rake cypress:open + CYPRESS_RAILS_CYPRESS_OPTS="--config-file cypress.dev.config.js --e2e" RAILS_ENV=test E2E=true bundle exec rake cypress:open fi diff --git a/cypress.config.js b/cypress.config.js new file mode 100644 index 000000000..33f5e0c82 --- /dev/null +++ b/cypress.config.js @@ -0,0 +1,14 @@ +/* eslint-env node */ +const { defineConfig } = require('cypress'); + +module.exports = defineConfig({ + e2e: { + setupNodeEvents(on, config) { + return require('./cypress/plugins/index.js')(on, config); + }, + screenshotsFolder: 'tmp/cypress_screenshots', + trashAssetsBeforeRuns: false, + video: false, + retries: 3, + }, +}); diff --git a/cypress.dev.config.js b/cypress.dev.config.js new file mode 100644 index 000000000..19b8277f7 --- /dev/null +++ b/cypress.dev.config.js @@ -0,0 +1,13 @@ +/* eslint-env node */ +const { defineConfig } = require('cypress'); + +module.exports = defineConfig({ + e2e: { + // We've imported your old cypress plugins here. + // You may want to clean this up later by importing these. + setupNodeEvents(on, config) { + return require('./cypress/plugins/index.js')(on, config); + }, + specPattern: 'cypress/e2e/**/seededFlows/**/*.spec.js', + }, +}); diff --git a/cypress.dev.json b/cypress.dev.json deleted file mode 100644 index 0967ef424..000000000 --- a/cypress.dev.json +++ /dev/null @@ -1 +0,0 @@ -{} diff --git a/cypress.json b/cypress.json deleted file mode 100644 index 6b4ed0c2d..000000000 --- a/cypress.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "screenshotsFolder": "tmp/cypress_screenshots", - "trashAssetsBeforeRuns": false, - "video": false, - "retries": 3 -} diff --git a/cypress/integration/creatorOnboardingFlows/confirmEmail.spec.js b/cypress/e2e/creatorOnboardingFlows/confirmEmail.spec.js similarity index 100% rename from cypress/integration/creatorOnboardingFlows/confirmEmail.spec.js rename to cypress/e2e/creatorOnboardingFlows/confirmEmail.spec.js diff --git a/cypress/integration/creatorOnboardingFlows/creatorSettings.spec.js b/cypress/e2e/creatorOnboardingFlows/creatorSettings.spec.js similarity index 100% rename from cypress/integration/creatorOnboardingFlows/creatorSettings.spec.js rename to cypress/e2e/creatorOnboardingFlows/creatorSettings.spec.js diff --git a/cypress/integration/creatorOnboardingFlows/creatorSignup.spec.js b/cypress/e2e/creatorOnboardingFlows/creatorSignup.spec.js similarity index 100% rename from cypress/integration/creatorOnboardingFlows/creatorSignup.spec.js rename to cypress/e2e/creatorOnboardingFlows/creatorSignup.spec.js diff --git a/cypress/integration/seededFlows/adminFlows/apps/editListingCategory.spec.js b/cypress/e2e/seededFlows/adminFlows/apps/editListingCategory.spec.js similarity index 100% rename from cypress/integration/seededFlows/adminFlows/apps/editListingCategory.spec.js rename to cypress/e2e/seededFlows/adminFlows/apps/editListingCategory.spec.js diff --git a/cypress/integration/seededFlows/adminFlows/articles/pinArticle.spec.js b/cypress/e2e/seededFlows/adminFlows/articles/pinArticle.spec.js similarity index 100% rename from cypress/integration/seededFlows/adminFlows/articles/pinArticle.spec.js rename to cypress/e2e/seededFlows/adminFlows/articles/pinArticle.spec.js diff --git a/cypress/integration/seededFlows/adminFlows/articles/unpinArticle.spec.js b/cypress/e2e/seededFlows/adminFlows/articles/unpinArticle.spec.js similarity index 100% rename from cypress/integration/seededFlows/adminFlows/articles/unpinArticle.spec.js rename to cypress/e2e/seededFlows/adminFlows/articles/unpinArticle.spec.js diff --git a/cypress/integration/seededFlows/adminFlows/badges/badgeAchievements.spec.js b/cypress/e2e/seededFlows/adminFlows/badges/badgeAchievements.spec.js similarity index 100% rename from cypress/integration/seededFlows/adminFlows/badges/badgeAchievements.spec.js rename to cypress/e2e/seededFlows/adminFlows/badges/badgeAchievements.spec.js diff --git a/cypress/integration/seededFlows/adminFlows/broadcasts/broadcasts.spec.js b/cypress/e2e/seededFlows/adminFlows/broadcasts/broadcasts.spec.js similarity index 100% rename from cypress/integration/seededFlows/adminFlows/broadcasts/broadcasts.spec.js rename to cypress/e2e/seededFlows/adminFlows/broadcasts/broadcasts.spec.js diff --git a/cypress/integration/seededFlows/adminFlows/config/authenticationSection.spec.js b/cypress/e2e/seededFlows/adminFlows/config/authenticationSection.spec.js similarity index 99% rename from cypress/integration/seededFlows/adminFlows/config/authenticationSection.spec.js rename to cypress/e2e/seededFlows/adminFlows/config/authenticationSection.spec.js index 003750d25..d504fde5e 100644 --- a/cypress/integration/seededFlows/adminFlows/config/authenticationSection.spec.js +++ b/cypress/e2e/seededFlows/adminFlows/config/authenticationSection.spec.js @@ -41,7 +41,7 @@ describe('Authentication Section', () => { ); }); - // The page doesn't automatically reload on submission, + // The page doesn't automatically reload on submission, // so we reload manually to check the settings have been persisted cy.reload(); diff --git a/cypress/integration/seededFlows/adminFlows/config/campaignSection.spec.js b/cypress/e2e/seededFlows/adminFlows/config/campaignSection.spec.js similarity index 100% rename from cypress/integration/seededFlows/adminFlows/config/campaignSection.spec.js rename to cypress/e2e/seededFlows/adminFlows/config/campaignSection.spec.js diff --git a/cypress/integration/seededFlows/adminFlows/config/communitySection.spec.js b/cypress/e2e/seededFlows/adminFlows/config/communitySection.spec.js similarity index 100% rename from cypress/integration/seededFlows/adminFlows/config/communitySection.spec.js rename to cypress/e2e/seededFlows/adminFlows/config/communitySection.spec.js diff --git a/cypress/integration/seededFlows/adminFlows/config/emailDigestFrequencySection.spec.js b/cypress/e2e/seededFlows/adminFlows/config/emailDigestFrequencySection.spec.js similarity index 100% rename from cypress/integration/seededFlows/adminFlows/config/emailDigestFrequencySection.spec.js rename to cypress/e2e/seededFlows/adminFlows/config/emailDigestFrequencySection.spec.js diff --git a/cypress/integration/seededFlows/adminFlows/config/emailServerSettingsSection.spec.js b/cypress/e2e/seededFlows/adminFlows/config/emailServerSettingsSection.spec.js similarity index 100% rename from cypress/integration/seededFlows/adminFlows/config/emailServerSettingsSection.spec.js rename to cypress/e2e/seededFlows/adminFlows/config/emailServerSettingsSection.spec.js diff --git a/cypress/integration/seededFlows/adminFlows/config/mascotSection.spec.js b/cypress/e2e/seededFlows/adminFlows/config/mascotSection.spec.js similarity index 100% rename from cypress/integration/seededFlows/adminFlows/config/mascotSection.spec.js rename to cypress/e2e/seededFlows/adminFlows/config/mascotSection.spec.js diff --git a/cypress/integration/seededFlows/adminFlows/config/rateLimitSection.spec.js b/cypress/e2e/seededFlows/adminFlows/config/rateLimitSection.spec.js similarity index 100% rename from cypress/integration/seededFlows/adminFlows/config/rateLimitSection.spec.js rename to cypress/e2e/seededFlows/adminFlows/config/rateLimitSection.spec.js diff --git a/cypress/integration/seededFlows/adminFlows/config/userExperienceSection.spec.js b/cypress/e2e/seededFlows/adminFlows/config/userExperienceSection.spec.js similarity index 100% rename from cypress/integration/seededFlows/adminFlows/config/userExperienceSection.spec.js rename to cypress/e2e/seededFlows/adminFlows/config/userExperienceSection.spec.js diff --git a/cypress/integration/seededFlows/adminFlows/consumerApps/createConsumerApp.spec.js b/cypress/e2e/seededFlows/adminFlows/consumerApps/createConsumerApp.spec.js similarity index 100% rename from cypress/integration/seededFlows/adminFlows/consumerApps/createConsumerApp.spec.js rename to cypress/e2e/seededFlows/adminFlows/consumerApps/createConsumerApp.spec.js diff --git a/cypress/integration/seededFlows/adminFlows/displayAds/displayAds.spec.js b/cypress/e2e/seededFlows/adminFlows/displayAds/displayAds.spec.js similarity index 100% rename from cypress/integration/seededFlows/adminFlows/displayAds/displayAds.spec.js rename to cypress/e2e/seededFlows/adminFlows/displayAds/displayAds.spec.js diff --git a/cypress/integration/seededFlows/adminFlows/navigationLinks/navigationLinks.spec.js b/cypress/e2e/seededFlows/adminFlows/navigationLinks/navigationLinks.spec.js similarity index 100% rename from cypress/integration/seededFlows/adminFlows/navigationLinks/navigationLinks.spec.js rename to cypress/e2e/seededFlows/adminFlows/navigationLinks/navigationLinks.spec.js diff --git a/cypress/integration/seededFlows/adminFlows/pages/landingPage.spec.js b/cypress/e2e/seededFlows/adminFlows/pages/landingPage.spec.js similarity index 100% rename from cypress/integration/seededFlows/adminFlows/pages/landingPage.spec.js rename to cypress/e2e/seededFlows/adminFlows/pages/landingPage.spec.js diff --git a/cypress/integration/seededFlows/adminFlows/tags/createATag.spec.js b/cypress/e2e/seededFlows/adminFlows/tags/createATag.spec.js similarity index 100% rename from cypress/integration/seededFlows/adminFlows/tags/createATag.spec.js rename to cypress/e2e/seededFlows/adminFlows/tags/createATag.spec.js diff --git a/cypress/integration/seededFlows/adminFlows/users/filterUserIndex.spec.js b/cypress/e2e/seededFlows/adminFlows/users/filterUserIndex.spec.js similarity index 100% rename from cypress/integration/seededFlows/adminFlows/users/filterUserIndex.spec.js rename to cypress/e2e/seededFlows/adminFlows/users/filterUserIndex.spec.js diff --git a/cypress/integration/seededFlows/adminFlows/users/gdprDeleteRequests.spec.js b/cypress/e2e/seededFlows/adminFlows/users/gdprDeleteRequests.spec.js similarity index 100% rename from cypress/integration/seededFlows/adminFlows/users/gdprDeleteRequests.spec.js rename to cypress/e2e/seededFlows/adminFlows/users/gdprDeleteRequests.spec.js diff --git a/cypress/integration/seededFlows/adminFlows/users/invitedUsers.spec.js b/cypress/e2e/seededFlows/adminFlows/users/invitedUsers.spec.js similarity index 100% rename from cypress/integration/seededFlows/adminFlows/users/invitedUsers.spec.js rename to cypress/e2e/seededFlows/adminFlows/users/invitedUsers.spec.js diff --git a/cypress/integration/seededFlows/adminFlows/users/manageCredits.spec.js b/cypress/e2e/seededFlows/adminFlows/users/manageCredits.spec.js similarity index 100% rename from cypress/integration/seededFlows/adminFlows/users/manageCredits.spec.js rename to cypress/e2e/seededFlows/adminFlows/users/manageCredits.spec.js diff --git a/cypress/integration/seededFlows/adminFlows/users/manageOrganizations.spec.js b/cypress/e2e/seededFlows/adminFlows/users/manageOrganizations.spec.js similarity index 100% rename from cypress/integration/seededFlows/adminFlows/users/manageOrganizations.spec.js rename to cypress/e2e/seededFlows/adminFlows/users/manageOrganizations.spec.js diff --git a/cypress/integration/seededFlows/adminFlows/users/manageRoles.spec.js b/cypress/e2e/seededFlows/adminFlows/users/manageRoles.spec.js similarity index 100% rename from cypress/integration/seededFlows/adminFlows/users/manageRoles.spec.js rename to cypress/e2e/seededFlows/adminFlows/users/manageRoles.spec.js diff --git a/cypress/integration/seededFlows/adminFlows/users/manageUserOptions.spec.js b/cypress/e2e/seededFlows/adminFlows/users/manageUserOptions.spec.js similarity index 100% rename from cypress/integration/seededFlows/adminFlows/users/manageUserOptions.spec.js rename to cypress/e2e/seededFlows/adminFlows/users/manageUserOptions.spec.js diff --git a/cypress/integration/seededFlows/adminFlows/users/navigateTabs.spec.js b/cypress/e2e/seededFlows/adminFlows/users/navigateTabs.spec.js similarity index 100% rename from cypress/integration/seededFlows/adminFlows/users/navigateTabs.spec.js rename to cypress/e2e/seededFlows/adminFlows/users/navigateTabs.spec.js diff --git a/cypress/integration/seededFlows/adminFlows/users/userAdminUtilitites.js b/cypress/e2e/seededFlows/adminFlows/users/userAdminUtilitites.js similarity index 100% rename from cypress/integration/seededFlows/adminFlows/users/userAdminUtilitites.js rename to cypress/e2e/seededFlows/adminFlows/users/userAdminUtilitites.js diff --git a/cypress/integration/seededFlows/adminFlows/users/userIndexView.spec.js b/cypress/e2e/seededFlows/adminFlows/users/userIndexView.spec.js similarity index 100% rename from cypress/integration/seededFlows/adminFlows/users/userIndexView.spec.js rename to cypress/e2e/seededFlows/adminFlows/users/userIndexView.spec.js diff --git a/cypress/integration/seededFlows/analyticsFlows/analyticsNavigation.spec.js b/cypress/e2e/seededFlows/analyticsFlows/analyticsNavigation.spec.js similarity index 100% rename from cypress/integration/seededFlows/analyticsFlows/analyticsNavigation.spec.js rename to cypress/e2e/seededFlows/analyticsFlows/analyticsNavigation.spec.js diff --git a/cypress/integration/seededFlows/articleFlows/adminButtonArticle.spec.js b/cypress/e2e/seededFlows/articleFlows/adminButtonArticle.spec.js similarity index 100% rename from cypress/integration/seededFlows/articleFlows/adminButtonArticle.spec.js rename to cypress/e2e/seededFlows/articleFlows/adminButtonArticle.spec.js diff --git a/cypress/integration/seededFlows/articleFlows/commentOnArticle.spec.js b/cypress/e2e/seededFlows/articleFlows/commentOnArticle.spec.js similarity index 100% rename from cypress/integration/seededFlows/articleFlows/commentOnArticle.spec.js rename to cypress/e2e/seededFlows/articleFlows/commentOnArticle.spec.js diff --git a/cypress/integration/seededFlows/articleFlows/followAuthor.spec.js b/cypress/e2e/seededFlows/articleFlows/followAuthor.spec.js similarity index 100% rename from cypress/integration/seededFlows/articleFlows/followAuthor.spec.js rename to cypress/e2e/seededFlows/articleFlows/followAuthor.spec.js diff --git a/cypress/integration/seededFlows/articleFlows/followOrganization.spec.js b/cypress/e2e/seededFlows/articleFlows/followOrganization.spec.js similarity index 100% rename from cypress/integration/seededFlows/articleFlows/followOrganization.spec.js rename to cypress/e2e/seededFlows/articleFlows/followOrganization.spec.js diff --git a/cypress/integration/seededFlows/articleFlows/hideArticleComments.spec.js b/cypress/e2e/seededFlows/articleFlows/hideArticleComments.spec.js similarity index 100% rename from cypress/integration/seededFlows/articleFlows/hideArticleComments.spec.js rename to cypress/e2e/seededFlows/articleFlows/hideArticleComments.spec.js diff --git a/cypress/integration/seededFlows/articleFlows/liquidTagFlows/followFromArticleLiquidTag.spec.js b/cypress/e2e/seededFlows/articleFlows/liquidTagFlows/followFromArticleLiquidTag.spec.js similarity index 100% rename from cypress/integration/seededFlows/articleFlows/liquidTagFlows/followFromArticleLiquidTag.spec.js rename to cypress/e2e/seededFlows/articleFlows/liquidTagFlows/followFromArticleLiquidTag.spec.js diff --git a/cypress/integration/seededFlows/articleFlows/liquidTagFlows/userSubscriptionLiquidTagWithAppleAuthEmail.spec.js b/cypress/e2e/seededFlows/articleFlows/liquidTagFlows/userSubscriptionLiquidTagWithAppleAuthEmail.spec.js similarity index 100% rename from cypress/integration/seededFlows/articleFlows/liquidTagFlows/userSubscriptionLiquidTagWithAppleAuthEmail.spec.js rename to cypress/e2e/seededFlows/articleFlows/liquidTagFlows/userSubscriptionLiquidTagWithAppleAuthEmail.spec.js diff --git a/cypress/integration/seededFlows/articleFlows/liquidTagFlows/userSubscriptionTagWithSubscribableEmail.spec.js b/cypress/e2e/seededFlows/articleFlows/liquidTagFlows/userSubscriptionTagWithSubscribableEmail.spec.js similarity index 100% rename from cypress/integration/seededFlows/articleFlows/liquidTagFlows/userSubscriptionTagWithSubscribableEmail.spec.js rename to cypress/e2e/seededFlows/articleFlows/liquidTagFlows/userSubscriptionTagWithSubscribableEmail.spec.js diff --git a/cypress/integration/seededFlows/articleFlows/manageFlows/lockDiscussion.spec.js b/cypress/e2e/seededFlows/articleFlows/manageFlows/lockDiscussion.spec.js similarity index 100% rename from cypress/integration/seededFlows/articleFlows/manageFlows/lockDiscussion.spec.js rename to cypress/e2e/seededFlows/articleFlows/manageFlows/lockDiscussion.spec.js diff --git a/cypress/integration/seededFlows/articleFlows/manageFlows/unlockDiscussion.spec.js b/cypress/e2e/seededFlows/articleFlows/manageFlows/unlockDiscussion.spec.js similarity index 100% rename from cypress/integration/seededFlows/articleFlows/manageFlows/unlockDiscussion.spec.js rename to cypress/e2e/seededFlows/articleFlows/manageFlows/unlockDiscussion.spec.js diff --git a/cypress/integration/seededFlows/articleFlows/playOrPauseAnimatedImages.spec.js b/cypress/e2e/seededFlows/articleFlows/playOrPauseAnimatedImages.spec.js similarity index 100% rename from cypress/integration/seededFlows/articleFlows/playOrPauseAnimatedImages.spec.js rename to cypress/e2e/seededFlows/articleFlows/playOrPauseAnimatedImages.spec.js diff --git a/cypress/integration/seededFlows/articleFlows/postModerationTools.spec.js b/cypress/e2e/seededFlows/articleFlows/postModerationTools.spec.js similarity index 100% rename from cypress/integration/seededFlows/articleFlows/postModerationTools.spec.js rename to cypress/e2e/seededFlows/articleFlows/postModerationTools.spec.js diff --git a/cypress/integration/seededFlows/articleFlows/postShareOptions.spec.js b/cypress/e2e/seededFlows/articleFlows/postShareOptions.spec.js similarity index 100% rename from cypress/integration/seededFlows/articleFlows/postShareOptions.spec.js rename to cypress/e2e/seededFlows/articleFlows/postShareOptions.spec.js diff --git a/cypress/integration/seededFlows/articleFlows/postSidebarActions.spec.js b/cypress/e2e/seededFlows/articleFlows/postSidebarActions.spec.js similarity index 100% rename from cypress/integration/seededFlows/articleFlows/postSidebarActions.spec.js rename to cypress/e2e/seededFlows/articleFlows/postSidebarActions.spec.js diff --git a/cypress/integration/seededFlows/articleFlows/removeMainImage.spec.js b/cypress/e2e/seededFlows/articleFlows/removeMainImage.spec.js similarity index 100% rename from cypress/integration/seededFlows/articleFlows/removeMainImage.spec.js rename to cypress/e2e/seededFlows/articleFlows/removeMainImage.spec.js diff --git a/cypress/integration/seededFlows/articleFlows/seriesFlows/previewProfileFromSeries.spec.js b/cypress/e2e/seededFlows/articleFlows/seriesFlows/previewProfileFromSeries.spec.js similarity index 100% rename from cypress/integration/seededFlows/articleFlows/seriesFlows/previewProfileFromSeries.spec.js rename to cypress/e2e/seededFlows/articleFlows/seriesFlows/previewProfileFromSeries.spec.js diff --git a/cypress/integration/seededFlows/articleFlows/subscribeToArticleComments.spec.js b/cypress/e2e/seededFlows/articleFlows/subscribeToArticleComments.spec.js similarity index 100% rename from cypress/integration/seededFlows/articleFlows/subscribeToArticleComments.spec.js rename to cypress/e2e/seededFlows/articleFlows/subscribeToArticleComments.spec.js diff --git a/cypress/integration/seededFlows/articleFlows/viewArticleDiscussion.spec.js b/cypress/e2e/seededFlows/articleFlows/viewArticleDiscussion.spec.js similarity index 100% rename from cypress/integration/seededFlows/articleFlows/viewArticleDiscussion.spec.js rename to cypress/e2e/seededFlows/articleFlows/viewArticleDiscussion.spec.js diff --git a/cypress/integration/seededFlows/dashboardFlows/dashboardNavigation.spec.js b/cypress/e2e/seededFlows/dashboardFlows/dashboardNavigation.spec.js similarity index 100% rename from cypress/integration/seededFlows/dashboardFlows/dashboardNavigation.spec.js rename to cypress/e2e/seededFlows/dashboardFlows/dashboardNavigation.spec.js diff --git a/cypress/integration/seededFlows/dashboardFlows/managePost.spec.js b/cypress/e2e/seededFlows/dashboardFlows/managePost.spec.js similarity index 100% rename from cypress/integration/seededFlows/dashboardFlows/managePost.spec.js rename to cypress/e2e/seededFlows/dashboardFlows/managePost.spec.js diff --git a/cypress/integration/seededFlows/dashboardFlows/postsDashboard.spec.js b/cypress/e2e/seededFlows/dashboardFlows/postsDashboard.spec.js similarity index 100% rename from cypress/integration/seededFlows/dashboardFlows/postsDashboard.spec.js rename to cypress/e2e/seededFlows/dashboardFlows/postsDashboard.spec.js diff --git a/cypress/integration/seededFlows/homeFeedFlows/feedNavigation.spec.js b/cypress/e2e/seededFlows/homeFeedFlows/feedNavigation.spec.js similarity index 100% rename from cypress/integration/seededFlows/homeFeedFlows/feedNavigation.spec.js rename to cypress/e2e/seededFlows/homeFeedFlows/feedNavigation.spec.js diff --git a/cypress/integration/seededFlows/homeFeedFlows/profilePreviewCards.spec.js b/cypress/e2e/seededFlows/homeFeedFlows/profilePreviewCards.spec.js similarity index 100% rename from cypress/integration/seededFlows/homeFeedFlows/profilePreviewCards.spec.js rename to cypress/e2e/seededFlows/homeFeedFlows/profilePreviewCards.spec.js diff --git a/cypress/integration/seededFlows/listingFlows/deleteListing.spec.js b/cypress/e2e/seededFlows/listingFlows/deleteListing.spec.js similarity index 100% rename from cypress/integration/seededFlows/listingFlows/deleteListing.spec.js rename to cypress/e2e/seededFlows/listingFlows/deleteListing.spec.js diff --git a/cypress/integration/seededFlows/listingFlows/viewListing.spec.js b/cypress/e2e/seededFlows/listingFlows/viewListing.spec.js similarity index 100% rename from cypress/integration/seededFlows/listingFlows/viewListing.spec.js rename to cypress/e2e/seededFlows/listingFlows/viewListing.spec.js diff --git a/cypress/integration/seededFlows/loggedOutFlows/homeFeed.spec.js b/cypress/e2e/seededFlows/loggedOutFlows/homeFeed.spec.js similarity index 100% rename from cypress/integration/seededFlows/loggedOutFlows/homeFeed.spec.js rename to cypress/e2e/seededFlows/loggedOutFlows/homeFeed.spec.js diff --git a/cypress/integration/seededFlows/loggedOutFlows/showLoginModal.spec.js b/cypress/e2e/seededFlows/loggedOutFlows/showLoginModal.spec.js similarity index 100% rename from cypress/integration/seededFlows/loggedOutFlows/showLoginModal.spec.js rename to cypress/e2e/seededFlows/loggedOutFlows/showLoginModal.spec.js diff --git a/cypress/integration/seededFlows/loggedOutFlows/tagIndex.spec.js b/cypress/e2e/seededFlows/loggedOutFlows/tagIndex.spec.js similarity index 100% rename from cypress/integration/seededFlows/loggedOutFlows/tagIndex.spec.js rename to cypress/e2e/seededFlows/loggedOutFlows/tagIndex.spec.js diff --git a/cypress/integration/seededFlows/loginFlows/userChangePassword.spec.js b/cypress/e2e/seededFlows/loginFlows/userChangePassword.spec.js similarity index 100% rename from cypress/integration/seededFlows/loginFlows/userChangePassword.spec.js rename to cypress/e2e/seededFlows/loginFlows/userChangePassword.spec.js diff --git a/cypress/integration/seededFlows/loginFlows/userLogin.spec.js b/cypress/e2e/seededFlows/loginFlows/userLogin.spec.js similarity index 100% rename from cypress/integration/seededFlows/loginFlows/userLogin.spec.js rename to cypress/e2e/seededFlows/loginFlows/userLogin.spec.js diff --git a/cypress/integration/seededFlows/loginFlows/userLogout.spec.js b/cypress/e2e/seededFlows/loginFlows/userLogout.spec.js similarity index 100% rename from cypress/integration/seededFlows/loginFlows/userLogout.spec.js rename to cypress/e2e/seededFlows/loginFlows/userLogout.spec.js diff --git a/cypress/integration/seededFlows/mobileFlows/namespacedForemMobile.spec.js b/cypress/e2e/seededFlows/mobileFlows/namespacedForemMobile.spec.js similarity index 100% rename from cypress/integration/seededFlows/mobileFlows/namespacedForemMobile.spec.js rename to cypress/e2e/seededFlows/mobileFlows/namespacedForemMobile.spec.js diff --git a/cypress/integration/seededFlows/mobileFlows/runtimeBannerDeepLinking.spec.js b/cypress/e2e/seededFlows/mobileFlows/runtimeBannerDeepLinking.spec.js similarity index 100% rename from cypress/integration/seededFlows/mobileFlows/runtimeBannerDeepLinking.spec.js rename to cypress/e2e/seededFlows/mobileFlows/runtimeBannerDeepLinking.spec.js diff --git a/cypress/integration/seededFlows/mobileFlows/runtimeContext.spec.js b/cypress/e2e/seededFlows/mobileFlows/runtimeContext.spec.js similarity index 100% rename from cypress/integration/seededFlows/mobileFlows/runtimeContext.spec.js rename to cypress/e2e/seededFlows/mobileFlows/runtimeContext.spec.js diff --git a/cypress/integration/seededFlows/moderationFlows/adjustPostTags.spec.js b/cypress/e2e/seededFlows/moderationFlows/adjustPostTags.spec.js similarity index 100% rename from cypress/integration/seededFlows/moderationFlows/adjustPostTags.spec.js rename to cypress/e2e/seededFlows/moderationFlows/adjustPostTags.spec.js diff --git a/cypress/integration/seededFlows/moderationFlows/modNavigation.spec.js b/cypress/e2e/seededFlows/moderationFlows/modNavigation.spec.js similarity index 100% rename from cypress/integration/seededFlows/moderationFlows/modNavigation.spec.js rename to cypress/e2e/seededFlows/moderationFlows/modNavigation.spec.js diff --git a/cypress/integration/seededFlows/notificationsFlows/commentNotifications.spec.js b/cypress/e2e/seededFlows/notificationsFlows/commentNotifications.spec.js similarity index 100% rename from cypress/integration/seededFlows/notificationsFlows/commentNotifications.spec.js rename to cypress/e2e/seededFlows/notificationsFlows/commentNotifications.spec.js diff --git a/cypress/integration/seededFlows/notificationsFlows/followUserFromNotifications.spec.js b/cypress/e2e/seededFlows/notificationsFlows/followUserFromNotifications.spec.js similarity index 100% rename from cypress/integration/seededFlows/notificationsFlows/followUserFromNotifications.spec.js rename to cypress/e2e/seededFlows/notificationsFlows/followUserFromNotifications.spec.js diff --git a/cypress/integration/seededFlows/notificationsFlows/notificationNavigation.spec.js b/cypress/e2e/seededFlows/notificationsFlows/notificationNavigation.spec.js similarity index 100% rename from cypress/integration/seededFlows/notificationsFlows/notificationNavigation.spec.js rename to cypress/e2e/seededFlows/notificationsFlows/notificationNavigation.spec.js diff --git a/cypress/integration/seededFlows/podcastFlows/followPodcast.spec.js b/cypress/e2e/seededFlows/podcastFlows/followPodcast.spec.js similarity index 100% rename from cypress/integration/seededFlows/podcastFlows/followPodcast.spec.js rename to cypress/e2e/seededFlows/podcastFlows/followPodcast.spec.js diff --git a/cypress/integration/seededFlows/podcastFlows/togglePodcastPlayback.spec.js b/cypress/e2e/seededFlows/podcastFlows/togglePodcastPlayback.spec.js similarity index 100% rename from cypress/integration/seededFlows/podcastFlows/togglePodcastPlayback.spec.js rename to cypress/e2e/seededFlows/podcastFlows/togglePodcastPlayback.spec.js diff --git a/cypress/integration/seededFlows/policyFlows/limitPostCreationToAdmins.spec.js b/cypress/e2e/seededFlows/policyFlows/limitPostCreationToAdmins.spec.js similarity index 100% rename from cypress/integration/seededFlows/policyFlows/limitPostCreationToAdmins.spec.js rename to cypress/e2e/seededFlows/policyFlows/limitPostCreationToAdmins.spec.js diff --git a/cypress/integration/seededFlows/profileFlows/followOrganisation.spec.js b/cypress/e2e/seededFlows/profileFlows/followOrganisation.spec.js similarity index 100% rename from cypress/integration/seededFlows/profileFlows/followOrganisation.spec.js rename to cypress/e2e/seededFlows/profileFlows/followOrganisation.spec.js diff --git a/cypress/integration/seededFlows/profileFlows/followUser.spec.js b/cypress/e2e/seededFlows/profileFlows/followUser.spec.js similarity index 100% rename from cypress/integration/seededFlows/profileFlows/followUser.spec.js rename to cypress/e2e/seededFlows/profileFlows/followUser.spec.js diff --git a/cypress/integration/seededFlows/profileFlows/profileUserActionsMenu.spec.js b/cypress/e2e/seededFlows/profileFlows/profileUserActionsMenu.spec.js similarity index 100% rename from cypress/integration/seededFlows/profileFlows/profileUserActionsMenu.spec.js rename to cypress/e2e/seededFlows/profileFlows/profileUserActionsMenu.spec.js diff --git a/cypress/integration/seededFlows/profileFlows/userUpdateSettingsProfile.spec.js b/cypress/e2e/seededFlows/profileFlows/userUpdateSettingsProfile.spec.js similarity index 100% rename from cypress/integration/seededFlows/profileFlows/userUpdateSettingsProfile.spec.js rename to cypress/e2e/seededFlows/profileFlows/userUpdateSettingsProfile.spec.js diff --git a/cypress/integration/seededFlows/publishingFlows/addTagsToArticle.spec.js b/cypress/e2e/seededFlows/publishingFlows/addTagsToArticle.spec.js similarity index 100% rename from cypress/integration/seededFlows/publishingFlows/addTagsToArticle.spec.js rename to cypress/e2e/seededFlows/publishingFlows/addTagsToArticle.spec.js diff --git a/cypress/integration/seededFlows/publishingFlows/markdownToolbar.spec.js b/cypress/e2e/seededFlows/publishingFlows/markdownToolbar.spec.js similarity index 100% rename from cypress/integration/seededFlows/publishingFlows/markdownToolbar.spec.js rename to cypress/e2e/seededFlows/publishingFlows/markdownToolbar.spec.js diff --git a/cypress/integration/seededFlows/publishingFlows/mentionUser.spec.js b/cypress/e2e/seededFlows/publishingFlows/mentionUser.spec.js similarity index 100% rename from cypress/integration/seededFlows/publishingFlows/mentionUser.spec.js rename to cypress/e2e/seededFlows/publishingFlows/mentionUser.spec.js diff --git a/cypress/integration/seededFlows/publishingFlows/postBrowserPersistence.spec.js b/cypress/e2e/seededFlows/publishingFlows/postBrowserPersistence.spec.js similarity index 100% rename from cypress/integration/seededFlows/publishingFlows/postBrowserPersistence.spec.js rename to cypress/e2e/seededFlows/publishingFlows/postBrowserPersistence.spec.js diff --git a/cypress/integration/seededFlows/publishingFlows/postOptions.spec.js b/cypress/e2e/seededFlows/publishingFlows/postOptions.spec.js similarity index 100% rename from cypress/integration/seededFlows/publishingFlows/postOptions.spec.js rename to cypress/e2e/seededFlows/publishingFlows/postOptions.spec.js diff --git a/cypress/integration/seededFlows/publishingFlows/previewPost.spec.js b/cypress/e2e/seededFlows/publishingFlows/previewPost.spec.js similarity index 100% rename from cypress/integration/seededFlows/publishingFlows/previewPost.spec.js rename to cypress/e2e/seededFlows/publishingFlows/previewPost.spec.js diff --git a/cypress/integration/seededFlows/publishingFlows/publishOrSavePost.spec.js b/cypress/e2e/seededFlows/publishingFlows/publishOrSavePost.spec.js similarity index 100% rename from cypress/integration/seededFlows/publishingFlows/publishOrSavePost.spec.js rename to cypress/e2e/seededFlows/publishingFlows/publishOrSavePost.spec.js diff --git a/cypress/integration/seededFlows/publishingFlows/uploadImage.spec.js b/cypress/e2e/seededFlows/publishingFlows/uploadImage.spec.js similarity index 100% rename from cypress/integration/seededFlows/publishingFlows/uploadImage.spec.js rename to cypress/e2e/seededFlows/publishingFlows/uploadImage.spec.js diff --git a/cypress/integration/seededFlows/readingListFlows/readingList.spec.js b/cypress/e2e/seededFlows/readingListFlows/readingList.spec.js similarity index 100% rename from cypress/integration/seededFlows/readingListFlows/readingList.spec.js rename to cypress/e2e/seededFlows/readingListFlows/readingList.spec.js diff --git a/cypress/integration/seededFlows/readingListFlows/readingListArchive.spec.js b/cypress/e2e/seededFlows/readingListFlows/readingListArchive.spec.js similarity index 100% rename from cypress/integration/seededFlows/readingListFlows/readingListArchive.spec.js rename to cypress/e2e/seededFlows/readingListFlows/readingListArchive.spec.js diff --git a/cypress/integration/seededFlows/registrationFlows/emailRegistration.spec.js b/cypress/e2e/seededFlows/registrationFlows/emailRegistration.spec.js similarity index 100% rename from cypress/integration/seededFlows/registrationFlows/emailRegistration.spec.js rename to cypress/e2e/seededFlows/registrationFlows/emailRegistration.spec.js diff --git a/cypress/integration/seededFlows/searchFlows/followUser.spec.js b/cypress/e2e/seededFlows/searchFlows/followUser.spec.js similarity index 100% rename from cypress/integration/seededFlows/searchFlows/followUser.spec.js rename to cypress/e2e/seededFlows/searchFlows/followUser.spec.js diff --git a/cypress/integration/seededFlows/searchFlows/previewProfileFromPostSearchResults.spec.js b/cypress/e2e/seededFlows/searchFlows/previewProfileFromPostSearchResults.spec.js similarity index 100% rename from cypress/integration/seededFlows/searchFlows/previewProfileFromPostSearchResults.spec.js rename to cypress/e2e/seededFlows/searchFlows/previewProfileFromPostSearchResults.spec.js diff --git a/cypress/integration/seededFlows/searchFlows/searchForm.spec.js b/cypress/e2e/seededFlows/searchFlows/searchForm.spec.js similarity index 100% rename from cypress/integration/seededFlows/searchFlows/searchForm.spec.js rename to cypress/e2e/seededFlows/searchFlows/searchForm.spec.js diff --git a/cypress/integration/seededFlows/searchFlows/searchTimeFiltering.spec.js b/cypress/e2e/seededFlows/searchFlows/searchTimeFiltering.spec.js similarity index 100% rename from cypress/integration/seededFlows/searchFlows/searchTimeFiltering.spec.js rename to cypress/e2e/seededFlows/searchFlows/searchTimeFiltering.spec.js diff --git a/cypress/integration/seededFlows/settingsFlows/organisationSettings.spec.js b/cypress/e2e/seededFlows/settingsFlows/organisationSettings.spec.js similarity index 100% rename from cypress/integration/seededFlows/settingsFlows/organisationSettings.spec.js rename to cypress/e2e/seededFlows/settingsFlows/organisationSettings.spec.js diff --git a/cypress/integration/seededFlows/settingsFlows/updateProfileSettings.spec.js b/cypress/e2e/seededFlows/settingsFlows/updateProfileSettings.spec.js similarity index 100% rename from cypress/integration/seededFlows/settingsFlows/updateProfileSettings.spec.js rename to cypress/e2e/seededFlows/settingsFlows/updateProfileSettings.spec.js diff --git a/cypress/integration/seededFlows/tagsFlows/editTag.spec.js b/cypress/e2e/seededFlows/tagsFlows/editTag.spec.js similarity index 100% rename from cypress/integration/seededFlows/tagsFlows/editTag.spec.js rename to cypress/e2e/seededFlows/tagsFlows/editTag.spec.js diff --git a/cypress/integration/seededFlows/tagsFlows/followTag.spec.js b/cypress/e2e/seededFlows/tagsFlows/followTag.spec.js similarity index 100% rename from cypress/integration/seededFlows/tagsFlows/followTag.spec.js rename to cypress/e2e/seededFlows/tagsFlows/followTag.spec.js diff --git a/cypress/integration/seededFlows/tagsFlows/previewProfileFromTagIndex.spec.js b/cypress/e2e/seededFlows/tagsFlows/previewProfileFromTagIndex.spec.js similarity index 100% rename from cypress/integration/seededFlows/tagsFlows/previewProfileFromTagIndex.spec.js rename to cypress/e2e/seededFlows/tagsFlows/previewProfileFromTagIndex.spec.js diff --git a/cypress/integration/seededFlows/tagsFlows/tagIndexNavigation.spec.js b/cypress/e2e/seededFlows/tagsFlows/tagIndexNavigation.spec.js similarity index 100% rename from cypress/integration/seededFlows/tagsFlows/tagIndexNavigation.spec.js rename to cypress/e2e/seededFlows/tagsFlows/tagIndexNavigation.spec.js diff --git a/cypress/integration/seededFlows/toggleFeatureFlags.spec.js b/cypress/e2e/seededFlows/toggleFeatureFlags.spec.js similarity index 100% rename from cypress/integration/seededFlows/toggleFeatureFlags.spec.js rename to cypress/e2e/seededFlows/toggleFeatureFlags.spec.js diff --git a/cypress/integration/seededFlows/topNavigationFlows/MemberDropDownButton.spec.js b/cypress/e2e/seededFlows/topNavigationFlows/MemberDropDownButton.spec.js similarity index 100% rename from cypress/integration/seededFlows/topNavigationFlows/MemberDropDownButton.spec.js rename to cypress/e2e/seededFlows/topNavigationFlows/MemberDropDownButton.spec.js diff --git a/cypress/plugins/index.js b/cypress/plugins/index.js index 712f4c504..f703dc357 100644 --- a/cypress/plugins/index.js +++ b/cypress/plugins/index.js @@ -27,7 +27,7 @@ module.exports = (on, config) => { const { E2E_FOLDER = 'seededFlows' } = process.env; - config.testFiles = `**/${E2E_FOLDER}/**/*.spec.js`; + config.specPattern = `**/${E2E_FOLDER}/**/*.spec.js`; on('task', { failed: require('cypress-failed-log/src/failed')(), diff --git a/cypress/support/index.js b/cypress/support/e2e.js similarity index 100% rename from cypress/support/index.js rename to cypress/support/e2e.js diff --git a/package.json b/package.json index 46649103b..2bd523555 100644 --- a/package.json +++ b/package.json @@ -41,7 +41,7 @@ "devDependencies": { "@babel/eslint-parser": "^7.18.2", "@faker-js/faker": "^7.3.0", - "@knapsack-pro/cypress": "^4.6.0", + "@knapsack-pro/cypress": "^5.1.0", "@storybook/addon-a11y": "^6.4.22", "@storybook/addon-actions": "^6.5.9", "@storybook/addon-docs": "^6.5.9", @@ -63,7 +63,7 @@ "babel-loader": "^8.2.5", "css-loader": "^5.2.7", "cssom": "^0.5.0", - "cypress": "^9.7.0", + "cypress": "^10.3.0", "cypress-failed-log": "^2.9.5", "cypress-file-upload": "^5.0.8", "cypress-pipe": "^2.0.0", diff --git a/yarn.lock b/yarn.lock index bbdb504aa..c0360b7e4 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1975,10 +1975,10 @@ axios-retry "^3.2.5" winston "^3.7.2" -"@knapsack-pro/cypress@^4.6.0": - version "4.6.0" - resolved "https://registry.yarnpkg.com/@knapsack-pro/cypress/-/cypress-4.6.0.tgz#a317b41fc790cb4d9739fb7ea8cf8fe2958e9ecc" - integrity sha512-QTX6pkJ2dKPES52qhZzlOfo50ifd4UfB8Id9owmFUPANt/hG9dO26g5RZj1oQpqpAAMpZX/7F7+Y2WVVxtggag== +"@knapsack-pro/cypress@^5.1.0": + version "5.1.0" + resolved "https://registry.yarnpkg.com/@knapsack-pro/cypress/-/cypress-5.1.0.tgz#bffb5e8ba56d225a594d2ed292681ef09edaf2ab" + integrity sha512-0R7Bd+lKH4cD/CbjKQyxbIw6YD+KgCzmFxeJByn7Tf0WfojPUg76FytgSc4XvFPdZFjUqa90mZjyUsmdLch6Iw== dependencies: "@knapsack-pro/core" "^3.2.0" glob "^8.0.3" @@ -6474,10 +6474,10 @@ cypress-pipe@^2.0.0: resolved "https://registry.yarnpkg.com/cypress-pipe/-/cypress-pipe-2.0.0.tgz#577df7a70a8603d89a96dfe4092a605962181af8" integrity sha512-KW9s+bz4tFLucH3rBGfjW+Q12n7S4QpUSSyxiGrgPOfoHlbYWzAGB3H26MO0VTojqf9NVvfd5Kt0MH5XMgbfyg== -cypress@^9.7.0: - version "9.7.0" - resolved "https://registry.yarnpkg.com/cypress/-/cypress-9.7.0.tgz#bf55b2afd481f7a113ef5604aa8b693564b5e744" - integrity sha512-+1EE1nuuuwIt/N1KXRR2iWHU+OiIt7H28jJDyyI4tiUftId/DrXYEwoDa5+kH2pki1zxnA0r6HrUGHV5eLbF5Q== +cypress@^10.3.0: + version "10.3.0" + resolved "https://registry.yarnpkg.com/cypress/-/cypress-10.3.0.tgz#fae8d32f0822fcfb938e79c7c31ef344794336ae" + integrity sha512-txkQWKzvBVnWdCuKs5Xc08gjpO89W2Dom2wpZgT9zWZT5jXxqPIxqP/NC1YArtkpmp3fN5HW8aDjYBizHLUFvg== dependencies: "@cypress/request" "^2.88.10" "@cypress/xvfb" "^1.2.4"