Skip to content
This repository has been archived by the owner on Mar 13, 2024. It is now read-only.

Cypress/E2E: Fix failed tests due to recent change in add users modal #7398

Merged
merged 1 commit into from
Jan 29, 2021
Merged

Cypress/E2E: Fix failed tests due to recent change in add users modal #7398

merged 1 commit into from
Jan 29, 2021

Conversation

saturninoabril
Copy link
Member

Summary

  • Fix failed tests due to recent change in add users modal
  • Add missing TM4J keys for MM-T859

@saturninoabril saturninoabril added the 3: QA Review Requires review by a QA tester label Jan 26, 2021
@saturninoabril saturninoabril added this to the v5.32.0 milestone Jan 28, 2021
@saturninoabril saturninoabril added the CherryPick/Approved Meant for the quality or patch release tracked in the milestone label Jan 28, 2021
prapti
prapti approved these changes Jan 29, 2021
View reviewed changes
Copy link
Contributor

@prapti prapti left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Changes look good. Tests passed locally as well.
Thanks Saturn!

@prapti prapti added 4: Reviews Complete All reviewers have approved the pull request and removed 3: QA Review Requires review by a QA tester labels Jan 29, 2021
@prapti prapti merged commit 57044e0 into mattermost:master Jan 29, 2021
@mattermod
Copy link
Contributor

Cherry pick is scheduled.

@mattermod
Copy link
Contributor

Error trying doing the automated Cherry picking. Please do this manually

+++ Updating remotes...
Fetching upstream
Failed to add the RSA host key for IP address '140.82.114.4' to the list of known hosts (/app/.ssh/known_hosts).
From github.com:mattermost/mattermost-webapp
   3e48190fd..57044e0d6  master       -> upstream/master
   10c3c9491..6b39b9bba  release-5.32 -> upstream/release-5.32
Fetching origin
Failed to add the RSA host key for IP address '140.82.114.4' to the list of known hosts (/app/.ssh/known_hosts).
+++ Updating remotes done...
+++ Creating local branch automated-cherry-pick-of-mattermost-webapp-#7398-upstream-release-5.32-1611894088
Switched to a new branch 'automated-cherry-pick-of-mattermost-webapp-#7398-upstream-release-5.32-1611894088'
Branch 'automated-cherry-pick-of-mattermost-webapp-#7398-upstream-release-5.32-1611894088' set up to track remote branch 'release-5.32' from 'upstream'.

+++ About to attempt cherry pick of PR #7398 with merge commit 57044e0d64633aa57a0d18bcfe58916cafdeaee1.

