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

[MM-45448] Force electron processes to close after every test on Windows (#2207)

Browse Source
This commit is contained in:
Devin Binnie
2022-07-25 09:41:19 -04:00
committed by GitHub
parent 40c072981a
commit 821112c038
28 changed files with 118 additions and 339 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
e2e/modules/environment.js
View File

@@ -5,6 +5,8 @@
const fs = require('fs');
const ps = require('ps-node');
const path = require('path');
const {_electron: electron} = require('playwright');
@@ -119,6 +121,28 @@ module.exports = {
demoMattermostConfig,
cmdOrCtrl,
async clearElectronInstances() {
if (process.platform !== 'win32') {
return Promise.resolve();
}
return new Promise((resolve, reject) => {
ps.lookup({
command: 'electron',
}, (err, resultList) => {
if (err) {
reject(err);
}
resultList.forEach((process) => {
if (process && process.command === electronBinaryPath && !process.arguments.some((arg) => arg.includes('electron-mocha'))) {
ps.kill(process.pid);
}
});
resolve();
});
});
},
cleanTestConfig() {
[configFilePath, boundsInfoPath].forEach((file) => {
try {

1
e2e/specs/deep_linking/deeplink.test.js
View File

@@ -27,6 +27,7 @@ describe('application', function desc() {
// eslint-disable-next-line no-empty
} catch (err) {}
}
await env.clearElectronInstances();
});
if (process.platform === 'win32') {

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

@@ -58,6 +58,7 @@ describe('focus', function desc() {
if (this.app) {
await this.app.close();
}
await env.clearElectronInstances();
});
describe('Focus textbox tests', () => {

1
e2e/specs/linux_dark_mode.test.js
View File

@@ -28,6 +28,7 @@ describe('dark_mode', function desc() {
if (this.app) {
await this.app.close();
}
await env.clearElectronInstances();
});
if (process.platform === 'linux') {

1
e2e/specs/mattermost/back_button.test.js
View File

@@ -53,6 +53,7 @@ describe('back_button', function desc() {
if (this.app) {
await this.app.close();
}
await env.clearElectronInstances();
});
it('MM-T2633 Back button should behave as expected', async () => {

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

@@ -28,6 +28,7 @@ describe('copylink', function desc() {
if (this.app) {
await this.app.close();
}
await env.clearElectronInstances();
});
it('MM-T125 Copy Link can be used from channel LHS', async () => {

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

@@ -24,6 +24,7 @@ describe('menu_bar/dropdown', function desc() {
if (this.app) {
await this.app.close();
}
await env.clearElectronInstances();
});
it('MM-T4405 should set name of menu item from config file', async () => {

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

@@ -28,6 +28,7 @@ describe('edit_menu', function desc() {
if (this.app) {
await this.app.close();
}
await env.clearElectronInstances();
});
it('MM-T807 Undo in the Menu Bar', async () => {

1
e2e/specs/menu_bar/file_menu.test.js
View File

@@ -30,6 +30,7 @@ describe('file_menu/dropdown', function desc() {
if (this.app && skipAfterEach === false) {
await this.app.close();
}
await env.clearElectronInstances();
});
it('MM-T1313 Open Settings modal using keyboard shortcuts', async () => {

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

@@ -26,6 +26,7 @@ describe('history_menu', function desc() {
if (this.app) {
await this.app.close();
}
await env.clearElectronInstances();
});
it('Click back and forward from history', async () => {

1
e2e/specs/menu_bar/menu.test.js
View File

@@ -27,6 +27,7 @@ describe('menu/menu', function desc() {
if (this.app) {
await this.app.close();
}
await env.clearElectronInstances();
});
if (process.platform !== 'darwin') {

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

@@ -52,6 +52,7 @@ describe('menu/view', function desc() {
if (this.app) {
await this.app.close();
}
await env.clearElectronInstances();
});
it('MM-T813 Control+F should focus the search bar in Mattermost', async () => {

1
e2e/specs/menu_bar/window_menu.test.js
View File

@@ -57,6 +57,7 @@ describe('Menu/window_menu', function desc() {
if (this.app) {
await this.app.close();
}
await env.clearElectronInstances();
});
it('MM-T826 should switch to servers when keyboard shortcuts are pressed', async () => {

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

@@ -28,6 +28,7 @@ describe('popup', function desc() {
if (this.app) {
await this.app.close();
}
await env.clearElectronInstances();
});
// NOTE: These tests requires that the test server have the GitHub plugin configured

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

@@ -28,6 +28,7 @@ describe('copylink', function desc() {
if (this.app) {
await this.app.close();
}
await env.clearElectronInstances();
});
it('MM-T1308 Check that external links dont open in the app', async () => {

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

@@ -35,6 +35,7 @@ describe('Add Server Modal', function desc() {
if (this.app) {
await this.app.close();
}
await env.clearElectronInstances();
});
let newServerView;

1
e2e/specs/server_management/drag_and_drop.test.js
View File

@@ -52,6 +52,7 @@ describe('server_management/drag_and_drop', function desc() {
if (this.app) {
await this.app.close();
}
await env.clearElectronInstances();
});
it('MM-T2634 should be able to drag and drop servers in the dropdown menu', async () => {

1
e2e/specs/server_management/edit_server_modal.test.js
View File

@@ -34,6 +34,7 @@ describe('EditServerModal', function desc() {
if (this.app) {
await this.app.close();
}
await env.clearElectronInstances();
});
let editServerView;

1
e2e/specs/server_management/header.test.js
View File

@@ -23,6 +23,7 @@ describe('header', function desc() {
// eslint-disable-next-line no-empty
} catch (err) {}
}
await env.clearElectronInstances();
});
it('MM-T2637 Double-Clicking on the header should minimize/maximize the app', async () => {

1
e2e/specs/server_management/long_server_name.test.js
View File

@@ -38,6 +38,7 @@ describe('LongServerName', function desc() {
if (this.app) {
await this.app.close();
}
await env.clearElectronInstances();
});
let newServerView;

1
e2e/specs/server_management/remove_server_modal.test.js
View File

@@ -37,6 +37,7 @@ describe('RemoveServerModal', function desc() {
if (this.app) {
await this.app.close();
}
await env.clearElectronInstances();
});
let removeServerView;

1
e2e/specs/settings.test.js
View File

@@ -28,6 +28,7 @@ describe('Settings', function desc() {
if (this.app) {
await this.app.close();
}
await env.clearElectronInstances();
});
describe('Options', () => {

1
e2e/specs/settings/keyboard_shortcuts.test.js
View File

@@ -28,6 +28,7 @@ describe('settings/keyboard_shortcuts', function desc() {
if (this.app) {
await this.app.close();
}
await env.clearElectronInstances();
});
describe('MM-T1288 Manipulating Text', () => {

1
e2e/specs/startup/app.test.js
View File

@@ -21,6 +21,7 @@ describe('startup/app', function desc() {
if (this.app) {
await this.app.close();
}
await env.clearElectronInstances();
});
it('MM-T4399_1 should show the new server modal when no servers exist', async () => {

1
e2e/specs/startup/config.test.js
View File

@@ -22,6 +22,7 @@ describe('config', function desc() {
// eslint-disable-next-line no-empty
} catch (err) {}
}
await env.clearElectronInstances();
});
describe('MM-T4401 should show servers in dropdown when there is config file', async () => {

1
e2e/specs/startup/window.test.js
View File

@@ -22,6 +22,7 @@ describe('window', function desc() {
// eslint-disable-next-line no-empty
} catch (err) {}
}
await env.clearElectronInstances();
});
// TODO: this fails on Linux right now due to the window frame for some reason