fuwafuwa
/
etherpad-lite
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge pull request #1467 from ether/fix-timeslider-tests 

fix timeslider tests
This commit is contained in:
John McLear 2013-02-07 07:52:13 -08:00
parent ea04e9c997 8c0fb090eb
commit f65ad93fb9
1 changed files with 16 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
tests/frontend/specs/timeslider_revisions.js
View File

@ -4,7 +4,6 @@ describe("timeslider", function(){
helper.newPad(cb);
this.timeout(6000);
});
xit("loads adds a hundred revisions", function(done) {
var inner$ = helper.padInner$;
var chrome$ = helper.padChrome$;
@ -57,14 +56,13 @@ describe("timeslider", function(){
}, 6000);
}, revs*timePerRev);
});
it("changes the url when clicking on the timeslider", function(done) {
var inner$ = helper.padInner$;
var chrome$ = helper.padChrome$;
// make some changes to produce 7 revisions
var timePerRev = 900
, revs = 7;
var timePerRev = 1000
, revs = 20;
this.timeout(revs*timePerRev+10000);
for(var i=0; i < revs; i++) {
setTimeout(function() {
@ -100,28 +98,33 @@ 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) {
var inner$ = helper.padInner$;
var chrome$ = helper.padChrome$;
this.timeout(11000);
this.timeout(15000);
inner$("div").first().sendkeys('a');
setTimeout(function() {
// go to timeslider
// go to timeslider with a specific revision set
$('#iframe-container iframe').attr('src', $('#iframe-container iframe').attr('src')+'/timeslider#0');
var timeslider$;
helper.waitFor(function(){
timeslider$ = $('#iframe-container iframe')[0].contentWindow.$;
return timeslider$ && timeslider$('#padcontent').text().length == 230;
try{
timeslider$ = $('#iframe-container iframe')[0].contentWindow.$;
}catch(e){
}
if(timeslider$){
return timeslider$('#padcontent').text().length == 230;
}
}, 6000).always(function(){
expect( timeslider$('#padcontent').text().length ).to.eql( 230 );
done();
});
}, 2500);
});
it("checks the export url", function(done) {
var inner$ = helper.padInner$;
var chrome$ = helper.padChrome$;
@ -135,7 +138,9 @@ describe("timeslider", function(){
var exportLink;
helper.waitFor(function(){
timeslider$ = $('#iframe-container iframe')[0].contentWindow.$;
try{
timeslider$ = $('#iframe-container iframe')[0].contentWindow.$;
}catch(e){}
if(!timeslider$)
return false;
exportLink = timeslider$('#exportplaina').attr('href');