From f42d3820a5f495fbee4c5c1579b9c2daaf2e0e49 Mon Sep 17 00:00:00 2001
From: John McLear <john@mclear.co.uk>
Date: Thu, 7 Feb 2013 15:24:30 +0000
Subject: [PATCH 1/2] fix timeslider tests

---
 tests/frontend/specs/timeslider_revisions.js | 26 +++++++++++---------
 1 file changed, 15 insertions(+), 11 deletions(-)

diff --git a/tests/frontend/specs/timeslider_revisions.js b/tests/frontend/specs/timeslider_revisions.js
index 52f487643..bb0696c7c 100644
--- a/tests/frontend/specs/timeslider_revisions.js
+++ b/tests/frontend/specs/timeslider_revisions.js
@@ -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,32 @@ 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){
+        }
+        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 +137,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');

From 8c0fb090ebdcb8c7adb3fb084e9a7dba9d4b953d Mon Sep 17 00:00:00 2001
From: John McLear <john@mclear.co.uk>
Date: Thu, 7 Feb 2013 15:50:59 +0000
Subject: [PATCH 2/2] works in all 3 major browsers

---
 tests/frontend/specs/timeslider_revisions.js | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/tests/frontend/specs/timeslider_revisions.js b/tests/frontend/specs/timeslider_revisions.js
index bb0696c7c..6eb4cca61 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();