fix($compile): use correct parent element when requiring on html element

Narretz · Narretz · commit 396071a82661 · 2018-07-26T10:51:37.000+02:00
diff --git a/src/ng/compile.js b/src/ng/compile.js
@@ -2960,7 +2960,14 @@ function $CompileProvider($provide, $$sanitizeUriProvider) {
 
         if (!value) {
           var dataName = '$' + name + 'Controller';
-          value = inheritType ? $element.inheritedData(dataName) : $element.data(dataName);
+
+          if (inheritType === '^^' && $element[0].nodeType === NODE_TYPE_DOCUMENT) {
+            // inheritedData() uses the documentElement when it finds the document, so we would
+            // require from the element itself.
+            value = null;
+          } else {
+            value = inheritType ? $element.inheritedData(dataName) : $element.data(dataName);
+          }
         }
 
         if (!value && !optional) {
diff --git a/test/e2e/fixtures/directive-require-html/index.html b/test/e2e/fixtures/directive-require-html/index.html
@@ -0,0 +1,7 @@
+<!DOCTYPE html>
+<html ng-app="test" require-directive parent-directive>
+  <body>
+    <script src="angular.js"></script>
+    <script src="script.js"></script>
+  </body>
+</html>
diff --git a/test/e2e/fixtures/directive-require-html/script.js b/test/e2e/fixtures/directive-require-html/script.js
@@ -0,0 +1,16 @@
+'use strict';
+
+angular.
+  module('test', []).
+  directive('requireDirective', function() {
+    return {
+      require: '^^parentDirective',
+      link: function() {}
+    };
+  }).
+  directive('parentDirective', function() {
+    return {
+      controller: function() {}
+    };
+  });
+
diff --git a/test/e2e/tests/directive-require-html.spec.js b/test/e2e/tests/directive-require-html.spec.js
@@ -0,0 +1,13 @@
+'use strict';
+
+describe('require parent controller on html element', function() {
+  it('should not use the html element as the parent element', function() {
+
+    loadFixture('directive-require-html');
+
+    browser.manage().logs().get('browser').then(function(browserLogs) {
+      expect(browserLogs[0].level.value).toBe(1000);
+      expect(browserLogs[0].message).toContain('Controller \'parentDirective\', required by directive \'requireDirective\', can\'t be found!');
+    });
+  });
+});
