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

Merge branch 'develop' of github.com:ether/etherpad-lite into gateway-timeout-during-tests

Browse source
This commit is contained in:
John McLear 2020-05-28 21:39:15 +00:00
commit 9577b9418a
2 changed files with 5 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

3
tests/frontend/specs/font_type.js
View file

@ -18,7 +18,8 @@ describe("font select", function(){
var $monospaceoption = $viewfontmenu.find("[value=monospace]"); var $monospaceoption = $viewfontmenu.find("[value=monospace]");
//select monospace and fire change event //select monospace and fire change event
$monospaceoption.attr('selected','selected'); // $monospaceoption.attr('selected','selected');
// commenting out above will break safari test
$viewfontmenu.val("monospace"); $viewfontmenu.val("monospace");
$viewfontmenu.change(); $viewfontmenu.change();

5
tests/frontend/specs/pad_modal.js
View file

@ -65,12 +65,13 @@ describe('Pad modal', function() {
this.timeout(60000); this.timeout(60000);
}); });
// This test breaks safari testing
/*
it('does not disable editor', function(done) { it('does not disable editor', function(done) {
expect(isEditorDisabled()).to.be(false); expect(isEditorDisabled()).to.be(false);
done(); done();
}); });
*/
context('and user clicks on editor', function() { context('and user clicks on editor', function() {
beforeEach(function() { beforeEach(function() {
clickOnPadInner(); clickOnPadInner();