Skip to content

Next

  • Projects
  • Groups
  • Snippets
  • Help
    • Loading...
    • Help
    • Support
    • Submit feedback
    • Contribute to GitLab
    • Switch to GitLab Next
  • Sign in / Register
Minds Frontend
Minds Frontend
  • Project
    • Project
    • Details
    • Activity
    • Releases
    • Cycle Analytics
    • Insights
  • Repository
    • Repository
    • Files
    • Commits
    • Branches
    • Tags
    • Contributors
    • Graph
    • Compare
    • Charts
    • Locked Files
  • Issues 849
    • Issues 849
    • List
    • Boards
    • Labels
    • Service Desk
    • Milestones
  • Merge Requests 46
    • Merge Requests 46
  • CI / CD
    • CI / CD
    • Pipelines
    • Jobs
    • Schedules
    • Charts
  • Security & Compliance
    • Security & Compliance
    • Dependency List
  • Packages
    • Packages
    • List
    • Container Registry
  • Wiki
    • Wiki
  • Snippets
    • Snippets
  • Members
    • Members
  • Collapse sidebar
  • Activity
  • Graph
  • Charts
  • Create a new issue
  • Jobs
  • Commits
  • Issue Boards
  • Minds
  • Minds FrontendMinds Frontend
  • Merge Requests
  • !566

Our Privacy Policy has changed, please visit https://about.gitlab.com/privacy to review these changes.

Open
Opened 1 week ago by Ben Hayward@benhayward.ben
  • Report abuse
Report abuse

WIP: [Sprint/NuancedNumbat](fix) E2E tests for staging and production #1948

Closes #1948 (closed)

Edited 5 days ago by Ben Hayward

Check out, review, and merge locally

Step 1. Fetch and check out the branch for this merge request

git fetch origin
git checkout -b "fix/e2e-tests-staging" "origin/fix/e2e-tests-staging"

Step 2. Review the changes locally

Step 3. Merge the branch and fix any conflicts that come up

git fetch origin
git checkout "origin/master"
git merge --no-ff "fix/e2e-tests-staging"

Step 4. Push the result of the merge to GitLab

git push origin "master"

Note that pushing to GitLab requires write access to this repository.

Tip: You can also checkout merge requests locally by following these guidelines.

Request to merge fix/e2e-tests-staging into master
Open in Web IDE
  • Email patches
  • Plain diff
