diff options
author | John McLear <john@mclear.co.uk> | 2013-02-07 15:50:59 +0000 |
---|---|---|
committer | John McLear <john@mclear.co.uk> | 2013-02-07 15:50:59 +0000 |
commit | 8c0fb090ebdcb8c7adb3fb084e9a7dba9d4b953d (patch) | |
tree | 4fc1df16b79d862d219048742c640f312a5fcc50 | |
parent | 52afe86377fe01f2263ce53431de6bf59fad277b (diff) | |
download | etherpad-lite-8c0fb090ebdcb8c7adb3fb084e9a7dba9d4b953d.zip |
works in all 3 major browsers
-rw-r--r-- | tests/frontend/specs/timeslider_revisions.js | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/tests/frontend/specs/timeslider_revisions.js b/tests/frontend/specs/timeslider_revisions.js index bb0696c7..6eb4cca6 100644 --- a/tests/frontend/specs/timeslider_revisions.js +++ b/tests/frontend/specs/timeslider_revisions.js @@ -98,7 +98,6 @@ describe("timeslider", function(){ }, 6000); }, revs*timePerRev); }); - // This test is bad because it expects char length to be static // A much better way would be get the charCount before sending new chars it("jumps to a revision given in the url", function(done) { @@ -117,7 +116,9 @@ describe("timeslider", function(){ timeslider$ = $('#iframe-container iframe')[0].contentWindow.$; }catch(e){ } - return timeslider$('#padcontent').text().length == 230; + if(timeslider$){ + return timeslider$('#padcontent').text().length == 230; + } }, 6000).always(function(){ expect( timeslider$('#padcontent').text().length ).to.eql( 230 ); done(); |