diff options
Diffstat (limited to 'tests/frontend/specs')
-rw-r--r-- | tests/frontend/specs/alphabet.js | 2 | ||||
-rw-r--r-- | tests/frontend/specs/chat.js | 2 | ||||
-rw-r--r-- | tests/frontend/specs/helper.js | 58 | ||||
-rw-r--r-- | tests/frontend/specs/indentation.js | 4 | ||||
-rw-r--r-- | tests/frontend/specs/urls_become_clickable.js | 2 |
5 files changed, 34 insertions, 34 deletions
diff --git a/tests/frontend/specs/alphabet.js b/tests/frontend/specs/alphabet.js index 131a81c0..ae9570e4 100644 --- a/tests/frontend/specs/alphabet.js +++ b/tests/frontend/specs/alphabet.js @@ -18,7 +18,7 @@ describe("All the alphabet works n stuff", function(){ firstTextElement.sendkeys('{selectall}'); // select all firstTextElement.sendkeys('{del}'); // clear the first line firstTextElement.sendkeys(expectedString); // insert the string - + helper.waitFor(function(){ return inner$("div").first().text() === expectedString; }, 2000).done(done); diff --git a/tests/frontend/specs/chat.js b/tests/frontend/specs/chat.js index a488193f..ccb8b569 100644 --- a/tests/frontend/specs/chat.js +++ b/tests/frontend/specs/chat.js @@ -41,7 +41,7 @@ describe("Chat messages and UI", function(){ it("makes sure that an empty message can't be sent", function(done) { var inner$ = helper.padInner$; var chrome$ = helper.padChrome$; - + //click on the chat button to make chat visible var $chatButton = chrome$("#chaticon"); $chatButton.click(); diff --git a/tests/frontend/specs/helper.js b/tests/frontend/specs/helper.js index 621b3c3a..d5bff629 100644 --- a/tests/frontend/specs/helper.js +++ b/tests/frontend/specs/helper.js @@ -6,14 +6,14 @@ describe("the test helper", function(){ var times = 10; var loadPad = function(){ - helper.newPad(function(){ + helper.newPad(function(){ times--; if(times > 0){ loadPad(); } else { done(); } - }) + }) } loadPad(); @@ -22,8 +22,8 @@ describe("the test helper", function(){ it("gives me 3 jquery instances of chrome, outer and inner", function(done){ this.timeout(5000); - helper.newPad(function(){ - //check if the jquery selectors have the desired elements + helper.newPad(function(){ + //check if the jquery selectors have the desired elements expect(helper.padChrome$("#editbar").length).to.be(1); expect(helper.padOuter$("#outerdocbody").length).to.be(1); expect(helper.padInner$("#innerdocbody").length).to.be(1); @@ -39,61 +39,61 @@ describe("the test helper", function(){ }); describe("the waitFor method", function(){ - it("takes a timeout and waits long enough", function(done){ - this.timeout(2000); + it("takes a timeout and waits long enough", function(done){ + this.timeout(2000); var startTime = new Date().getTime(); helper.waitFor(function(){ - return false; + return false; }, 1500).fail(function(){ - var duration = new Date().getTime() - startTime; + var duration = new Date().getTime() - startTime; expect(duration).to.be.greaterThan(1400); done(); }); - }); + }); - it("takes an interval and checks on every interval", function(done){ + it("takes an interval and checks on every interval", function(done){ this.timeout(4000); var checks = 0; helper.waitFor(function(){ checks++; - return false; + return false; }, 2000, 100).fail(function(){ expect(checks).to.be.greaterThan(10); expect(checks).to.be.lessThan(30); done(); }); - }); + }); - describe("returns a deferred object", function(){ + describe("returns a deferred object", function(){ it("it calls done after success", function(done){ helper.waitFor(function(){ - return true; - }).done(function(){ + return true; + }).done(function(){ done(); - }); + }); }); it("calls fail after failure", function(done){ - helper.waitFor(function(){ - return false; - },0).fail(function(){ + helper.waitFor(function(){ + return false; + },0).fail(function(){ done(); - }); + }); }); xit("throws if you don't listen for fails", function(done){ - var onerror = window.onerror; - window.onerror = function(){ + var onerror = window.onerror; + window.onerror = function(){ window.onerror = onerror; - done(); - } + done(); + } - helper.waitFor(function(){ - return false; - },100); + helper.waitFor(function(){ + return false; + },100); }); - }); + }); }); -});
\ No newline at end of file +}); diff --git a/tests/frontend/specs/indentation.js b/tests/frontend/specs/indentation.js index 9692120a..3d14a7a8 100644 --- a/tests/frontend/specs/indentation.js +++ b/tests/frontend/specs/indentation.js @@ -158,8 +158,8 @@ describe("indentation button", function(){ testHelper.selectText(firstTextElement[0], $inner); /* this test creates the below content, both should have double indentation - line1 - line2 + line1 + line2 firstTextElement.sendkeys('{rightarrow}'); // simulate a keypress of enter diff --git a/tests/frontend/specs/urls_become_clickable.js b/tests/frontend/specs/urls_become_clickable.js index 8c72d748..2de60bf9 100644 --- a/tests/frontend/specs/urls_become_clickable.js +++ b/tests/frontend/specs/urls_become_clickable.js @@ -16,7 +16,7 @@ describe("urls", function(){ firstTextElement.sendkeys('{selectall}'); // select all firstTextElement.sendkeys('{del}'); // clear the first line firstTextElement.sendkeys('http://etherpad.org'); // insert a URL - + helper.waitFor(function(){ return inner$("div").first().find("a").length === 1; }, 2000).done(done); |