[MM-23937] Add e2e tests for group mentions #5530

fmunshi · 2020-05-18T22:01:14Z

Summary

Adds e2e tests for group mentions.
The following two assertions run for two different tests, once to enable and disable the allow reference switch and once to enable and disable the group mentions permission on a regular user while keeping the group allow reference enabled

To test whether a group mention is enabled the tests assert the following:

the suggestion list shows the given group
posting the message as a user not in the group shows it as a blue link
viewing the message as a user in the group shows it as highlighted

To test that a group mention is disabled the tests assert the following:

the suggestion list does not show the given group
posting the message containing the group does not apply any custom link styling on it
viewing the message as a user in the group shows it as regular text since the mention did not trigger notifications

Ticket Link

https://mattermost.atlassian.net/browse/MM-23937

Modify IDs and use snake_case instead of PascalCase for ids

fmunshi · 2020-05-18T22:02:27Z

components/admin_console/group_settings/group_details/group_profile.jsx

@@ -44,8 +44,7 @@ export default class GroupProfile extends React.PureComponent {
 </div>
 <input
 type='text'
- id={customID}
- className='form-control group_at_mention_input'
+ className='form-control group-at-mention-input'


this change is unrelated to the test but it just made sense to change the class to not be snake case since we always use hyphen case for class names

components/admin_console/group_settings/group_details/group_profile_and_settings.jsx

e2e/cypress/integration/enterprise/ldap/ldap_login_spec.js

components/admin_console/group_settings/group_details/group_profile.jsx

saturninoabril

@fmunshi Overall looks good, except for some comments to prevent flakiness. Thanks for adding E2E!

e2e/cypress/integration/enterprise/ldap/ldap_login_spec.js

components/admin_console/group_settings/group_details/group_profile_and_settings.jsx

e2e/cypress/integration/enterprise/ldap_group/group_mentions_spec.js

e2e/cypress/support/api_commands.js

e2e/cypress/integration/enterprise/ldap_group/group_mentions_spec.js

saturninoabril

Thanks for updating. Tested and passed.

srkgupta

Thanks @fmunshi. Overall the test looks great. Just a small observation.

srkgupta · 2020-05-20T11:50:47Z

e2e/cypress/integration/enterprise/ldap_group/group_mentions_spec.js

+ // # Login as sysadmin and navigate to system scheme page
+ cy.apiLogin('sysadmin');
+ cy.visit('/admin_console/user_management/permissions/system_scheme');
+
+ // # Click reset to defaults confirm and save
+ cy.findByTestId('resetPermissionsToDefault').click();
+ cy.get('#confirmModalButton').click();
+ saveConfig();


Can you please add this in the after block (or) afterEach block instead of adding it at the end of the test. This is because the specified steps to reset the System permissions may get skipped if the test fails in between. However if its included in the after block, the steps will definitely be executed.

srkgupta

Retested and the changes LGTM. Approving the PR. @fmunshi please resolve the merge conflicts and merge the PR. Thanks.

mattermod · 2020-05-21T16:57:46Z

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

+++ Updating remotes...
Fetching upstream
Fetching origin
+++ Updating remotes done...
+++ Creating local branch automated-cherry-pick-of-#5530-upstream-release-5.24-1590080264
Branch 'automated-cherry-pick-of-#5530-upstream-release-5.24-1590080264' set up to track remote branch 'release-5.24' from 'upstream'.
+++ Downloading patch to /tmp/5530.patch (in case you need to do this again)

+++ About to attempt cherry pick of PR. To reattempt:
  $ git am -3 /tmp/5530.patch

Applying: Add e2e tests for group mentions
Applying: Test from recieving user perspective too
Applying: Update last snapshot
Applying: Fixes from review
Applying: Last review changes
Applying: camelCase instead of snake
Applying: Reset permissions before and after group mentions test
Applying: Fix linting
Patch failed at 0008 Fix linting
Use 'git am --show-current-patch' to see the failed patch
When you have resolved this problem, run "git am --continue".
If you prefer to skip this patch, run "git am --skip" instead.
To restore the original branch and stop patching, run "git am --abort".

+++ Conflicts detected:

!!! None. Did you git am --continue?

+++ Aborting in-progress git am.

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

* Add e2e tests for group mentions Modify IDs and use snake_case instead of PascalCase for ids * Test from recieving user perspective too * Update last snapshot * Fixes from review * Last review changes * camelCase instead of snake * Reset permissions before and after group mentions test * Fix linting

fm2munsh added 3 commits May 17, 2020 01:20

Add e2e tests for group mentions

f5871a9

Modify IDs and use snake_case instead of PascalCase for ids

Test from recieving user perspective too

5f7f112

Update last snapshot

71028a4

fmunshi added 2: Dev Review Requires review by a core commiter 3: QA Review Requires review by a QA tester labels May 18, 2020

fmunshi requested review from srkgupta, saturninoabril and catalintomai May 18, 2020 22:01

fmunshi commented May 18, 2020

View reviewed changes

components/admin_console/group_settings/group_details/group_profile_and_settings.jsx Outdated Show resolved Hide resolved

fmunshi commented May 18, 2020

View reviewed changes

e2e/cypress/integration/enterprise/ldap/ldap_login_spec.js Outdated Show resolved Hide resolved

fmunshi commented May 18, 2020

View reviewed changes

components/admin_console/group_settings/group_details/group_profile.jsx Show resolved Hide resolved

Merge branch 'master' into MM-23937-group-mentions-e2e

3344e8e

saturninoabril suggested changes May 19, 2020

View reviewed changes

fm2munsh added 3 commits May 19, 2020 10:18

Merge branch 'master' into MM-23937-group-mentions-e2e

077d222

Fixes from review

4ac1b06

Last review changes

72fb0b4

fmunshi commented May 19, 2020

View reviewed changes

e2e/cypress/integration/enterprise/ldap_group/group_mentions_spec.js Show resolved Hide resolved

camelCase instead of snake

cd71ac8

fmunshi requested a review from saturninoabril May 19, 2020 15:21

saturninoabril approved these changes May 19, 2020

View reviewed changes

srkgupta suggested changes May 20, 2020

View reviewed changes

fm2munsh added 2 commits May 20, 2020 14:17

Merge branch 'master' into MM-23937-group-mentions-e2e

3290db9

Reset permissions before and after group mentions test

9325157

fmunshi requested review from srkgupta and removed request for catalintomai May 20, 2020 18:22

amyblais added this to the v5.24.0 milestone May 20, 2020

srkgupta approved these changes May 21, 2020

View reviewed changes

fm2munsh added 2 commits May 21, 2020 11:41

Merge branch 'master' into MM-23937-group-mentions-e2e

4a2b525

Fix linting

d0dcaca

fmunshi added the CherryPick/Approved Meant for the quality or patch release tracked in the milestone label May 21, 2020

fmunshi merged commit 86fa2de into mattermost:master May 21, 2020

fmunshi deleted the MM-23937-group-mentions-e2e branch May 21, 2020 16:57

fmunshi self-assigned this May 21, 2020

fmunshi mentioned this pull request May 21, 2020

[MM-23937] [cherry-pick] Add e2e tests for group mentions (#5530) #5552

Merged

fmunshi 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 May 21, 2020

amyblais added Changelog/Not Needed Does not require a changelog entry Docs/Not Needed Does not require documentation and removed 2: Dev Review Requires review by a core commiter 3: QA Review Requires review by a QA tester labels May 21, 2020

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

[MM-23937] Add e2e tests for group mentions #5530

[MM-23937] Add e2e tests for group mentions #5530

fmunshi commented May 18, 2020

fmunshi May 18, 2020

saturninoabril left a comment

saturninoabril left a comment

srkgupta left a comment

srkgupta May 20, 2020

fmunshi May 20, 2020

srkgupta left a comment

mattermod commented May 21, 2020

[MM-23937] Add e2e tests for group mentions #5530

[MM-23937] Add e2e tests for group mentions #5530

Conversation

fmunshi commented May 18, 2020

Summary

To test whether a group mention is enabled the tests assert the following:

To test that a group mention is disabled the tests assert the following:

Ticket Link

fmunshi May 18, 2020

Choose a reason for hiding this comment

saturninoabril left a comment

Choose a reason for hiding this comment

saturninoabril left a comment

Choose a reason for hiding this comment

srkgupta left a comment

Choose a reason for hiding this comment

srkgupta May 20, 2020

Choose a reason for hiding this comment

fmunshi May 20, 2020

Choose a reason for hiding this comment

srkgupta left a comment

Choose a reason for hiding this comment

mattermod commented May 21, 2020