toki/mattermost-mobile
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 1

Detox/E2E: Upgrade deps (#5821)

Browse source
This commit is contained in:
Joseph Baylon 2021-11-10 08:29:33 -08:00 committed by GitHub
parent ba0855659c
commit f89cd1f476
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
7 changed files with 1574 additions and 1554 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
detox/e2e/support/utils/email.js
View file

@ -30,7 +30,7 @@ export const getEmailResetEmailTemplate = (userEmail) => {
`Your email address for Mattermost has been changed to ${userEmail}.`,
'If you did not make this change, please contact the system administrator.',
'',
'To change your notification preferences, log in to your team site and go to Account Settings > Notifications.',
'To change your notification preferences, log in to your team site and go to Settings > Notifications.',
];
};
@ -85,7 +85,7 @@ export const getMentionEmailTemplate = (sender, message, postId, siteName, teamN
message,
'',
'Want to change your notifications settings?',
`Login to ${siteName} ( ${baseUrl} ) and go to Account Settings > Notifications`,
`Login to ${siteName} ( ${baseUrl} ) and go to Settings > Notifications`,
'',
'© 2021 Mattermost, Inc. 530 Lytton Avenue, Second floor, Palo Alto, CA, 94301',
];

42
detox/e2e/test/main_sidebar/main_sidebar.e2e.js
View file

