WIP: fix up for Firefox

Author: gkalpak

test/ng/anchorScrollSpec.js

@@ -19,6 +19,11 @@ describe('$anchorScroll', function() {
                    '</' + nodeName + '>',
             jqElm = jqLite(tmpl),
             elm = jqElm[0];
+            // Inline elements cause Firefox to report an unexpected value for
+            // `getBoundingClientRect().top` on some platforms (depending on the default font and
+            // line-height). Using inline-block elements prevents this.
+            // See: https://bugzilla.mozilla.org/show_bug.cgi?id=1014738
+            elm.style.display = 'inline-block';
 
         elmSpy[identifier] = spyOn(elm, 'scrollIntoView');
         jqLite($window.document.body).append(jqElm);
@@ -47,39 +52,6 @@ describe('$anchorScroll', function() {
     };
   }
 
-  function expectScrollingTo(identifierCountMap) {
-    var map = {};
-    if (isString(identifierCountMap)) {
-      map[identifierCountMap] = 1;
-    } else if (isArray(identifierCountMap)) {
-      forEach(identifierCountMap, function(identifier) {
-        map[identifier] = 1;
-      });
-    } else {
-      map = identifierCountMap;
-    }
-
-    return function($window) {
-      forEach(elmSpy, function(spy, id) {
-        var count = map[id] || 0;
-        expect(spy.callCount).toBe(count);
-      });
-      expect($window.scrollTo).not.toHaveBeenCalled();
-    };
-  }
-
-  function expectScrollingToTop($window) {
-    forEach(elmSpy, function(spy, id) {
-      expect(spy).not.toHaveBeenCalled();
-    });
-
-    expect($window.scrollTo).toHaveBeenCalledWith(0, 0);
-  }
-
-  function expectNoScrolling() {
-    return expectScrollingTo(NaN);
-  }
-
   function createMockDocument(initialReadyState) {
     var mockedDoc = {};
     docSpies = {};
@@ -117,6 +89,59 @@ describe('$anchorScroll', function() {
     return mockedDoc;
   }
 
+  function createMockWindow(initialReadyState) {
+    return function() {
+      module(function($provide) {
+        elmSpy = {};
+        windowSpies = {};
+
+        $provide.value('$window', {
+          scrollTo: (windowSpies.scrollTo = jasmine.createSpy('$window.scrollTo')),
+          scrollBy: (windowSpies.scrollBy = jasmine.createSpy('$window.scrollBy')),
+          document: createMockDocument(initialReadyState),
+          navigator: {},
+          pageYOffset: 0,
+          getComputedStyle: function(elem) {
+            return getComputedStyle(elem);
+          }
+        });
+      });
+    };
+  }
+
+  function expectNoScrolling() {
+    return expectScrollingTo(NaN);
+  }
+
+  function expectScrollingTo(identifierCountMap) {
+    var map = {};
+    if (isString(identifierCountMap)) {
+      map[identifierCountMap] = 1;
+    } else if (isArray(identifierCountMap)) {
+      forEach(identifierCountMap, function(identifier) {
+        map[identifier] = 1;
+      });
+    } else {
+      map = identifierCountMap;
+    }
+
+    return function($window) {
+      forEach(elmSpy, function(spy, id) {
+        var count = map[id] || 0;
+        expect(spy.callCount).toBe(count);
+      });
+      expect($window.scrollTo).not.toHaveBeenCalled();
+    };
+  }
+
+  function expectScrollingToTop($window) {
+    forEach(elmSpy, function(spy, id) {
+      expect(spy).not.toHaveBeenCalled();
+    });
+
+    expect($window.scrollTo).toHaveBeenCalledWith(0, 0);
+  }
+
   function resetAllSpies() {
     function resetSpy(spy) {
       spy.reset();
@@ -140,28 +165,9 @@ describe('$anchorScroll', function() {
   }
 
 
-  function createMockWindow(initialReadyState) {
-    return function() {
-      module(function($provide) {
-        elmSpy = {};
-        windowSpies = {};
-
-        $provide.value('$window', {
-          scrollTo: (windowSpies.scrollTo = jasmine.createSpy('$window.scrollTo')),
-          scrollBy: (windowSpies.scrollBy = jasmine.createSpy('$window.scrollBy')),
-          document: createMockDocument(initialReadyState),
-          navigator: {},
-          pageYOffset: 0,
-          getComputedStyle: function(elem) {
-            return getComputedStyle(elem);
-          }
-        });
-      });
-    };
-  }
-
-  afterEach(inject(function($browser) {
+  afterEach(inject(function($browser, $document) {
     expect($browser.deferredFns.length).toBe(0);
+    dealoc($document);
   }));
 
 
@@ -311,10 +317,6 @@ describe('$anchorScroll', function() {
 
     beforeEach(createMockWindow());
 
-    afterEach(inject(function($document) {
-      dealoc($document);
-    }));
-
 
     it('should scroll to element when hash change in hashbang mode', function() {
       module(initLocation({html5Mode: false, historyApi: true}));
@@ -444,10 +446,6 @@ describe('$anchorScroll', function() {
     beforeEach(createMockWindow());
     beforeEach(inject(setupBodyForOffsetTesting()));
 
-    afterEach(inject(function($document) {
-      dealoc($document);
-    }));
-
 
     describe('when set as a fixed number', function() {
 
@@ -591,4 +589,3 @@ describe('$anchorScroll', function() {
     });
   });
 });
-