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

Added final set of cypress tests part of MM-29347 #6659

Merged
merged 5 commits into from
Oct 7, 2020
Merged

Added final set of cypress tests part of MM-29347 #6659

merged 5 commits into from
Oct 7, 2020

Conversation

srkgupta
Copy link
Contributor

@srkgupta srkgupta commented Oct 6, 2020

Summary

MM-29347: E2E Cypress Tests - System Console > Enterprise > Group Mentions (Part 3)

Ticket Link

JIRA Ticket:
MM-29347

TM4J Tests:
MM-T2450
MM-T2451
MM-T2452

Screenshots

Screenshot 2020-10-06 at 10 01 17 PM

@srkgupta srkgupta added 2: Dev Review Requires review by a core commiter 3: QA Review Requires review by a QA tester labels Oct 6, 2020
hahmadia
hahmadia reviewed Oct 6, 2020
View reviewed changes
e2e/cypress/integration/enterprise/group_mentions/group_mentions_permissions_spec.js
});
});

function enableGroupMention(groupName) {
Copy link
Contributor

@hahmadia hahmadia Oct 6, 2020 •
edited
Loading

Choose a reason for hiding this comment

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

Just a preference I guess but could we move these functions (ones at the bottom) to the top of the file rather than have them at the bottom? Non-blocking but I'll leave it up to your discretion on what should be done but just a personal coding preference.

Actually I noticed we have a mix so I guess this doesn't really apply. Just my preference 😛 You may resolve and leave it as is if you like.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Thanks @hahmadia. But we decided to have these functions at the bottom to make it consistent. Some of the old files might still not have this updated, but at least for new ones we use this pattern. I will see if the documentation can reflect this. Thanks for pointing it out though.

hahmadia
hahmadia approved these changes Oct 6, 2020
View reviewed changes
Copy link
Contributor

@hahmadia hahmadia left a comment

Choose a reason for hiding this comment

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

LGTM ✅ Non-blocking comments.
THANKYOU

@srkgupta
Updated as per review comment
04c7d59 
Co-authored-by: Joseph Baylon <joseph.baylon@mattermost.com>
josephbaylon
josephbaylon suggested changes Oct 7, 2020
View reviewed changes
Copy link
Contributor

@josephbaylon josephbaylon left a comment

Choose a reason for hiding this comment

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

@srkgupta Locally the tests consistently fail when there are no timeouts after cy.visit calls. I added the ones locally and they worked fine after. I'll add similar comments in the other PR in case cypress server complains about it as well.

e2e/cypress/integration/enterprise/group_mentions/group_mentions_permissions_spec.js Outdated Show resolved Hide resolved
e2e/cypress/integration/enterprise/group_mentions/group_mentions_permissions_spec.js Show resolved Hide resolved
e2e/cypress/integration/enterprise/group_mentions/group_mentions_permissions_spec.js Show resolved Hide resolved
e2e/cypress/integration/enterprise/group_mentions/group_mentions_permissions_spec.js Outdated Show resolved Hide resolved
e2e/cypress/integration/enterprise/group_mentions/group_mentions_permissions_spec.js Show resolved Hide resolved
e2e/cypress/integration/enterprise/group_mentions/group_mentions_permissions_spec.js Show resolved Hide resolved
e2e/cypress/integration/enterprise/group_mentions/group_mentions_permissions_spec.js Outdated Show resolved Hide resolved
e2e/cypress/integration/enterprise/group_mentions/group_mentions_permissions_spec.js Show resolved Hide resolved
e2e/cypress/integration/enterprise/group_mentions/group_mentions_permissions_spec.js Outdated Show resolved Hide resolved
e2e/cypress/integration/enterprise/group_mentions/group_mentions_permissions_spec.js Outdated Show resolved Hide resolved
@srkgupta
Copy link
Contributor Author

srkgupta commented Oct 7, 2020

Thanks @josephbaylon. Addressed the review comments and handled additional timeouts after cy.visit.

josephbaylon
josephbaylon approved these changes Oct 7, 2020
View reviewed changes
Copy link
Contributor

@josephbaylon josephbaylon left a comment

Choose a reason for hiding this comment

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

LGTM. All tests passed. Thanks @srkgupta !!

@josephbaylon josephbaylon added 4: Reviews Complete All reviewers have approved the pull request and removed 2: Dev Review Requires review by a core commiter 3: QA Review Requires review by a QA tester labels Oct 7, 2020
@josephbaylon josephbaylon merged commit f8e3510 into mattermost:master Oct 7, 2020
@amyblais amyblais added Changelog/Not Needed Does not require a changelog entry Docs/Not Needed Does not require documentation labels Oct 7, 2020
Tak-Iwamoto pushed a commit to Tak-Iwamoto/mattermost-webapp that referenced this pull request Oct 10, 2020
Merge branch 'master' of github.com:Tak-Iwamoto/mattermost-webapp int…
8f76d21 
…o MM-20499

* 'master' of github.com:Tak-Iwamoto/mattermost-webapp: (71 commits)
  Fix bot icon heigth (mattermost#6578)
  Cypress/E2E: Update quick switch hint (mattermost#6691)
  migrate string-refs in search_results.jsx (mattermost#6671)
  MM-T581 Regen token (mattermost#6642)
  Switch button-bg-## to use button-bg-rgb variables (mattermost#6635)
  [MM-27142] In-Web-App purchase of Mattermost Cloud  (mattermost#6583)
  migrate user_list_row_with_error to ts (mattermost#6624)
  [MM-28217] Front-end for displaying company info (mattermost#6580)
  [MM-28211] Plan Details Card (mattermost#6582)
  [MM-28216] Billing History View (UX Only) (mattermost#6637)
  Added final set of cypress tests part of MM-29347 (mattermost#6659)
  [MM-24507] - Pin comment box on bottom of RHS thread (mattermost#6167)
  Cypress/E2E: Fix channel switcher spec (mattermost#6662)
  [MM-28781] migrate string refs in channelView (mattermost#6607)
  [GH-15777] Replace center-channel-color-## with center-channel-color-rgb variables (mattermost#6643)
  [GH-15776]Switch center-channel-color-## with center-channel-color-rgb variables (mattermost#6641)
  MM-29038 Removed usage of centre-channel-color from post comments (mattermost#6633)
  [MM-29034] Remove usage of sidebar-text-## CSS variables (mattermost#6634)
  Translations update from Weblate (mattermost#6673)
  [MM-20462] migrate any_team_permission_gate to typescript (mattermost#6547)
  ...
Tak-Iwamoto pushed a commit to Tak-Iwamoto/mattermost-webapp that referenced this pull request Oct 10, 2020
Merge branch 'master' of github.com:Tak-Iwamoto/mattermost-webapp int…
0f3c332 
…o MM-20465

* 'master' of github.com:Tak-Iwamoto/mattermost-webapp: (71 commits)
  Fix bot icon heigth (mattermost#6578)
  Cypress/E2E: Update quick switch hint (mattermost#6691)
  migrate string-refs in search_results.jsx (mattermost#6671)
  MM-T581 Regen token (mattermost#6642)
  Switch button-bg-## to use button-bg-rgb variables (mattermost#6635)
  [MM-27142] In-Web-App purchase of Mattermost Cloud  (mattermost#6583)
  migrate user_list_row_with_error to ts (mattermost#6624)
  [MM-28217] Front-end for displaying company info (mattermost#6580)
  [MM-28211] Plan Details Card (mattermost#6582)
  [MM-28216] Billing History View (UX Only) (mattermost#6637)
  Added final set of cypress tests part of MM-29347 (mattermost#6659)
  [MM-24507] - Pin comment box on bottom of RHS thread (mattermost#6167)
  Cypress/E2E: Fix channel switcher spec (mattermost#6662)
  [MM-28781] migrate string refs in channelView (mattermost#6607)
  [GH-15777] Replace center-channel-color-## with center-channel-color-rgb variables (mattermost#6643)
  [GH-15776]Switch center-channel-color-## with center-channel-color-rgb variables (mattermost#6641)
  MM-29038 Removed usage of centre-channel-color from post comments (mattermost#6633)
  [MM-29034] Remove usage of sidebar-text-## CSS variables (mattermost#6634)
  Translations update from Weblate (mattermost#6673)
  [MM-20462] migrate any_team_permission_gate to typescript (mattermost#6547)
  ...
Tak-Iwamoto pushed a commit to Tak-Iwamoto/mattermost-webapp that referenced this pull request Oct 10, 2020
Merge remote-tracking branch 'upstream/master' into MM-20469
02663a8 
* upstream/master: (84 commits)
  Fix bot icon heigth (mattermost#6578)
  Cypress/E2E: Update quick switch hint (mattermost#6691)
  migrate string-refs in search_results.jsx (mattermost#6671)
  MM-T581 Regen token (mattermost#6642)
  Switch button-bg-## to use button-bg-rgb variables (mattermost#6635)
  [MM-27142] In-Web-App purchase of Mattermost Cloud  (mattermost#6583)
  migrate user_list_row_with_error to ts (mattermost#6624)
  [MM-28217] Front-end for displaying company info (mattermost#6580)
  [MM-28211] Plan Details Card (mattermost#6582)
  [MM-28216] Billing History View (UX Only) (mattermost#6637)
  Added final set of cypress tests part of MM-29347 (mattermost#6659)
  [MM-24507] - Pin comment box on bottom of RHS thread (mattermost#6167)
  Cypress/E2E: Fix channel switcher spec (mattermost#6662)
  [MM-28781] migrate string refs in channelView (mattermost#6607)
  [GH-15777] Replace center-channel-color-## with center-channel-color-rgb variables (mattermost#6643)
  [GH-15776]Switch center-channel-color-## with center-channel-color-rgb variables (mattermost#6641)
  MM-29038 Removed usage of centre-channel-color from post comments (mattermost#6633)
  [MM-29034] Remove usage of sidebar-text-## CSS variables (mattermost#6634)
  Translations update from Weblate (mattermost#6673)
  [MM-20462] migrate any_team_permission_gate to typescript (mattermost#6547)
  ...
jfrerich pushed a commit that referenced this pull request Oct 23, 2020
@srkgupta @jfrerich
Added final set of cypress tests part of MM-29347 (#6659)
24725d8 
* Added final set of cypress tests part of MM-29347

* Fixed issue on fresh LDAP setup

* Updated as per review comment

Co-authored-by: Joseph Baylon <joseph.baylon@mattermost.com>

* Added additional timeouts after cy.visit

* Addressed PR review comments

Co-authored-by: Joseph Baylon <joseph.baylon@mattermost.com>
calebroseland pushed a commit that referenced this pull request Oct 27, 2020
@srkgupta @calebroseland
Added final set of cypress tests part of MM-29347 (#6659)
9b985d1 
* Added final set of cypress tests part of MM-29347

* Fixed issue on fresh LDAP setup

* Updated as per review comment

Co-authored-by: Joseph Baylon <joseph.baylon@mattermost.com>

* Added additional timeouts after cy.visit

* Addressed PR review comments

Co-authored-by: Joseph Baylon <joseph.baylon@mattermost.com>
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Reviewers

@hahmadia hahmadia hahmadia approved these changes

@josephbaylon josephbaylon josephbaylon 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 Docs/Not Needed Does not require documentation
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
4 participants
@srkgupta @josephbaylon @hahmadia @amyblais