aboutsummaryrefslogtreecommitdiffstats
path: root/test/ng/compileSpec.js
diff options
context:
space:
mode:
authorIgor Minar2013-08-20 16:31:09 -0700
committerIgor Minar2013-08-20 23:31:38 -0700
commiteed299a31b5a6dd0363133c5f9271bf33d090c94 (patch)
tree872075ebec162b5aa869e70118858441f6857cdd /test/ng/compileSpec.js
parentbf79bd4194eca2118ae1c492c08dbd217f5ae810 (diff)
downloadangular.js-eed299a31b5a6dd0363133c5f9271bf33d090c94.tar.bz2
fix(ngTransclude): clear the translusion point before transcluding
when the transluded content is being teleported to the translusion point, we should ensure that the translusion point is empty before appending otherwise we end up with junk before the transcluded content
Diffstat (limited to 'test/ng/compileSpec.js')
-rwxr-xr-xtest/ng/compileSpec.js22
1 files changed, 20 insertions, 2 deletions
diff --git a/test/ng/compileSpec.js b/test/ng/compileSpec.js
index 7c24e1d9..844511a3 100755
--- a/test/ng/compileSpec.js
+++ b/test/ng/compileSpec.js
@@ -2450,7 +2450,7 @@ describe('$compile', function() {
element = $compile('<div parent-directive><div child-directive></div>childContentText;</div>')($rootScope);
$rootScope.$apply();
expect(log).toEqual('parentController; childController');
- expect(element.text()).toBe('parentTemplateText;childTemplateText;childContentText;')
+ expect(element.text()).toBe('childTemplateText;childContentText;')
});
});
@@ -2554,7 +2554,7 @@ describe('$compile', function() {
'</div>')($rootScope);
$rootScope.$apply();
expect(log).toEqual('parentController; childController; babyController');
- expect(element.text()).toBe('parentTemplateText;childTemplateText;childContentText;babyTemplateText;')
+ expect(element.text()).toBe('childContentText;babyTemplateText;')
});
});
@@ -2825,6 +2825,24 @@ describe('$compile', function() {
});
+ it('should clear contents of the ng-translude element before appending transcluded content',
+ function() {
+ module(function() {
+ directive('trans', function() {
+ return {
+ transclude: true,
+ template: '<div ng-transclude>old stuff! </div>'
+ };
+ });
+ });
+ inject(function(log, $rootScope, $compile) {
+ element = $compile('<div trans>unicorn!</div>')($rootScope);
+ $rootScope.$apply();
+ expect(sortedHtml(element.html())).toEqual('<div ng-transclude=""><span>unicorn!</span></div>');
+ });
+ });
+
+
it('should make the result of a transclusion available to the parent directive in post-linking phase (template)',
function() {
module(function() {