Skip to content
This repository was archived by the owner on Apr 12, 2024. It is now read-only.

Commit 874cd3d

Browse files
committed
fixup! fix($compile): use correct parent element when requiring on html element
1 parent 7c4a135 commit 874cd3d

File tree

3 files changed

+8
-10
lines changed

3 files changed

+8
-10
lines changed

test/e2e/fixtures/directive-require-html/index.html

+1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
<!DOCTYPE html>
22
<html ng-app="test" require-directive require-target-directive>
33
<body>
4+
<div id="container"></div>
45
<script src="angular.js"></script>
56
<script src="script.js"></script>
67
</body>

test/e2e/fixtures/directive-require-html/script.js

+6-2
Original file line numberDiff line numberDiff line change
@@ -5,12 +5,16 @@ angular.
55
directive('requireDirective', function() {
66
return {
77
require: '^^requireTargetDirective',
8-
link: function() {}
8+
link: function(scope, element, attrs, ctrl) {
9+
window.document.querySelector('#container').append(window.document.createTextNode(ctrl.content));
10+
}
911
};
1012
}).
1113
directive('requireTargetDirective', function() {
1214
return {
13-
controller: function() {}
15+
controller: function() {
16+
this.content = 'requiredContent';
17+
}
1418
};
1519
});
1620

test/e2e/tests/directive-require-html.spec.js

+1-8
Original file line numberDiff line numberDiff line change
@@ -5,13 +5,6 @@ describe('require parent controller on html element', function() {
55

66
loadFixture('directive-require-html');
77

8-
browser.manage().logs().get('browser').then(function(browserLogs) {
9-
var requireError = browserLogs.find(function(log) {
10-
return log.message.indexOf('Controller \'requireTargetDirective\', required by directive \'requireDirective\', can\'t be found!') > -1;
11-
});
12-
13-
expect(requireError).toBeDefined();
14-
expect(requireError.level.value).toBe(1000);
15-
});
8+
expect(element(by.id('container')).getText()).not.toContain('requiredContent');
169
});
1710
});

0 commit comments

Comments
 (0)