Pipeline #85209987 passed with warnings for 139f228d on fix/e2e-tests-staging
              Requires 2 more approvals from Devs and Deployers.
              Marcelo Rivera
              Marcelo Rivera
              Guy Thouret
              Guy Thouret
              Emiliano Balbuena
              Emiliano Balbuena
              Mark Harding
              Mark Harding
              Brian Hatchet
              Brian Hatchet
              This is a Work in Progress

              Closes #1948 (closed)

              Deletes source branch

              You can merge this merge request manually using the
              • Discussion 4
              • Commits 20
              • Pipelines 10
              • Changes 16
              0/2 threads resolved
              • Loading...
              • Ben Hayward @benhayward.ben added MR::Awaiting Review Squad::Yellow scoped labels 1 week ago

                added MR::Awaiting Review Squad::Yellow scoped labels

              • Marcelo Rivera @eiennohi approved this merge request 1 week ago

                approved this merge request

              • Ben Hayward @benhayward.ben added 1 commit 1 week ago

                added 1 commit

                • da291502 - Updated economic tests to be more economical.

                Compare with previous version

              • Ben Hayward @benhayward.ben added 1 commit 1 week ago

                added 1 commit

                • 343e63c7 - Fixed notification e2e test

                Compare with previous version

              • Ben Hayward @benhayward.ben added 1 commit 1 week ago

                added 1 commit

                • 51dcbd4c - Formatting

                Compare with previous version

              • Ben Hayward @benhayward.ben added 2 commits 5 days ago

                added 2 commits

                • 8bb61289 - Added in featureflag cookie setting
                • 19ac9cb1 - Updated to override feat flag by cookie

                Compare with previous version

              • Ben Hayward @benhayward.ben marked as a Work In Progress 5 days ago

                marked as a Work In Progress

              • Ben Hayward @benhayward.ben added 1 commit 5 days ago

                added 1 commit

                • f5cdab03 - Update

                Compare with previous version

              • Ben Hayward @benhayward.ben added 1 commit 5 days ago

                added 1 commit

                • f052aecb - flipped bool

                Compare with previous version

              • Ben Hayward @benhayward.ben added 1 commit 5 days ago

                added 1 commit

                • 2cb13e68 - Adding flags into tests

                Compare with previous version

              • Ben Hayward @benhayward.ben added 10 commits 1 day ago

                added 10 commits

                • 2cb13e68...210b74cb - 7 commits from branch master
                • 5e6428fc - Merge branch 'master' of gitlab.com:minds/front into fix/e2e-tests-staging
                • ba1d5e42 - Merge branch 'master' of gitlab.com:minds/front into fix/e2e-tests-staging
                • 0023ec23 - Updates WIP

                Compare with previous version

                Toggle commit list
              • Ben Hayward @benhayward.ben added MR::Requires Changes scoped label and automatically removed MR::Awaiting Review label 1 day ago

                added MR::Requires Changes scoped label and automatically removed MR::Awaiting Review label

              • Ben Hayward
                Ben Hayward @benhayward.ben · 1 day ago
                Developer

                Fixed build error, current issue is that when pro is enabled for an account it cannot be switched off and so subsequent tests using that account fail.

              • Ben Hayward @benhayward.ben added 4 commits 22 hours ago

                added 4 commits

                • 0023ec23...5b94c667 - 2 commits from branch master
                • b4746fe9 - Merge branch 'master' of gitlab.com:minds/front into fix/e2e-tests-staging
                • 139f228d - current progress 10x fails to ~60 success.

                Compare with previous version

              • Ben Hayward
                Ben Hayward @benhayward.ben started a thread on the diff 21 hours ago
                Last updated by Ben Hayward 21 hours ago
                .gitlab-ci.yml
                44 44 - >
                45 45 if [ "$CI_BUILD_REF_NAME" == "master" ]; then
                46 46 export E2E_DOMAIN=https://www.minds.com
                47 export PRODUCTION=true
                47 48 else
                48 49 export E2E_DOMAIN=https://$CI_BUILD_REF_SLUG.$KUBE_INGRESS_BASE_DOMAIN
                50 export PRODUCTION=false
                49 51 fi
                50 52 - export CYPRESS_baseUrl=$E2E_DOMAIN
                51 53 - echo "E2E tests for $CI_BUILD_REF_NAME running against $E2E_DOMAIN with user $CYPRESS_username"
                52 - $(npm bin)/cypress run --browser chrome --record --key $CYPRESS_RECORD_ID --config CYPRESS_baseUrl=$E2E_DOMAIN
                54 - $(npm bin)/cypress run --browser chrome --record --key $CYPRESS_RECORD_ID --config CYPRESS_baseUrl=$E2E_DOMAIN,production=$PRODUCTION
                • Ben Hayward
                  Ben Hayward @benhayward.ben · 21 hours ago
                  Developer

                  need to update to add pro user and pw

                • Ben Hayward
                  Ben Hayward @benhayward.ben · 21 hours ago
                  Developer

                  Also am going to need to pass the password for the pro user to this script.

                • Please register or sign in to reply
              • Ben Hayward
                Ben Hayward @benhayward.ben started a thread on the diff 21 hours ago
                cypress/e2e.sh
                53 56 # set default arguments
                54 57 url="http://localhost"
                55 58 username="minds_cypress_tests"
                59 pro_username="minds_cypress_tests_pro"
                60 pro_password="123123213"
                • Ben Hayward
                  Ben Hayward @benhayward.ben · 21 hours ago
                  Developer

                  Need to change this - should not be defaulted here when this is merged, and needs to be changed

                • Please register or sign in to reply
              • You're only seeing other activity in the feed. To add a comment, switch to one of the following options.
              Please register or sign in to reply
              0 Assignees
              None
              Assign to
              None
              Milestone
              None
              Assign milestone
              None
              Time tracking
              No estimate or time spent
              2
              Labels
              MR::Requires Changes Squad::Yellow
              Assign labels
              • View project labels
              Lock merge request
              Unlocked
              9
              9 participants
              user avatar
              Marcelo Rivera
              user avatar
              Guy Thouret
              user avatar
              Emiliano Balbuena
              user avatar
              Mark Harding
              user avatar
              Brian Hatchet
              user avatar
              Olivia Madrid
              user avatar
              Martin Santangelo
              Reference: minds/front!566