@ -26,37 +26,21 @@ describe('Main Sidebar', () => {
switchTeamsButton,
} = MainSidebar;
let testChannel;
let testUser;
beforeAll(async () => {
const {user, channel} = await Setup.apiInit();
const {channel, user} = await Setup.apiInit();
testChannel = channel;
const {team: testOtherTeam} = await Team.apiCreateTeam();
await Team.apiAddUserToTeam(user.id, testOtherTeam.id);
testUser = user;
// # Open channel screen
await ChannelScreen.open(user);
await ChannelScreen.open(testUser);
});
afterAll(async () => {
await ChannelScreen.logout();
});
it('MM-T435 should not show switch teams button when jump to search is focused', async () => {
// # Open main sidebar
await openMainSidebar();
// # Tap on search input
await expect(switchTeamsButton).toBeVisible();
await searchInput.tap();
// * Verify switch teams button is not visible
await expect(switchTeamsButton).not.toBeVisible();
// # Go back to channel
await closeMainSidebar();
});
it('MM-T3412 should close the sidebar menu when selecting the same channel', async () => {
// # Go to unread channel
await goToChannel(testChannel.display_name);
@ -70,4 +54,22 @@ describe('Main Sidebar', () => {
// * Selected channel should remain the same
await expect(channelNavBarTitle).toHaveText(testChannel.display_name);
});
it('MM-T435 should not show switch teams button when jump to search is focused', async () => {
const {team: testOtherTeam} = await Team.apiCreateTeam();
await Team.apiAddUserToTeam(testUser.id, testOtherTeam.id);
// # Open main sidebar
await openMainSidebar();
// # Tap on search input
await expect(switchTeamsButton).toBeVisible();
await searchInput.tap();
// * Verify switch teams button is not visible
await expect(switchTeamsButton).not.toBeVisible();
// # Go back to channel
await closeMainSidebar();
});
});

2
detox/e2e/test/messaging/mark_as_unread.e2e.js
View file

@ -132,7 +132,7 @@ describe('Mark as Unread', () => {
await closeMainSidebar();
});
it('MM-T245 should be able to mark a DM post as unread', async () => {
it('MM-T1280 should be able to mark a DM post as unread', async () => {
const {user: dmOtherUser} = await User.apiCreateUser();
await Team.apiAddUserToTeam(dmOtherUser.id, testTeam1.id);
const {channel: directMessageChannel} = await Channel.apiCreateDirectChannel([testUser.id, dmOtherUser.id]);

3044
detox/package-lock.json generated
View file

File diff suppressed because it is too large Load diff

20
detox/package.json
View file

@ -4,20 +4,20 @@
"repository": "git@github.com:mattermost/mattermost-mobile.git",
"author": "Mattermost, Inc.",
"devDependencies": {
"@babel/plugin-proposal-class-properties": "7.14.5",
"@babel/plugin-transform-modules-commonjs": "7.15.4",
"@babel/plugin-transform-runtime": "7.15.8",
"@babel/preset-env": "7.15.8",
"axios": "0.23.0",
"babel-jest": "27.2.5",
"@babel/plugin-proposal-class-properties": "7.16.0",
"@babel/plugin-transform-modules-commonjs": "7.16.0",
"@babel/plugin-transform-runtime": "7.16.0",
"@babel/preset-env": "7.16.0",
"axios": "0.24.0",
"babel-jest": "27.3.1",
"babel-plugin-module-resolver": "4.1.0",
"client-oauth2": "github:larkox/js-client-oauth2#e24e2eb5dfcbbbb3a59d095e831dbe0012b0ac49",
"deepmerge": "4.2.2",
"detox": "18.22.2",
"detox": "19.0.0",
"form-data": "4.0.0",
"jest": "27.2.5",
"jest-circus": "27.2.5",
"jest-cli": "27.2.5",
"jest": "27.3.1",
"jest-circus": "27.3.1",
"jest-cli": "27.3.1",
"jest-html-reporters": "2.1.6",
"jest-junit": "13.0.0",
"sanitize-filename": "1.6.3",

14
package-lock.json generated
View file

@ -133,7 +133,7 @@
"babel-plugin-module-resolver": "4.1.0",
"babel-plugin-transform-remove-console": "6.9.4",
"deep-freeze": "0.0.1",
"detox": "18.22.2",
"detox": "19.0.0",
"enzyme": "3.11.0",
"enzyme-adapter-react-16": "1.15.6",
"enzyme-to-json": "3.6.2",
@ -11615,9 +11615,9 @@
"dev": true
},
"node_modules/detox": {
"version": "18.22.2",
"resolved": "https://registry.npmjs.org/detox/-/detox-18.22.2.tgz",
"integrity": "sha512-1E8tP80O96a2jUxUSvPzjGprKkdv7IHKx++YiSf+yqMcqSQzeDEkFSQV3Idp9iPRYe/A3TnZhT1fXTQKfdNwPA==",
"version": "19.0.0",
"resolved": "https://registry.npmjs.org/detox/-/detox-19.0.0.tgz",
"integrity": "sha512-lHV0aEYKBSIKmTxrE68AbDBWg02jyhPdNSxsg7OS2x/EBNpzt21AaEvkZMabPwcp90zwNmomQLML+HNbVGhtmQ==",
"dev": true,
"hasInstallScript": true,
"dependencies": {
@ -42397,9 +42397,9 @@
}
},
"detox": {
"version": "18.22.2",
"resolved": "https://registry.npmjs.org/detox/-/detox-18.22.2.tgz",
"integrity": "sha512-1E8tP80O96a2jUxUSvPzjGprKkdv7IHKx++YiSf+yqMcqSQzeDEkFSQV3Idp9iPRYe/A3TnZhT1fXTQKfdNwPA==",
"version": "19.0.0",
"resolved": "https://registry.npmjs.org/detox/-/detox-19.0.0.tgz",
"integrity": "sha512-lHV0aEYKBSIKmTxrE68AbDBWg02jyhPdNSxsg7OS2x/EBNpzt21AaEvkZMabPwcp90zwNmomQLML+HNbVGhtmQ==",
"dev": true,
"requires": {
"bunyan": "^1.8.12",

2
package.json
View file

@ -131,7 +131,7 @@
"babel-plugin-module-resolver": "4.1.0",
"babel-plugin-transform-remove-console": "6.9.4",
"deep-freeze": "0.0.1",
"detox": "18.22.2",
"detox": "19.0.0",
"enzyme": "3.11.0",
"enzyme-adapter-react-16": "1.15.6",
"enzyme-to-json": "3.6.2",