fixup 3

- Reset `originalRootElement` for each test to avoid.
- Fix clean-up break, if `$rootElement` was never initialized.
- Fix clean-up break, if decorated `$rootElement` was falsy (e.g. `null`).
- (Rename `cleanUpElems` to `cleanUpNodes` - since it's "raw" nodes, not jq-wrapped elements.)

Author: gkalpak

src/ngMock/angular-mocks.js

@@ -2579,6 +2579,7 @@ if (window.jasmine || window.mocha) {
 
 
   (window.beforeEach || window.setup)(function() {
+    originalRootElement = null;
     annotatedFunctions = [];
     currentSpec = this;
   });
@@ -2602,10 +2603,14 @@ if (window.jasmine || window.mocha) {
     currentSpec = null;
 
     if (injector) {
-      var cleanUpElems = [originalRootElement[0]];
-      var rootNode = injector.get('$rootElement')[0];
-      if (rootNode && (rootNode !== originalRootElement[0])) cleanUpElems.push(rootNode);
-      angular.element.cleanData(cleanUpElems);
+      // Ensure `$rootElement` is instantiated, before checking `originalRootElement`
+      var $rootElement = injector.get('$rootElement');
+      var rootNode = $rootElement && $rootElement[0];
+      var cleanUpNodes = !originalRootElement ? [] : [originalRootElement[0]];
+      if (rootNode && (!originalRootElement || rootNode !== originalRootElement[0])) {
+        cleanUpNodes.push(rootNode);
+      }
+      angular.element.cleanData(cleanUpNodes);
 
       injector.get('$rootScope').$destroy();
     }

test/ngMock/angular-mocksSpec.js

@@ -2430,7 +2430,7 @@ describe('`afterEach` clean-up', function() {
 
           // Spy on `angular.element.cleanData()`, so the next test can verify
           // that it has been called as necessary
-          prevCleanDataSpy = spyOn(angular.element, 'cleanData').andCallThrough();
+          prevCleanDataSpy = mockCleanData([null, [prevRootElement]]);
 
           return $delegate;
         });
@@ -2448,9 +2448,9 @@ describe('`afterEach` clean-up', function() {
       // We want to verify the subsequent call, made by `angular-mocks`
       expect(prevCleanDataSpy.callCount).toBe(2);
 
-      var cleanUpElems = prevCleanDataSpy.calls[1].args[0];
-      expect(cleanUpElems.length).toBe(1);
-      expect(cleanUpElems[0]).toBe(prevRootElement[0]);
+      var cleanUpNodes = prevCleanDataSpy.calls[1].args[0];
+      expect(cleanUpNodes.length).toBe(1);
+      expect(cleanUpNodes[0]).toBe(prevRootElement[0]);
     });
   });
 
@@ -2471,7 +2471,7 @@ describe('`afterEach` clean-up', function() {
 
           // Spy on `angular.element.cleanData()`, so the next test can verify
           // that it has been called as necessary
-          prevCleanDataSpy = spyOn(angular.element, 'cleanData').andCallThrough();
+          prevCleanDataSpy = mockCleanData([null, [prevOriginalRootElement, prevRootElement]]);
 
           return prevRootElement;
         });
@@ -2498,10 +2498,59 @@ describe('`afterEach` clean-up', function() {
       // We want to verify the subsequent call, made by `angular-mocks`
       expect(prevCleanDataSpy.callCount).toBe(2);
 
-      var cleanUpElems = prevCleanDataSpy.calls[1].args[0];
-      expect(cleanUpElems.length).toBe(2);
-      expect(cleanUpElems[0]).toBe(prevOriginalRootElement[0]);
-      expect(cleanUpElems[1]).toBe(prevRootElement[0]);
+      var cleanUpNodes = prevCleanDataSpy.calls[1].args[0];
+      expect(cleanUpNodes.length).toBe(2);
+      expect(cleanUpNodes[0]).toBe(prevOriginalRootElement[0]);
+      expect(cleanUpNodes[1]).toBe(prevRootElement[0]);
     });
   });
+
+
+  describe('uninstantiated or falsy `$rootElement`', function() {
+    it('should not break if `$rootElement` was never instantiated', function() {
+      // Just an empty test to verify that `angular-mocks` doesn't break,
+      // when trying to clean up `$rootElement`, if `$rootElement` was never injected in the test
+      // (and thus never instantiated/created)
+
+      // Ensure the `$injector` is created - if there is no `$injector`, no clean-up takes places
+      inject(function() {});
+    });
+
+
+    it('should not break if the decorated `$rootElement` is falsy (e.g. `null`)', function() {
+      module(function($provide) {
+        $provide.value('$rootElement', null);
+      });
+
+      // Ensure the `$injector` is created - if there is no `$injector`, no clean-up takes places
+      inject(function() {});
+    });
+  });
+
+
+  // Helpers
+  function mockCleanData(expectedElementsPerCall) {
+    var jq = angular.element;
+    var currentCallIdx = -1;
+
+    var cleanData_ = jq.cleanData;
+    var cleanDataSpy = spyOn(jq, 'cleanData').andCallFake(function(cleanUpNodes) {
+      var expectedElements = expectedElementsPerCall[++currentCallIdx];
+
+      if (!expectedElements) {
+        cleanData_.apply(jq, arguments);
+      } else {
+        var expectedNodes = expectedElements.map(function(elem) { return elem[0]; });
+        expect(cleanUpNodes).toEqual(expectedNodes);
+
+        cleanData_.apply(jq, arguments);
+
+        expectedNodes.forEach(function(node) {
+          expect(jq.hasData(node)).toBe(false);
+        });
+      }
+    });
+
+    return cleanDataSpy;
+  }
 });