diff options
| author | Igor Minar | 2013-07-02 17:15:24 -0700 | 
|---|---|---|
| committer | Igor Minar | 2013-07-02 22:35:39 -0700 | 
| commit | cbbe3bfe91526af0523c0b014895f78df6a983ed (patch) | |
| tree | a33cd947d07151378f11b5d167b2a6162ca0d8fd /test/ng | |
| parent | 91e139e52a0a9d2d47337c46c8bd9e04e7466358 (diff) | |
| download | angular.js-cbbe3bfe91526af0523c0b014895f78df6a983ed.tar.bz2 | |
revert: fix(compiler): corrects component transclusion on ...
This reverts commit 15e1a29cd08993b599f390e83a249ec17f753972.
The original commit was fixing two issues - one of them was
preventing attributes that triggered directives that replaced
the compiled node to be merged into the new node.
This change was a breaking change (as seen in the diff of the
tests in this commit) and that's why it's being removed.
A proper fix will follow.
Diffstat (limited to 'test/ng')
| -rwxr-xr-x | test/ng/compileSpec.js | 10 | 
1 files changed, 5 insertions, 5 deletions
| diff --git a/test/ng/compileSpec.js b/test/ng/compileSpec.js index d9480130..e0c68301 100755 --- a/test/ng/compileSpec.js +++ b/test/ng/compileSpec.js @@ -534,7 +534,7 @@ describe('$compile', function() {            expect(div.hasClass('log')).toBe(true);            expect(div.css('width')).toBe('10px');            expect(div.css('height')).toBe('20px'); -          expect(div.attr('replace')).toEqual(undefined); +          expect(div.attr('replace')).toEqual('');            expect(div.attr('high-log')).toEqual('');          })); @@ -856,7 +856,7 @@ describe('$compile', function() {            $rootScope.$digest();            expect(sortedHtml(element)). -            toEqual('<div><b class="hello"><span>Hello, Elvis!</span></b></div>'); +            toEqual('<div><b class="hello"><span replace="">Hello, Elvis!</span></b></div>');          })); @@ -868,7 +868,7 @@ describe('$compile', function() {                $rootScope.$digest();                expect(sortedHtml(element)). -                  toEqual('<span>Hello, Elvis!</span>'); +                  toEqual('<span replace="">Hello, Elvis!</span>');              })); @@ -1077,7 +1077,7 @@ describe('$compile', function() {              var div = element.find('div');              expect(div.attr('i-first')).toEqual(''); -            expect(div.attr('i-second')).toEqual(undefined); +            expect(div.attr('i-second')).toEqual('');              expect(div.attr('i-third')).toEqual('');              expect(div.attr('i-last')).toEqual(''); @@ -1127,7 +1127,7 @@ describe('$compile', function() {              var div = element.find('div');              expect(div.attr('i-first')).toEqual(''); -            expect(div.attr('i-second')).toEqual(undefined); +            expect(div.attr('i-second')).toEqual('');              expect(div.attr('i-third')).toEqual('');              expect(div.attr('i-last')).toEqual(''); | 
