fix all tests

alexlasek · Feb 3, 2014 · c1e8e82 · c1e8e82
1 parent 951c8a0
commit c1e8e82
Show file tree

Hide file tree

Showing 2 changed files with 44 additions and 16 deletions.
diff --git a/spec/coffeescripts/wow-spec.coffee b/spec/coffeescripts/wow-spec.coffee
@@ -73,13 +73,15 @@ describe "WOW", ->
         .not.toHaveClass "animated"
 
     it "animates elements after scrolling down and they become visible", (done) ->
-      window.scrollTo 0, $("#simple-3").offset().top-winHeight+150
+      # Scroll down so that 150px of #simple-3 becomes visible.
+      window.scrollTo 0, $("#simple-3").offset().top - winHeight + 150
       setTimeout ->
         expect $ "#simple-3"
           .toHaveClass "animated"
         expect $ "#simple-4"
           .not.toHaveClass "animated"
-        window.scrollTo 0, $("#simple-4").offset().top-winHeight+150
+        # Scroll down so that 150px of #simple-4 becomes visible.
+        window.scrollTo 0, $("#simple-4").offset().top - winHeight + 150
         setTimeout ->
           expect $ "#simple-4"
             .toHaveClass "animated"
@@ -132,15 +134,29 @@ describe "WOW", ->
         done()
       , timeout
 
-    it "does not touch elements that don't have the marker class", ->
-      window.scrollTo 0, $("#custom-1").offset().top - 10
-      expect $ "#custom-1"
-        .not.toHaveClass "fancy"
+    it "does not touch elements that don't have the marker class", (done) ->
+      # Scroll down so that 15px of #custom-1 becomes visible.
+      window.scrollTo 0, $("#custom-1").offset().top - winHeight + 15
+      setTimeout ->
+        expect $ "#custom-1"
+          .not.toHaveClass "fancy"
+        done()
+      , timeout
 
-    it "animates elements that are partially visible on the page", ->
-      window.scrollTo 0, $("#custom-2").offset().top - winHeight + 10
-      expect $ "#custom-2"
-        .toHaveClass "fancy"
+    it "animates elements that are partially visible on the page based on the 'offset' config", (done) ->
+      setTimeout ->
+        # Scroll down so that 5px of #custom-2 becomes visible.
+        window.scrollTo 0, $("#custom-2").offset().top - winHeight + 5
+        expect $ "#custom-2"
+          .not.toHaveClass "fancy"
+        window.scrollTo 0, $("#custom-2").offset().top - winHeight + 15
+        setTimeout ->
+          # Scroll down so that 15px of #custom-2 becomes visible.
+          expect $ "#custom-2"
+            .toHaveClass "fancy"
+          done()
+        , timeout
+      , timeout
 
     it "does not animate elements not yet visible on the page", ->
       expect $ "#custom-3"
@@ -149,6 +165,7 @@ describe "WOW", ->
         .not.toHaveClass "fancy"
 
     it "animates elements after scrolling down and they become visible", (done) ->
+      # Scroll down so that 150px of #custom-3 becomes visible.
       window.scrollTo 0, $("#custom-3").offset().top - winHeight + 150
       setTimeout ->
         expect $ "#custom-3"
@@ -157,6 +174,7 @@ describe "WOW", ->
           .toBe "2"
         expect $ "#custom-4"
           .not.toHaveClass "fancy"
+        # Scroll down so that 150px of #custom-4 becomes visible.
         window.scrollTo 0, $("#custom-4").offset().top - winHeight + 150
         setTimeout ->
           expect $ "#custom-4"

diff --git a/spec/javascripts/wow-spec.js b/spec/javascripts/wow-spec.js
@@ -96,13 +96,23 @@
           return done();
         }, timeout);
       });
-      it("does not touch elements that don't have the marker class", function() {
-        window.scrollTo(0, $("#custom-1").offset().top - 10);
-        return expect($("#custom-1")).not.toHaveClass("fancy");
+      it("does not touch elements that don't have the marker class", function(done) {
+        window.scrollTo(0, $("#custom-1").offset().top - winHeight + 15);
+        return setTimeout(function() {
+          expect($("#custom-1")).not.toHaveClass("fancy");
+          return done();
+        }, timeout);
       });
-      it("animates elements that are partially visible on the page", function() {
-        window.scrollTo(0, $("#custom-2").offset().top - winHeight + 10);
-        return expect($("#custom-2")).toHaveClass("fancy");
+      it("animates elements that are partially visible on the page based on the 'offset' config", function(done) {
+        return setTimeout(function() {
+          window.scrollTo(0, $("#custom-2").offset().top - winHeight + 5);
+          expect($("#custom-2")).not.toHaveClass("fancy");
+          window.scrollTo(0, $("#custom-2").offset().top - winHeight + 15);
+          return setTimeout(function() {
+            expect($("#custom-2")).toHaveClass("fancy");
+            return done();
+          }, timeout);
+        }, timeout);
       });
       it("does not animate elements not yet visible on the page", function() {
         expect($("#custom-3")).not.toHaveClass("fancy");