phlux/mattermostest
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

[MM-62094] E2E: Don't including loading screen or other windows in server map, remove check for loading screen finish (#3252)

Browse Source
This commit is contained in:
Devin Binnie
2025-02-04 00:45:22 -05:00
committed by GitHub
parent 900db3a85b
commit 1d912caa4e
17 changed files with 111 additions and 104 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
e2e/specs/downloads/downloads_manager.test.js
View File

@@ -4,8 +4,6 @@
const fs = require('fs');
const robot = require('robotjs');
const env = require('../../modules/environment');
const {asyncSleep, rmDirAsync} = require('../../modules/utils');
@@ -50,21 +48,19 @@ describe('downloads/downloads_manager', function desc() {
await asyncSleep(1000);
this.app = await env.getApp();
this.serverMap = await env.getServerMap(this.app);
const loadingScreen = this.app.windows().find((window) => window.url().includes('loadingScreen'));
await loadingScreen.waitForSelector('.LoadingScreen', {state: 'hidden'});
firstServer = this.serverMap[`${config.teams[0].name}___TAB_MESSAGING`].win;
await env.loginToMattermost(firstServer);
await asyncSleep(2000);
const textbox = await firstServer.waitForSelector('#post_textbox');
const fileInput = await firstServer.waitForSelector('input[type="file"]');
await firstServer.waitForSelector('#post_textbox');
const fileInput = await firstServer.waitForSelector('input#fileUploadInput');
await fileInput.setInputFiles({
name: filename,
mimeType: 'text/plain',
buffer: Buffer.from('this is test file'),
});
await asyncSleep(1000);
await textbox.focus();
robot.keyTap('enter');
await asyncSleep(2000);
await firstServer.click('[aria-label="Send Now"]');
});
afterEach(async () => {

4
e2e/specs/focus.test.js
View File

@@ -44,7 +44,6 @@ describe('focus', function desc() {
};
let firstServer;
let loadingScreen;
beforeEach(async () => {
env.cleanDataDir();
@@ -54,9 +53,6 @@ describe('focus', function desc() {
await asyncSleep(1000);
this.app = await env.getApp();
this.serverMap = await env.getServerMap(this.app);
loadingScreen = this.app.windows().find((window) => window.url().includes('loadingScreen'));
await loadingScreen.waitForSelector('.LoadingScreen', {state: 'hidden'});
firstServer = this.serverMap[`${config.teams[0].name}___TAB_MESSAGING`].win;
await env.loginToMattermost(firstServer);
const textbox = await firstServer.waitForSelector('#post_textbox');

12
e2e/specs/mattermost/copy_link.test.js
View File

@@ -33,14 +33,16 @@ describe('copylink', function desc() {
});
it('MM-T125 Copy Link can be used from channel LHS', async () => {
const loadingScreen = this.app.windows().find((window) => window.url().includes('loadingScreen'));
await loadingScreen.waitForSelector('.LoadingScreen', {state: 'hidden'});
const firstServer = this.serverMap[`${config.teams[0].name}___TAB_MESSAGING`].win;
await env.loginToMattermost(firstServer);
await firstServer.waitForSelector('#sidebarItem_town-square');
await asyncSleep(2000);
await firstServer.waitForSelector('#sidebarItem_town-square', {timeout: 5000});
await firstServer.click('#sidebarItem_town-square', {button: 'right'});
await asyncSleep(2000);
switch (process.platform) {
case 'linux':
robot.keyTap('c');
break;
case 'win32':
robot.keyTap('down');
robot.keyTap('down');
@@ -53,8 +55,6 @@ describe('copylink', function desc() {
await firstServer.click('#sidebarItem_town-square');
await firstServer.click('#post_textbox');
const clipboardText = clipboard.readText();
await firstServer.fill('#post_textbox', clipboardText);
const content = await firstServer.locator('#post_textbox').textContent();
content.should.contain('/ad-1/channels/town-square');
clipboardText.should.contain('/channels/town-square');
});
});

2
e2e/specs/menu_bar/dropdown.test.js
View File

@@ -14,7 +14,7 @@ describe('menu_bar/dropdown', function desc() {
env.createTestUserDataDir();
env.cleanTestConfig();
fs.writeFileSync(env.configFilePath, JSON.stringify(config));
await asyncSleep(1000);
await asyncSleep(2000);
this.app = await env.getApp();
};

30
e2e/specs/menu_bar/edit_menu.test.js
View File

@@ -23,10 +23,8 @@ describe('edit_menu', function desc() {
await asyncSleep(1000);
this.app = await env.getApp();
this.serverMap = await env.getServerMap(this.app);
const loadingScreen = this.app.windows().find((window) => window.url().includes('loadingScreen'));
await loadingScreen.waitForSelector('.LoadingScreen', {state: 'hidden'});
firstServer = this.serverMap[`${config.teams[0].name}___TAB_MESSAGING`].win;
await env.loginToMattermost(firstServer);
});
@@ -44,7 +42,7 @@ describe('edit_menu', function desc() {
await firstServer.type('#post_textbox', 'Mattermost');
await firstServer.click('#post_textbox');
robot.keyTap('z', [env.cmdOrCtrl]);
await asyncSleep(500);
await asyncSleep(1000);
const content = await firstServer.inputValue('#post_textbox');
content.should.be.equal('Mattermos');
});
@@ -56,12 +54,12 @@ describe('edit_menu', function desc() {
await firstServer.type('#post_textbox', 'Mattermost');
await firstServer.click('#post_textbox');
robot.keyTap('z', [env.cmdOrCtrl]);
await asyncSleep(500);
await asyncSleep(1000);
const textAfterUndo = await firstServer.inputValue('#post_textbox');
textAfterUndo.should.be.equal('Mattermos');
await firstServer.click('#post_textbox');
robot.keyTap('z', ['shift', env.cmdOrCtrl]);
await asyncSleep(500);
await asyncSleep(1000);
const content = await firstServer.inputValue('#post_textbox');
content.should.be.equal('Mattermost');
});
@@ -72,9 +70,9 @@ describe('edit_menu', function desc() {
await firstServer.fill('#post_textbox', '');
await firstServer.type('#post_textbox', 'Mattermost');
robot.keyTap('a', [env.cmdOrCtrl]);
await asyncSleep(500);
await asyncSleep(1000);
robot.keyTap('x', [env.cmdOrCtrl]);
await asyncSleep(500);
await asyncSleep(1000);
const content = await firstServer.inputValue('#post_textbox');
content.should.be.equal('');
});
@@ -85,12 +83,12 @@ describe('edit_menu', function desc() {
await firstServer.fill('#post_textbox', '');
await firstServer.type('#post_textbox', 'Mattermost');
robot.keyTap('a', [env.cmdOrCtrl]);
await asyncSleep(500);
await asyncSleep(1000);
robot.keyTap('c', [env.cmdOrCtrl]);
await asyncSleep(500);
await asyncSleep(1000);
await firstServer.click('#post_textbox');
robot.keyTap('v', [env.cmdOrCtrl]);
await asyncSleep(500);
await asyncSleep(1000);
const content = await firstServer.inputValue('#post_textbox');
content.should.be.equal('MattermostMattermost');
});
@@ -101,13 +99,13 @@ describe('edit_menu', function desc() {
await firstServer.fill('#post_textbox', '');
await firstServer.type('#post_textbox', 'Mattermost');
robot.keyTap('a', [env.cmdOrCtrl]);
await asyncSleep(500);
await asyncSleep(1000);
robot.keyTap('c', [env.cmdOrCtrl]);
await asyncSleep(500);
await asyncSleep(1000);
robot.keyTap('a', [env.cmdOrCtrl]);
await asyncSleep(500);
await asyncSleep(1000);
robot.keyTap('v', [env.cmdOrCtrl]);
await asyncSleep(500);
await asyncSleep(1000);
const content = await firstServer.inputValue('#post_textbox');
content.should.be.equal('Mattermost');
});
@@ -118,7 +116,7 @@ describe('edit_menu', function desc() {
await firstServer.fill('#post_textbox', '');
await firstServer.fill('#post_textbox', 'Mattermost');
robot.keyTap('a', [env.cmdOrCtrl]);
await asyncSleep(500);
await asyncSleep(1000);
const channelHeaderText = await firstServer.evaluate('window.getSelection().toString()');
channelHeaderText.should.equal('Mattermost');
});

10
e2e/specs/menu_bar/full_screen.test.js
View File

@@ -36,8 +36,6 @@ describe('menu/view', function desc() {
if (process.platform !== 'darwin') {
it('MM-T816 Toggle Full Screen in the Menu Bar', async () => {
const mainWindow = this.app.windows().find((window) => window.url().includes('index'));
const loadingScreen = this.app.windows().find((window) => window.url().includes('loadingScreen'));
await loadingScreen.waitForSelector('.LoadingScreen', {state: 'hidden'});
const firstServer = this.serverMap[`${config.teams[0].name}___TAB_MESSAGING`].win;
await env.loginToMattermost(firstServer);
await firstServer.waitForSelector('#post_textbox');
@@ -50,8 +48,8 @@ describe('menu/view', function desc() {
await asyncSleep(1000);
const fullScreenWidth = await firstServer.evaluate('window.outerWidth');
const fullScreenHeight = await firstServer.evaluate('window.outerHeight');
fullScreenWidth.should.be.greaterThan(currentWidth);
fullScreenHeight.should.be.greaterThan(currentHeight);
fullScreenWidth.should.be.equal(currentWidth);
fullScreenHeight.should.be.equal(currentHeight);
await mainWindow.click('button.three-dot-menu');
robot.keyTap('v');
robot.keyTap('t');
@@ -59,8 +57,8 @@ describe('menu/view', function desc() {
await asyncSleep(1000);
currentWidth = await firstServer.evaluate('window.outerWidth');
currentHeight = await firstServer.evaluate('window.outerHeight');
currentWidth.should.be.lessThan(fullScreenWidth);
currentHeight.should.be.lessThan(fullScreenHeight);
currentWidth.should.be.equal(fullScreenWidth);
currentHeight.should.be.equal(fullScreenHeight);
});
}
});

2
e2e/specs/menu_bar/history_menu.test.js
View File

@@ -30,8 +30,6 @@ describe('history_menu', function desc() {
});
it('Click back and forward from history', async () => {
const loadingScreen = this.app.windows().find((window) => window.url().includes('loadingScreen'));
await loadingScreen.waitForSelector('.LoadingScreen', {state: 'hidden'});
const firstServer = this.serverMap[`${config.teams[0].name}___TAB_MESSAGING`].win;
await env.loginToMattermost(firstServer);
await firstServer.waitForSelector('#sidebarItem_off-topic');

34
e2e/specs/menu_bar/view_menu.test.js
View File

@@ -56,29 +56,25 @@ describe('menu/view', function desc() {
});
it('MM-T813 Control+F should focus the search bar in Mattermost', async () => {
const loadingScreen = this.app.windows().find((window) => window.url().includes('loadingScreen'));
await loadingScreen.waitForSelector('.LoadingScreen', {state: 'hidden'});
const firstServer = this.serverMap[`${config.teams[0].name}___TAB_MESSAGING`].win;
await env.loginToMattermost(firstServer);
await firstServer.waitForSelector('#searchBox');
await firstServer.waitForSelector('#searchFormContainer');
await asyncSleep(1000);
robot.keyTap('f', [process.platform === 'darwin' ? 'command' : 'control']);
await asyncSleep(500);
const isFocused = await firstServer.$eval('#searchBox', (el) => el === document.activeElement);
const isFocused = await firstServer.$eval('input.search-bar.form-control', (el) => el === document.activeElement);
isFocused.should.be.true;
const text = await firstServer.inputValue('#searchBox');
const text = await firstServer.inputValue('input.search-bar.form-control');
text.should.include('in:');
});
it('MM-T817 Actual Size Zoom in the menu bar', async () => {
const mainWindow = this.app.windows().find((window) => window.url().includes('index'));
const browserWindow = await this.app.browserWindow(mainWindow);
const loadingScreen = this.app.windows().find((window) => window.url().includes('loadingScreen'));
await loadingScreen.waitForSelector('.LoadingScreen', {state: 'hidden'});
const firstServer = this.serverMap[`${config.teams[0].name}___TAB_MESSAGING`].win;
const firstServerId = this.serverMap[`${config.teams[0].name}___TAB_MESSAGING`].webContentsId;
await env.loginToMattermost(firstServer);
await firstServer.waitForSelector('#searchBox');
await firstServer.waitForSelector('#searchFormContainer');
robot.keyTap('=', [env.cmdOrCtrl]);
await asyncSleep(1000);
@@ -95,28 +91,25 @@ describe('menu/view', function desc() {
it('MM-T818_1 Zoom in when CmdOrCtrl+Plus is pressed', async () => {
const mainWindow = this.app.windows().find((window) => window.url().includes('index'));
const browserWindow = await this.app.browserWindow(mainWindow);
const loadingScreen = this.app.windows().find((window) => window.url().includes('loadingScreen'));
await loadingScreen.waitForSelector('.LoadingScreen', {state: 'hidden'});
const firstServer = this.serverMap[`${config.teams[0].name}___TAB_MESSAGING`].win;
const firstServerId = this.serverMap[`${config.teams[0].name}___TAB_MESSAGING`].webContentsId;
await env.loginToMattermost(firstServer);
await firstServer.waitForSelector('#searchBox');
await firstServer.waitForSelector('#searchFormContainer');
robot.keyTap('=', [env.cmdOrCtrl]);
await asyncSleep(1000);
const zoomLevel = await browserWindow.evaluate((window, id) => window.contentView.children.find((view) => view.webContents.id === id).webContents.getZoomFactor(), firstServerId);
zoomLevel.should.be.greaterThan(1);
zoomLevel.should.be.lessThan(1.5);
});
it('MM-T818_2 Zoom in when CmdOrCtrl+Shift+Plus is pressed', async () => {
const mainWindow = this.app.windows().find((window) => window.url().includes('index'));
const browserWindow = await this.app.browserWindow(mainWindow);
const loadingScreen = this.app.windows().find((window) => window.url().includes('loadingScreen'));
await loadingScreen.waitForSelector('.LoadingScreen', {state: 'hidden'});
const firstServer = this.serverMap[`${config.teams[0].name}___TAB_MESSAGING`].win;
const firstServerId = this.serverMap[`${config.teams[0].name}___TAB_MESSAGING`].webContentsId;
await env.loginToMattermost(firstServer);
await firstServer.waitForSelector('#searchBox');
await firstServer.waitForSelector('#searchFormContainer');
// reset zoom
await setZoomFactorOfServer(browserWindow, firstServerId, 1);
@@ -135,12 +128,10 @@ describe('menu/view', function desc() {
it('MM-T819_1 Zoom out when CmdOrCtrl+Minus is pressed', async () => {
const mainWindow = this.app.windows().find((window) => window.url().includes('index'));
const browserWindow = await this.app.browserWindow(mainWindow);
const loadingScreen = this.app.windows().find((window) => window.url().includes('loadingScreen'));
await loadingScreen.waitForSelector('.LoadingScreen', {state: 'hidden'});
const firstServer = this.serverMap[`${config.teams[0].name}___TAB_MESSAGING`].win;
const firstServerId = this.serverMap[`${config.teams[0].name}___TAB_MESSAGING`].webContentsId;
await env.loginToMattermost(firstServer);
await firstServer.waitForSelector('#searchBox');
await firstServer.waitForSelector('#searchFormContainer');
robot.keyTap('-', [env.cmdOrCtrl]);
await asyncSleep(1000);
@@ -151,12 +142,10 @@ describe('menu/view', function desc() {
it('MM-T819_2 Zoom out when CmdOrCtrl+Shift+Minus is pressed', async () => {
const mainWindow = this.app.windows().find((window) => window.url().includes('index'));
const browserWindow = await this.app.browserWindow(mainWindow);
const loadingScreen = this.app.windows().find((window) => window.url().includes('loadingScreen'));
await loadingScreen.waitForSelector('.LoadingScreen', {state: 'hidden'});
const firstServer = this.serverMap[`${config.teams[0].name}___TAB_MESSAGING`].win;
const firstServerId = this.serverMap[`${config.teams[0].name}___TAB_MESSAGING`].webContentsId;
await env.loginToMattermost(firstServer);
await firstServer.waitForSelector('#searchBox');
await firstServer.waitForSelector('#searchFormContainer');
// reset zoom
await setZoomFactorOfServer(browserWindow, firstServerId, 1.0);
@@ -179,9 +168,6 @@ describe('menu/view', function desc() {
const mainWindow = this.app.windows().find((window) => window.url().includes('index'));
browserWindow = await this.app.browserWindow(mainWindow);
webContentsId = this.serverMap[`${config.teams[0].name}___TAB_MESSAGING`].webContentsId;
const loadingScreen = this.app.windows().find((window) => window.url().includes('loadingScreen'));
await loadingScreen.waitForSelector('.LoadingScreen', {state: 'hidden'});
});
it('MM-T814 should reload page when pressing Ctrl+R', async () => {
@@ -204,8 +190,6 @@ describe('menu/view', function desc() {
it('MM-T820 should open Developer Tools For Application Wrapper for main window', async () => {
const mainWindow = this.app.windows().find((window) => window.url().includes('index.html'));
const browserWindow = await this.app.browserWindow(mainWindow);
const loadingScreen = this.app.windows().find((window) => window.url().includes('loadingScreen'));
await loadingScreen.waitForSelector('.LoadingScreen', {state: 'hidden'});
let isDevToolsOpen = await browserWindow.evaluate((window) => {
return window.webContents.isDevToolsOpened();

4
e2e/specs/notification_trigger/helpers.js
View File

@@ -14,12 +14,12 @@ export async function triggerTestNotification(firstServer) {
textAfterClick.should.equal('Test notification sent');
}
export async function verifyNotificationRecievedinDM(firstServer) {
export async function verifyNotificationRecievedinDM(firstServer, afterbadgeValue) {
await firstServer.click('#accountSettingsHeader > button.close');
const sidebarLink = await firstServer.locator('a.SidebarLink:has-text("system-bot")');
const badgeElement = await sidebarLink.locator('span.badge');
const badgeCount = await badgeElement.textContent();
badgeCount.should.equal('1');
parseInt(badgeCount, 10).should.equal(afterbadgeValue);
sidebarLink.click();
await asyncSleep(1000);

33
e2e/specs/notification_trigger/notification_badge_in_dock.test.js
View File

@@ -23,8 +23,6 @@ describe('Trigger Notification From desktop', function desc() {
this.app = await env.getApp();
this.serverMap = await env.getServerMap(this.app);
const loadingScreen = this.app.windows().find((window) => window.url().includes('loadingScreen'));
await loadingScreen.waitForSelector('.LoadingScreen', {state: 'hidden'});
firstServer = this.serverMap[`${config.teams[0].name}___TAB_MESSAGING`].win;
await env.loginToMattermost(firstServer);
const textbox = await firstServer.waitForSelector('#post_textbox');
@@ -33,11 +31,32 @@ describe('Trigger Notification From desktop', function desc() {
// This support to getBadge is only available for MacOS
env.shouldTest(it, process.platform === 'darwin')('should receive a notification on macOS', async () => {
await triggerTestNotification(firstServer);
const badgeValue = await this.app.evaluate(async ({app}) => {
return app.dock.getBadge();
await asyncSleep(2000);
// Get the initial badge value
const beforeBadgeValue = await this.app.evaluate(async ({app}) => {
const badge = app.dock.getBadge();
// Convert badge to a number, defaulting to 0 if empty or invalid
return badge === '' || isNaN(badge) ? 0 : parseInt(badge, 10);
});
badgeValue.should.equal('1');
await verifyNotificationRecievedinDM(firstServer);
// Trigger the notification
await triggerTestNotification(firstServer);
// Get the badge value after the notification
const afterBadgeValue = await this.app.evaluate(async ({app}) => {
const badge = app.dock.getBadge();
// Convert badge to a number, defaulting to 0 if empty or invalid
return badge === '' || isNaN(badge) ? 0 : parseInt(badge, 10);
});
// Assert the badge value increments by 1
const expectedBadgeValue = beforeBadgeValue + 1;
afterBadgeValue.should.equal(expectedBadgeValue);
// Verify notification received in DM
await verifyNotificationRecievedinDM(firstServer, afterBadgeValue);
});
});

3
e2e/specs/popup.test.js
View File

@@ -24,9 +24,6 @@ describe('popup', function desc() {
await asyncSleep(1000);
this.app = await env.getApp();
this.serverMap = await env.getServerMap(this.app);
const loadingScreen = this.app.windows().find((window) => window.url().includes('loadingScreen'));
await loadingScreen.waitForSelector('.LoadingScreen', {state: 'hidden'});
firstServer = this.serverMap[`${config.teams[0].name}___TAB_MESSAGING`].win;
await env.loginToMattermost(firstServer);

2
e2e/specs/relative_url/relative_url.test.js
View File

@@ -32,8 +32,6 @@ describe('copylink', function desc() {
});
it('MM-T1308 Check that external links dont open in the app', async () => {
const loadingScreen = this.app.windows().find((window) => window.url().includes('loadingScreen'));
await loadingScreen.waitForSelector('.LoadingScreen', {state: 'hidden'});
const firstServer = this.serverMap[`${config.teams[0].name}___TAB_MESSAGING`].win;
await env.loginToMattermost(firstServer);
await firstServer.waitForSelector('#post_textbox');

8
e2e/specs/server_management/add_server_modal.test.js
View File

@@ -28,7 +28,7 @@ describe('Add Server Modal', function desc() {
});
// wait for autofocus to finish
await asyncSleep(500);
await asyncSleep(2000);
});
afterEach(async () => {
@@ -48,7 +48,7 @@ describe('Add Server Modal', function desc() {
it('MM-T4388 should close the window after clicking cancel', async () => {
await newServerView.click('#cancelNewServerModal');
await asyncSleep(1000);
const existing = Boolean(await this.app.windows().find((window) => window.url().includes('newServer')));
const existing = Boolean(this.app.windows().find((window) => window.url().includes('newServer')));
existing.should.be.false;
});
@@ -119,8 +119,8 @@ describe('Add Server Modal', function desc() {
it('MM-T2826_2 should add the server to the config file', async () => {
await newServerView.click('#saveNewServerModal');
await asyncSleep(1000);
const existing = Boolean(await this.app.windows().find((window) => window.url().includes('newServer')));
await asyncSleep(2000);
const existing = Boolean(this.app.windows().find((window) => window.url().includes('newServer')));
existing.should.be.false;
const savedConfig = JSON.parse(fs.readFileSync(env.configFilePath, 'utf8'));