mirror of
https://github.com/ether/etherpad-lite.git
synced 2025-04-22 08:26:16 -04:00
more realistic timeouts for slower devices
This commit is contained in:
parent
2816820785
commit
21736122a0
5 changed files with 13 additions and 13 deletions
|
@ -48,7 +48,7 @@ describe('author of pad edition', function () {
|
||||||
helper.padChrome$.document.cookie = 'token=foo;expires=Thu, 01 Jan 1970 00:00:00 GMT; path=/';
|
helper.padChrome$.document.cookie = 'token=foo;expires=Thu, 01 Jan 1970 00:00:00 GMT; path=/';
|
||||||
|
|
||||||
helper.newPad(done, padId);
|
helper.newPad(done, padId);
|
||||||
}, 1000);
|
}, 5000);
|
||||||
});
|
});
|
||||||
});
|
});
|
||||||
});
|
});
|
||||||
|
@ -58,17 +58,17 @@ describe('author of pad edition', function () {
|
||||||
|
|
||||||
// author 2 makes some changes on the pad
|
// author 2 makes some changes on the pad
|
||||||
it('marks only the new content as changes of the second user on a regular line', function (done) {
|
it('marks only the new content as changes of the second user on a regular line', function (done) {
|
||||||
this.timeout(100);
|
this.timeout(500);
|
||||||
changeLineAndCheckOnlyThatChangeIsFromThisAuthor(REGULAR_LINE, 'x', done);
|
changeLineAndCheckOnlyThatChangeIsFromThisAuthor(REGULAR_LINE, 'x', done);
|
||||||
});
|
});
|
||||||
|
|
||||||
it('marks only the new content as changes of the second user on a line with ordered list', function (done) {
|
it('marks only the new content as changes of the second user on a line with ordered list', function (done) {
|
||||||
this.timeout(100);
|
this.timeout(500);
|
||||||
changeLineAndCheckOnlyThatChangeIsFromThisAuthor(LINE_WITH_ORDERED_LIST, 'y', done);
|
changeLineAndCheckOnlyThatChangeIsFromThisAuthor(LINE_WITH_ORDERED_LIST, 'y', done);
|
||||||
});
|
});
|
||||||
|
|
||||||
it('marks only the new content as changes of the second user on a line with unordered list', function (done) {
|
it('marks only the new content as changes of the second user on a line with unordered list', function (done) {
|
||||||
this.timeout(100);
|
this.timeout(500);
|
||||||
changeLineAndCheckOnlyThatChangeIsFromThisAuthor(LINE_WITH_UNORDERED_LIST, 'z', done);
|
changeLineAndCheckOnlyThatChangeIsFromThisAuthor(LINE_WITH_UNORDERED_LIST, 'z', done);
|
||||||
});
|
});
|
||||||
|
|
||||||
|
|
|
@ -8,7 +8,7 @@ describe('bold button', function () {
|
||||||
});
|
});
|
||||||
|
|
||||||
it('makes text bold on click', function (done) {
|
it('makes text bold on click', function (done) {
|
||||||
this.timeout(50);
|
this.timeout();
|
||||||
const inner$ = helper.padInner$;
|
const inner$ = helper.padInner$;
|
||||||
const chrome$ = helper.padChrome$;
|
const chrome$ = helper.padChrome$;
|
||||||
|
|
||||||
|
@ -39,7 +39,7 @@ describe('bold button', function () {
|
||||||
});
|
});
|
||||||
|
|
||||||
it('makes text bold on keypress', function (done) {
|
it('makes text bold on keypress', function (done) {
|
||||||
this.timeout(50);
|
this.timeout(100);
|
||||||
const inner$ = helper.padInner$;
|
const inner$ = helper.padInner$;
|
||||||
|
|
||||||
// get the first text element out of the inner iframe
|
// get the first text element out of the inner iframe
|
||||||
|
|
|
@ -62,7 +62,7 @@ describe('change user color', function () {
|
||||||
});
|
});
|
||||||
|
|
||||||
it('Own user color is shown when you enter a chat', function (done) {
|
it('Own user color is shown when you enter a chat', function (done) {
|
||||||
this.timeout(200);
|
this.timeout(500);
|
||||||
const chrome$ = helper.padChrome$;
|
const chrome$ = helper.padChrome$;
|
||||||
|
|
||||||
const $colorOption = helper.padChrome$('#options-colorscheck');
|
const $colorOption = helper.padChrome$('#options-colorscheck');
|
||||||
|
|
|
@ -4,12 +4,12 @@ describe('chat-load-messages', function () {
|
||||||
let padName;
|
let padName;
|
||||||
|
|
||||||
it('creates a pad', function (done) {
|
it('creates a pad', function (done) {
|
||||||
this.timeout(5000);
|
this.timeout(20000);
|
||||||
padName = helper.newPad(done);
|
padName = helper.newPad(done);
|
||||||
});
|
});
|
||||||
|
|
||||||
it('adds a lot of messages', function (done) {
|
it('adds a lot of messages', function (done) {
|
||||||
this.timeout(5000);
|
this.timeout(10000);
|
||||||
const chrome$ = helper.padChrome$;
|
const chrome$ = helper.padChrome$;
|
||||||
const chatButton = chrome$('#chaticon');
|
const chatButton = chrome$('#chaticon');
|
||||||
chatButton.click();
|
chatButton.click();
|
||||||
|
|
|
@ -36,7 +36,7 @@ describe('indentation button', function () {
|
||||||
});
|
});
|
||||||
|
|
||||||
it('keeps the indent on enter for the new line', function (done) {
|
it('keeps the indent on enter for the new line', function (done) {
|
||||||
this.timeout(800);
|
this.timeout(1200);
|
||||||
const inner$ = helper.padInner$;
|
const inner$ = helper.padInner$;
|
||||||
const chrome$ = helper.padChrome$;
|
const chrome$ = helper.padChrome$;
|
||||||
|
|
||||||
|
@ -61,7 +61,7 @@ describe('indentation button', function () {
|
||||||
});
|
});
|
||||||
|
|
||||||
it("indents text with spaces on enter if previous line ends with ':', '[', '(', or '{'", function (done) {
|
it("indents text with spaces on enter if previous line ends with ':', '[', '(', or '{'", function (done) {
|
||||||
this.timeout(800);
|
this.timeout(1200);
|
||||||
const inner$ = helper.padInner$;
|
const inner$ = helper.padInner$;
|
||||||
|
|
||||||
// type a bit, make a line break and type again
|
// type a bit, make a line break and type again
|
||||||
|
@ -112,7 +112,7 @@ describe('indentation button', function () {
|
||||||
});
|
});
|
||||||
|
|
||||||
it("appends indentation to the indent of previous line if previous line ends with ':', '[', '(', or '{'", function (done) {
|
it("appends indentation to the indent of previous line if previous line ends with ':', '[', '(', or '{'", function (done) {
|
||||||
this.timeout(800);
|
this.timeout(1200);
|
||||||
const inner$ = helper.padInner$;
|
const inner$ = helper.padInner$;
|
||||||
|
|
||||||
// type a bit, make a line break and type again
|
// type a bit, make a line break and type again
|
||||||
|
@ -137,7 +137,7 @@ describe('indentation button', function () {
|
||||||
});
|
});
|
||||||
|
|
||||||
it("issue #2772 shows '*' when multiple indented lines receive a style and are outdented", function (done) {
|
it("issue #2772 shows '*' when multiple indented lines receive a style and are outdented", function (done) {
|
||||||
this.timeout(800);
|
this.timeout(1200);
|
||||||
const inner$ = helper.padInner$;
|
const inner$ = helper.padInner$;
|
||||||
const chrome$ = helper.padChrome$;
|
const chrome$ = helper.padChrome$;
|
||||||
|
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue