test($anchorScroll): fix tests in order to reliably pass on Firefox

There was an timing issue (that seemed to only affect Firefox) due to
`scroll()` being wrapped in `$evalAsync()` (this is necessary to ensure
that Firefox does not overwrite the `yOffset` when navigating to a new
page).
This commit wraps the some expectations in `$evalAsync()` in order to
evaluate them after `scroll()` has been called.

Author: gkalpak

test/ng/anchorScrollSpec.js

@@ -44,18 +44,19 @@ describe('$anchorScroll', function() {
       $rootScope.$apply(function() {
         $location.hash(hash);
       });
-      if ($browser.deferredFns.length) {
-        $browser.defer.flush();
-      }
     };
   }
 
-  function expectScrollingToTop($window) {
-    forEach(elmSpy, function(spy, id) {
-      expect(spy).not.toHaveBeenCalled();
-    });
+  function expectAsync() {
+    var expectations = sliceArgs(arguments);
 
-    expect($window.scrollTo).toHaveBeenCalledWith(0, 0);
+    return function($rootScope) {
+      $rootScope.$evalAsync(function() {
+        expectations.forEach(function(expectation) {
+          inject(expectation);
+        });
+      });
+    };
   }
 
   function expectScrollingTo(identifierCountMap) {
@@ -79,6 +80,14 @@ describe('$anchorScroll', function() {
     };
   }
 
+  function expectScrollingToTop($window) {
+    forEach(elmSpy, function(spy, id) {
+      expect(spy).not.toHaveBeenCalled();
+    });
+
+    expect($window.scrollTo).toHaveBeenCalledWith(0, 0);
+  }
+
   function expectNoScrolling() {
     return expectScrollingTo(NaN);
   }
@@ -212,13 +221,13 @@ describe('$anchorScroll', function() {
     addElements('id=some1'),
 
     changeHashTo('some1'),
-    expectNoScrolling(),
+    expectAsync(expectNoScrolling()),
 
     updateMockReadyState('some-arbitrary-state'),
-    expectNoScrolling(),
+    expectAsync(expectNoScrolling()),
 
     updateMockReadyState('complete'),
-    expectScrollingTo('id=some1')));
+    expectAsync(expectScrollingTo('id=some1'))));
 
 
   it('should only register once for execution when `document.readyState === "complete"', inject(
@@ -230,10 +239,10 @@ describe('$anchorScroll', function() {
     updateMockReadyState('some-other-arbitrary-state'),
     changeHashTo('some1'),
     changeHashTo('some2'),
-    expectNoScrolling(),
+    expectAsync(expectNoScrolling()),
 
     updateMockReadyState('complete'),
-    expectScrollingTo('id=some2')));
+    expectAsync(expectScrollingTo('id=some2'))));
 
 
   it('should properly register and unregister listeners for `readystatechange` event', inject(
@@ -247,7 +256,7 @@ describe('$anchorScroll', function() {
     changeHashTo('some2'),
     updateMockReadyState('complete'),
 
-    function() {
+    expectAsync(function() {
       expect(docSpies.addEventListener.callCount).toBe(1);
       expect(docSpies.addEventListener).
           toHaveBeenCalledWith('readystatechange', jasmine.any(Function));
@@ -259,7 +268,7 @@ describe('$anchorScroll', function() {
       var registeredListener = docSpies.addEventListener.calls[0].args[1];
       var unregisteredListener = docSpies.removeEventListener.calls[0].args[1];
       expect(unregisteredListener).toBe(registeredListener);
-    }));
+    })));
 
 
   it('should scroll immediately if `readyState === "complete"`', inject(
@@ -269,11 +278,12 @@ describe('$anchorScroll', function() {
     updateMockReadyState('complete'),
     changeHashTo('some1'),
 
-    expectScrollingTo('id=some1'),
-    function() {
-      expect(docSpies.addEventListener.callCount).toBe(0);
-      expect(docSpies.removeEventListener.callCount).toBe(0);
-    }));
+    expectAsync(
+      expectScrollingTo('id=some1'),
+      function() {
+        expect(docSpies.addEventListener.callCount).toBe(0);
+        expect(docSpies.removeEventListener.callCount).toBe(0);
+      })));
 
 
   describe('watcher', function() {
@@ -308,7 +318,7 @@ describe('$anchorScroll', function() {
         initAnchorScroll(),
         addElements('id=some'),
         changeHashTo('some'),
-        expectScrollingTo('id=some')
+        expectAsync(expectScrollingTo('id=some'))
       );
     });
 
@@ -319,7 +329,7 @@ describe('$anchorScroll', function() {
         initAnchorScroll(),
         addElements('id=some'),
         changeHashTo('some'),
-        expectScrollingTo('id=some')
+        expectAsync(expectScrollingTo('id=some'))
       );
     });
 
@@ -337,7 +347,7 @@ describe('$anchorScroll', function() {
         initAnchorScroll(),
         addElements('id=some'),
         changeHashTo('other'),
-        expectNoScrolling()
+        expectAsync(expectNoScrolling())
       );
     });
 
@@ -348,7 +358,7 @@ describe('$anchorScroll', function() {
         initAnchorScroll(),
         addElements('id=some'),
         changeHashTo('some'),
-        expectScrollingTo('id=some')
+        expectAsync(expectScrollingTo('id=some'))
       );
     });
 
@@ -361,7 +371,7 @@ describe('$anchorScroll', function() {
       inject(
         addElements('id=fake'),
         changeHashTo('fake'),
-        expectNoScrolling()
+        expectAsync(expectNoScrolling())
       );
     });
 
@@ -374,7 +384,7 @@ describe('$anchorScroll', function() {
       inject(
         addElements('id=fake'),
         changeHashTo('fake'),
-        expectNoScrolling(),
+        expectAsync(expectNoScrolling()),
         callAnchorScroll(),
         expectScrollingTo('id=fake')
       );
@@ -389,7 +399,7 @@ describe('$anchorScroll', function() {
     function expectScrollingWithOffset(identifierCountMap, offsetList) {
       var list = isArray(offsetList) ? offsetList : [offsetList];
 
-      return function($window) {
+      return function($rootScope, $window) {
         inject(expectScrollingTo(identifierCountMap));
         expect($window.scrollBy.callCount).toBe(list.length);
         forEach(list, function(offset, idx) {
@@ -437,6 +447,7 @@ describe('$anchorScroll', function() {
 
       var yOffsetNumber = 50;
 
+
       beforeEach(inject(
         setupBodyForOffsetTesting(),
         setYOffset(yOffsetNumber)));
@@ -445,15 +456,15 @@ describe('$anchorScroll', function() {
       it('should scroll with vertical offset', inject(
         addElements('id=some'),
         changeHashTo('some'),
-        expectScrollingWithOffset('id=some', yOffsetNumber)));
+        expectAsync(expectScrollingWithOffset('id=some', yOffsetNumber))));
 
 
       it('should use the correct vertical offset when changing `yOffset` at runtime', inject(
         addElements('id=some'),
         changeHashTo('some'),
         setYOffset(yOffsetNumber - 10),
         callAnchorScroll(),
-        expectScrollingWithOffset({'id=some': 2}, [yOffsetNumber, yOffsetNumber - 10])));
+        expectAsync(expectScrollingWithOffset({'id=some': 2}, [yOffsetNumber, yOffsetNumber - 10]))));
 
 
       it('should adjust the vertical offset for elements near the end of the page', function() {
@@ -486,9 +497,10 @@ describe('$anchorScroll', function() {
           },
           changeHashTo('some2'),
           updateMockPageYOffset(),
-          resetAllSpies(),
-          callAnchorScroll(),
-          expectScrollingWithOffset('id=some2', targetAdjustedOffset));
+          expectAsync(
+            resetAllSpies(),
+            callAnchorScroll(),
+            expectScrollingWithOffset('id=some2', targetAdjustedOffset)));
       });
     });
 
@@ -512,15 +524,16 @@ describe('$anchorScroll', function() {
           changeHashTo('name2'),
           changeHashTo('id1'),
           callAnchorScroll(),
-          expectScrollingWithOffset({
-            'id=id1': 3,
-            'name=name2': 1
-          }, [
-            1 * increment,
-            2 * increment,
-            3 * increment,
-            4 * increment
-          ]));
+          expectAsync(
+            expectScrollingWithOffset({
+              'id=id1': 3,
+              'name=name2': 1
+            }, [
+              1 * increment,
+              2 * increment,
+              3 * increment,
+              4 * increment
+            ])));
       });
     });
 
@@ -551,7 +564,7 @@ describe('$anchorScroll', function() {
         }),
         addElements('id=some'),
         changeHashTo('some'),
-        expectScrollingWithOffset('id=some', 50)));
+        expectAsync(expectScrollingWithOffset('id=some', 50))));
 
 
       it('should scroll with vertical offset when `top > 0`', inject(
@@ -562,7 +575,7 @@ describe('$anchorScroll', function() {
         }),
         addElements('id=some'),
         changeHashTo('some'),
-        expectScrollingWithOffset('id=some', 100)));
+        expectAsync(expectScrollingWithOffset('id=some', 100))));
 
 
       it('should scroll without vertical offset when `position !== fixed`', inject(
@@ -573,7 +586,7 @@ describe('$anchorScroll', function() {
         }),
         addElements('id=some'),
         changeHashTo('some'),
-        expectScrollingWithoutOffset('id=some')));
+        expectAsync(expectScrollingWithoutOffset('id=some'))));
     });
   });
 });