From ae6a9c25ae828ba0a42b34b475d988ec8a7fb3df Mon Sep 17 00:00:00 2001
From: mluto <m@luto.at>
Date: Thu, 7 Feb 2013 17:34:31 +0100
Subject: [PATCH] Fixed "jumps to a revision given in the url" test

---
 tests/frontend/specs/timeslider_revisions.js | 57 ++++++++++++--------
 1 file changed, 36 insertions(+), 21 deletions(-)

diff --git a/tests/frontend/specs/timeslider_revisions.js b/tests/frontend/specs/timeslider_revisions.js
index 6eb4cca61..54af44ba3 100644
--- a/tests/frontend/specs/timeslider_revisions.js
+++ b/tests/frontend/specs/timeslider_revisions.js
@@ -98,32 +98,47 @@ 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(15000);
-    inner$("div").first().sendkeys('a');
-    
-    setTimeout(function() {
-      // go to timeslider with a specific revision set
-      $('#iframe-container iframe').attr('src', $('#iframe-container iframe').attr('src')+'/timeslider#0');
-      var timeslider$;
+    var chrome$ = helper.padChrome$;
+    this.timeout(20000);
+
+    // wait for the text to be loaded
+    helper.waitFor(function(){
+      return inner$('body').text().length != 0;
+    }, 6000).always(function() {
+      var newLines = inner$('body div').length;
+      var oldLength = inner$('body').text().length + newLines / 2;
+      expect( oldLength ).to.not.eql( 0 );
+      inner$("div").first().sendkeys('a');
       
+      // wait for our additional revision to be added
       helper.waitFor(function(){
-        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();
+        // newLines takes the new lines into account which are strippen when using
+        // inner$('body').text(), one <div> is used for one line in ACE.
+        var lenOkay = inner$('body').text().length + newLines / 2 != oldLength;
+        // this waits for the color to be added to our <span>, which means that the revision
+        // was accepted by the server.
+        var colorOkay = inner$('span').first().attr('class').indexOf("author-") == 0;
+        return lenOkay && colorOkay;
+      }, 6000).always(function() {
+        // go to timeslider with a specific revision set
+        $('#iframe-container iframe').attr('src', $('#iframe-container iframe').attr('src')+'/timeslider#0');
+        
+        // wait for the timeslider to be loaded
+        helper.waitFor(function(){
+          try {
+            timeslider$ = $('#iframe-container iframe')[0].contentWindow.$;
+          } catch(e){}
+          if(timeslider$){
+            return timeslider$('#padcontent').text().length == oldLength;
+          }
+        }, 6000).always(function(){
+          expect( timeslider$('#padcontent').text().length ).to.eql( oldLength );
+          done();
+        });
       });
-    }, 2500);
+    });
   });
   it("checks the export url", function(done) {
     var inner$ = helper.padInner$;