libre-service.eu/pad.libre-service.eu-etherpad
libre-service.eu/pad.libre-service.eu-etherpad
1
0
Fork 0
mirror of https://github.com/ether/etherpad-lite.git synced 2025-01-31 19:02:59 +01:00
Code Issues Projects Releases Wiki Activity

new approach to limiting which browsers fire

Browse source
This commit is contained in:
John McLear 2021-02-07 10:30:19 +00:00
parent e28161a2d1
commit d2d3617bcc
4 changed files with 60 additions and 61 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
.github/workflows/frontend-admin-tests.yml vendored
View file

@ -51,4 +51,4 @@ jobs:
TRAVIS_JOB_NUMBER: ${{ github.run_id }}-${{ github.run_number }}-${{ github.job }}
GIT_HASH: ${{ steps.environment.outputs.sha_short }}
run: |
src/tests/frontend/travis/runner.sh
src/tests/frontend/travis/adminrunner.sh

6
src/tests/frontend/specs/adminplugins.js
View file

@ -33,8 +33,6 @@ describe('Plugins page', function () {
});
it('Attempt to Update a plugin', async function () {
// !IMPORTANT! We only run admin tests in one browser!
if (!/^((?!chrome|android).)*safari/i.test(navigator.userAgent)) this.skip();
this.timeout(120000);
if (helper.admin$('.ep_align').length === 0) this.skip();
@ -72,8 +70,6 @@ describe('Plugins page', function () {
// allow 50 seconds, check every 1 second.
});
it('Attempt to Install a plugin', async function () {
// !IMPORTANT! We only run admin tests in one browser!
if (!/^((?!chrome|android).)*safari/i.test(navigator.userAgent)) this.skip();
this.timeout(240000);
helper.admin$('#search-query').val('ep_activepads');
@ -96,8 +92,6 @@ describe('Plugins page', function () {
});
it('Attempt to Uninstall a plugin', async function () {
// !IMPORTANT! We only run admin tests in one browser!
if (!/^((?!chrome|android).)*safari/i.test(navigator.userAgent)) this.skip();
this.timeout(360000);
await helper.waitForPromise(
() => helper.admin$('.ep_activepads .do-uninstall').length !== 0, 120000);

6
src/tests/frontend/specs/adminsettings.js
View file

@ -20,9 +20,6 @@ describe('Admin > Settings', function () {
});
it('Are Settings visible, populated, does save work', async function () {
// !IMPORTANT! We only run admin tests in one browser!
if (!/^((?!chrome|android).)*safari/i.test(navigator.userAgent)) this.skip();
// save old value
const settings = helper.admin$('.settings').val();
const settingsLength = settings.length;
@ -60,9 +57,6 @@ describe('Admin > Settings', function () {
}
it('restart works', async function () {
// !IMPORTANT! We only run admin tests in one browser!
if (!/^((?!chrome|android).)*safari/i.test(navigator.userAgent)) this.skip();
// restarts
helper.admin$('#restartEtherpad').click();

11
src/tests/frontend/travis/remote_runner.js
View file

@ -10,6 +10,8 @@ const config = {
accessKey: process.env.SAUCE_ACCESS_KEY,
};
const isAdminRunner = process.argv[2] === 'admin';
let allTestsPassed = true;
// overwrite the default exit code
// in case not all worker can be run (due to saucelabs limits),
@ -126,6 +128,7 @@ const sauceTestWorker = async.queue((testSettings, callback) => {
});
}, 6); // run 6 tests in parrallel
if (!isAdminRunner) {
// 1) Firefox on Linux
sauceTestWorker.push({
platform: 'Windows 7',
@ -177,6 +180,14 @@ sauceTestWorker.push({
browserName: 'firefox',
version: '78.0',
});
} else {
// 4) Safari on OSX 10.14
sauceTestWorker.push({
platform: 'OS X 10.15',
browserName: 'safari',
version: '13.1',
});
}
sauceTestWorker.drain(() => {
process.exit(allTestsPassed ? 0 : 1);