mirrors/etherpad-lite
1
0
Fork 0
mirror of https://github.com/ether/etherpad-lite.git synced 2025-04-23 00:46:16 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions 9

timeouts and dont run plugin tests

Browse source
This commit is contained in:
John McLear 2021-02-07 10:08:06 +00:00
parent d05671fcf2
commit e28161a2d1
2 changed files with 7 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -26,6 +26,10 @@ jobs:
- name: Install etherpad plugins - name: Install etherpad plugins
run: npm install ep_align@0.2.27 run: npm install ep_align@0.2.27
# Nuke plugin tests
- name: Install etherpad plugins
run: rm -Rf node_modules/ep_align/static/tests/*
- name: export GIT_HASH to env - name: export GIT_HASH to env
id: environment id: environment
run: echo "::set-output name=sha_short::$(git rev-parse --short ${{ github.sha }})" run: echo "::set-output name=sha_short::$(git rev-parse --short ${{ github.sha }})"

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

@ -1,7 +1,7 @@
'use strict'; 'use strict';
describe('Admin > Settings', function () { describe('Admin > Settings', function () {
this.timeout(360000); this.timeout(480000);
before(async function () { before(async function () {
let success = false; let success = false;
@ -51,7 +51,7 @@ describe('Admin > Settings', function () {
// settings should have the old value // settings should have the old value
helper.newAdmin('settings'); helper.newAdmin('settings');
await helper.waitForPromise( await helper.waitForPromise(
() => helper.admin$ && helper.admin$('.settings').val().length > 0, 18000); () => helper.admin$ && helper.admin$('.settings').val().length > 0, 36000);
expect(settings).to.be(helper.admin$('.settings').val()); expect(settings).to.be(helper.admin$('.settings').val());
}); });
@ -67,7 +67,7 @@ describe('Admin > Settings', function () {
helper.admin$('#restartEtherpad').click(); helper.admin$('#restartEtherpad').click();
// Hacky... Other suggestions welcome.. // Hacky... Other suggestions welcome..
await timeout(50000); await timeout(200000);
let success = false; let success = false;
$.ajax({ $.ajax({
url: `${location.protocol}//admin:changeme@${location.hostname}:${location.port}/admin`, url: `${location.protocol}//admin:changeme@${location.hostname}:${location.port}/admin`,