error: could not apply 57044e0d6... fix failed tests due to recent change in add users modal (#7398)
hint: after resolving the conflicts, mark the corrected paths
hint: with 'git add <paths>' or 'git rm <paths>'
hint: and commit the result with 'git commit'

+++ Conflicts detected:

UU e2e/cypress/integration/channel_sidebar/sidebar_channel_menu_spec.js
UU e2e/cypress/integration/enterprise/ldap/ldap_group_sync_spec.js
Aborting.

+++ Aborting in-progress git cherry-pick.

+++ Returning you to the master branch and cleaning up.

@saturninoabril saturninoabril deleted the e2e-fix-modal branch January 29, 2021 04:47
saturninoabril added a commit that referenced this pull request Jan 29, 2021
@saturninoabril
fix failed tests due to recent change in add users modal (#7398)
aa89858
@saturninoabril
Copy link
Member Author

Done manual cherry-pick into release-5.32 - aa89858

@saturninoabril saturninoabril added CherryPick/Done Successfully cherry-picked to the quality or patch release tracked in the milestone and removed CherryPick/Approved Meant for the quality or patch release tracked in the milestone labels Jan 29, 2021
@amyblais amyblais added Changelog/Not Needed Does not require a changelog entry Docs/Not Needed Does not require documentation labels Jan 29, 2021
chetanyakan added a commit to brightscout-alpha/mattermost-webapp that referenced this pull request Feb 2, 2021
@chetanyakan
Merge branch 'master' of github.com:mattermost/mattermost-webapp into…
613f955 
… MM-2020

* 'master' of github.com:mattermost/mattermost-webapp: (175 commits)
  fix/update failed E2E tests (mattermost#7430)
  [MM-31791] Support Packet Generation FRONTEND (mattermost#7314)
  [MM-32269] System Console: TeamIcon edge cases (mattermost#7395)
  update steps for google openid (mattermost#7327)
  git checkout -b fix-slash-commands-tm4j (mattermost#7397)
  MM-31646: Update Office instructions (mattermost#7326)
  Cypress/E2E: Fix tests for archived channels (mattermost#7424)
  Cypress/E2E: Fix tests for bots in list and in sidebar (mattermost#7421)
  [MM-29108] Simplifies emoji reaction animation (mattermost#7386)
  Cypress/E2E: Overwrite cy.visit and cy.reload to have default 3s wait (mattermost#7410)
  [MM-22369] Filter out ldap group sync teams when adding a team to a user (mattermost#7324)
  MM 31192  - license renewal telemetry (mattermost#7413)
  Migrate message_attachments folder to Typescript (mattermost#7339)
  Cypress/E2E: Fix and reorganize tests for custom emojis (mattermost#7415)
  promote tests with 23 tm4j test cases (mattermost#7402)
  fix failed tests due to recent change in add users modal (mattermost#7398)
  fix for more channels and auth specs (mattermost#7416)
  fix e2e for sidebar channels (mattermost#7412)
  remove duplicate MM-T3294, fix MM-T1253 and fix/reorganize other keyboard shortcuts tests (mattermost#7390)
  MM-31735 - ReDisplay OpenID Connect (mattermost#7325)
  ...
chetanyakan added a commit to brightscout-alpha/mattermost-webapp that referenced this pull request Feb 2, 2021
@chetanyakan
Merge branch 'custom-status-1' into custom-status
881f58e 
* custom-status-1: (153 commits)
  Revert "Custom status base (#19)"
  Custom status base (#19)
  fix/update failed E2E tests (mattermost#7430)
  [MM-31791] Support Packet Generation FRONTEND (mattermost#7314)
  [MM-32269] System Console: TeamIcon edge cases (mattermost#7395)
  update steps for google openid (mattermost#7327)
  git checkout -b fix-slash-commands-tm4j (mattermost#7397)
  MM-31646: Update Office instructions (mattermost#7326)
  Cypress/E2E: Fix tests for archived channels (mattermost#7424)
  Cypress/E2E: Fix tests for bots in list and in sidebar (mattermost#7421)
  [MM-29108] Simplifies emoji reaction animation (mattermost#7386)
  Cypress/E2E: Overwrite cy.visit and cy.reload to have default 3s wait (mattermost#7410)
  [MM-22369] Filter out ldap group sync teams when adding a team to a user (mattermost#7324)
  MM 31192  - license renewal telemetry (mattermost#7413)
  Migrate message_attachments folder to Typescript (mattermost#7339)
  Cypress/E2E: Fix and reorganize tests for custom emojis (mattermost#7415)
  promote tests with 23 tm4j test cases (mattermost#7402)
  fix failed tests due to recent change in add users modal (mattermost#7398)
  fix for more channels and auth specs (mattermost#7416)
  fix e2e for sidebar channels (mattermost#7412)
  ...
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Reviewers

@prapti prapti prapti approved these changes

@asaadmahmood asaadmahmood asaadmahmood approved these changes

Assignees
No one assigned
Labels
4: Reviews Complete All reviewers have approved the pull request Changelog/Not Needed Does not require a changelog entry CherryPick/Done Successfully cherry-picked to the quality or patch release tracked in the milestone Docs/Not Needed Does not require documentation
Projects
None yet
Milestone
v5.32.0
Development

Successfully merging this pull request may close these issues.
5 participants
@saturninoabril @mattermod @prapti @asaadmahmood @amyblais