This repository has been archived by the owner on Mar 13, 2024. It is now read-only.
Fix E2E flaky tests #2996
Next
Next commit
Fix flaky some of the E2E tests
- Loading branch information
commit d4a61e8cc2bb402372b0394afd5a5d5be4e45b67
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -7,8 +7,18 @@ | |
| // - Use element ID when selecting an element. Create one if none. | ||
| // *************************************************************** | ||
|
|
||
| /* eslint max-nested-callbacks: ["error", 4] */ | ||
|
|
||
| let config; | ||
|
|
||
| describe('Signup Email page', () => { | ||
| before(() => { | ||
| cy.apiGetConfig().then((response) => { | ||
| config = response.body; | ||
| }); | ||
| cy.apiLogout(); | ||
|
|
||
| // # Go to login page | ||
saturninoabril marked this conversation as resolved.
Show resolved
Hide resolved
|
||
| // # Go to signup email page | ||
| cy.visit('/signup_email'); | ||
| }); | ||
|
|
@@ -18,7 +28,7 @@ describe('Signup Email page', () => { | |
| cy.get('#signup_email_section').should('be.visible'); | ||
|
|
||
| // * Check the title | ||
| cy.title().should('include', config.TeamSettings.SiteName); | ||
| }); | ||
|
|
||
| it('should match elements, back button', () => { | ||
|
|
@@ -32,7 +42,7 @@ describe('Signup Email page', () => { | |
| it('should match elements, body', () => { | ||
| // * Check elements in the body | ||
| cy.get('#signup_email_section').should('be.visible'); | ||
| cy.get('#site_name').should('contain', config.TeamSettings.SiteName); | ||
| cy.get('#site_description').should('contain', 'All team communication in one place, searchable and accessible anywhere'); | ||
| cy.get('#create_account').should('contain', 'Let\'s create your account'); | ||
| cy.get('#signin_account').should('contain', 'Already have an account?'); | ||
|
|
@@ -56,8 +66,8 @@ describe('Signup Email page', () => { | |
| cy.get('#createAccountButton').should('contain', 'Create Account'); | ||
|
|
||
| cy.get('#signup_agreement').should('contain', 'By proceeding to create your account and use Mattermost, you agree to our Terms of Service and Privacy Policy. If you do not agree, you cannot use Mattermost.'); | ||
| cy.get(`#signup_agreement > span > [href="${config.SupportSettings.TermsOfServiceLink}"]`).should('be.visible'); | ||
| cy.get(`#signup_agreement > span > [href="${config.SupportSettings.PrivacyPolicyLink}"]`).should('be.visible'); | ||
| }); | ||
|
|
||
| it('should match elements, footer', () => { | ||
|
|
@@ -67,12 +77,12 @@ describe('Signup Email page', () => { | |
| cy.get('#copyright').should('contain', '© 2015-'); | ||
| cy.get('#copyright').should('contain', 'Mattermost, Inc.'); | ||
| cy.get('#about_link').should('contain', 'About'); | ||
| cy.get('#about_link').should('have.attr', 'href', config.SupportSettings.AboutLink); | ||
| cy.get('#privacy_link').should('contain', 'Privacy'); | ||
| cy.get('#privacy_link').should('have.attr', 'href', config.SupportSettings.PrivacyPolicyLink); | ||
| cy.get('#terms_link').should('contain', 'Terms'); | ||
| cy.get('#terms_link').should('have.attr', 'href', config.SupportSettings.TermsOfServiceLink); | ||
| cy.get('#help_link').should('contain', 'Help'); | ||
| cy.get('#help_link').should('have.attr', 'href', config.SupportSettings.HelpLink); | ||
|
There was a problem hiding this comment. This is failing since cypress server has different config for |
||
| }); | ||
| }); | ||
.png){kind=link}
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,35 +1,40 @@ | ||
| // Copyright (c) 2015-present Mattermost, Inc. All Rights Reserved. | ||
| // See LICENSE.txt for license information. | ||
|
|
||
| const axios = require('axios'); | ||
|
|
||
| const cypressConfig = require('../../cypress.json'); | ||
|
|
||
| module.exports = async ({sender, message, channelId, createAt = 0}) => { | ||
| const loginResponse = await axios({ | ||
| url: `${cypressConfig.baseUrl}/api/v4/users/login`, | ||
| headers: {'X-Requested-With': 'XMLHttpRequest'}, | ||
| method: 'post', | ||
| data: {login_id: sender.username, password: sender.password}, | ||
| }); | ||
|
|
||
| const setCookie = loginResponse.headers['set-cookie']; | ||
| let cookieString = ''; | ||
| setCookie.forEach((cookie) => { | ||
| const nameAndValue = cookie.split(';')[0]; | ||
| cookieString += nameAndValue + ';'; | ||
| }); | ||
|
|
||
| const response = await axios({ | ||
| url: `${cypressConfig.baseUrl}/api/v4/posts`, | ||
| headers: { | ||
| 'Content-Type': 'application/json', | ||
| 'X-Requested-With': 'XMLHttpRequest', | ||
| Cookie: cookieString, | ||
| }, | ||
| method: 'post', | ||
| data: { | ||
| channel_id: channelId, | ||
| message, | ||
| type: '', | ||
| create_at: createAt, | ||
| }, | ||
| }); | ||
|
|
||
| return {status: response.status, data: response.data, error: response.error}; | ||
|
There was a problem hiding this comment. Not totally sure why postMessageAs is not working as expected. I just removed the use of There was a problem hiding this comment. mattermost-redux changes perhaps? I haven't looked at recent commits, but I think it's totally fine for us to use the API directly, ultimately that's what the client is doing. This way we have more control over the requests as well. 👍 There was a problem hiding this comment. I don't think so as the current mattermost-redux is working locally but let's eliminate potential issue by going thru API call directly. |
||
| }; | ||
.png){kind=link}
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
nit: update the correct usage of
cy.postMessagewhere the text param don't need to add{enter}since the command itself is doing it already.