diff options
| author | Igor Minar | 2012-08-31 13:41:10 -0700 |
|---|---|---|
| committer | Igor Minar | 2012-08-31 13:59:03 -0700 |
| commit | 5e9041818bca770c9261a3963e05dbb3c7ca2f06 (patch) | |
| tree | 9ca0b713d32ecb9d19a611759043b31f4270d18b /test | |
| parent | db861db1f239bdb2c13f157e2632cb2bc76f0432 (diff) | |
| download | angular.js-5e9041818bca770c9261a3963e05dbb3c7ca2f06.tar.bz2 | |
revert: fix(ng-repeat) to work with primitive types
this was accidentaly merged in. the commit is not ready yet
and we don't have CLA signature.
This reverts commit 98d489712eff7559bce87ae53bd242112a875c1a.
Diffstat (limited to 'test')
| -rw-r--r-- | test/ApiSpecs.js | 4 | ||||
| -rw-r--r-- | test/ng/directive/ngRepeatSpec.js | 115 |
2 files changed, 0 insertions, 119 deletions
diff --git a/test/ApiSpecs.js b/test/ApiSpecs.js index 1e52cf44..35a85bd4 100644 --- a/test/ApiSpecs.js +++ b/test/ApiSpecs.js @@ -31,11 +31,7 @@ describe('api', function() { map.push('key', 'a'); map.push('key', 'b'); expect(map[hashKey('key')]).toEqual(['a', 'b']); - expect(map.peek('key')).toEqual('a'); - expect(map[hashKey('key')]).toEqual(['a', 'b']); expect(map.shift('key')).toEqual('a'); - expect(map.peek('key')).toEqual('b'); - expect(map[hashKey('key')]).toEqual(['b']); expect(map.shift('key')).toEqual('b'); expect(map.shift('key')).toEqual(undefined); expect(map[hashKey('key')]).toEqual(undefined); diff --git a/test/ng/directive/ngRepeatSpec.js b/test/ng/directive/ngRepeatSpec.js index 83f23cec..72382591 100644 --- a/test/ng/directive/ngRepeatSpec.js +++ b/test/ng/directive/ngRepeatSpec.js @@ -37,89 +37,6 @@ describe('ngRepeat', function() { })); - it('should ngRepeat over array of primitive correctly', inject(function($rootScope, $compile) { - element = $compile( - '<ul>' + - '<li ng-repeat="item in items" ng-init="suffix = \';\'" ng-bind="item + suffix"></li>' + - '</ul>')($rootScope); - - Array.prototype.extraProperty = "should be ignored"; - // INIT - $rootScope.items = [true, true, true]; - $rootScope.$digest(); - expect(element.find('li').length).toEqual(3); - expect(element.text()).toEqual('true;true;true;'); - delete Array.prototype.extraProperty; - - $rootScope.items = [false, true, true]; - $rootScope.$digest(); - expect(element.find('li').length).toEqual(3); - expect(element.text()).toEqual('false;true;true;'); - - $rootScope.items = [false, true, false]; - $rootScope.$digest(); - expect(element.find('li').length).toEqual(3); - expect(element.text()).toEqual('false;true;false;'); - - $rootScope.items = [true]; - $rootScope.$digest(); - expect(element.find('li').length).toEqual(1); - expect(element.text()).toEqual('true;'); - - $rootScope.items = [true, true, false]; - $rootScope.$digest(); - expect(element.find('li').length).toEqual(3); - expect(element.text()).toEqual('true;true;false;'); - - $rootScope.items = [true, false, false]; - $rootScope.$digest(); - expect(element.find('li').length).toEqual(3); - expect(element.text()).toEqual('true;false;false;'); - - // string - $rootScope.items = ['a', 'a', 'a']; - $rootScope.$digest(); - expect(element.find('li').length).toEqual(3); - expect(element.text()).toEqual('a;a;a;'); - - $rootScope.items = ['ab', 'a', 'a']; - $rootScope.$digest(); - expect(element.find('li').length).toEqual(3); - expect(element.text()).toEqual('ab;a;a;'); - - $rootScope.items = ['test']; - $rootScope.$digest(); - expect(element.find('li').length).toEqual(1); - expect(element.text()).toEqual('test;'); - - $rootScope.items = ['same', 'value']; - $rootScope.$digest(); - expect(element.find('li').length).toEqual(2); - expect(element.text()).toEqual('same;value;'); - - // number - $rootScope.items = [12, 12, 12]; - $rootScope.$digest(); - expect(element.find('li').length).toEqual(3); - expect(element.text()).toEqual('12;12;12;'); - - $rootScope.items = [53, 12, 27]; - $rootScope.$digest(); - expect(element.find('li').length).toEqual(3); - expect(element.text()).toEqual('53;12;27;'); - - $rootScope.items = [89]; - $rootScope.$digest(); - expect(element.find('li').length).toEqual(1); - expect(element.text()).toEqual('89;'); - - $rootScope.items = [89, 23]; - $rootScope.$digest(); - expect(element.find('li').length).toEqual(2); - expect(element.text()).toEqual('89;23;'); - })); - - it('should ngRepeat over object', inject(function($rootScope, $compile) { element = $compile( '<ul>' + @@ -130,38 +47,6 @@ describe('ngRepeat', function() { expect(element.text()).toEqual('misko:swe;shyam:set;'); })); - - it('should ngRepeat over object with primitive value correctly', inject(function($rootScope, $compile) { - element = $compile( - '<ul>' + - '<li ng-repeat="(key, value) in items" ng-bind="key + \':\' + value + \';\' "></li>' + - '</ul>')($rootScope); - $rootScope.items = {misko:'true', shyam:'true', zhenbo: 'true'}; - $rootScope.$digest(); - expect(element.find('li').length).toEqual(3); - expect(element.text()).toEqual('misko:true;shyam:true;zhenbo:true;'); - - $rootScope.items = {misko:'false', shyam:'true', zhenbo: 'true'}; - $rootScope.$digest(); - expect(element.find('li').length).toEqual(3); - expect(element.text()).toEqual('misko:false;shyam:true;zhenbo:true;'); - - $rootScope.items = {misko:'false', shyam:'false', zhenbo: 'false'}; - $rootScope.$digest(); - expect(element.find('li').length).toEqual(3); - expect(element.text()).toEqual('misko:false;shyam:false;zhenbo:false;'); - - $rootScope.items = {misko:'true'}; - $rootScope.$digest(); - expect(element.find('li').length).toEqual(1); - expect(element.text()).toEqual('misko:true;'); - - $rootScope.items = {shyam:'true', zhenbo: 'false'}; - $rootScope.$digest(); - expect(element.find('li').length).toEqual(2); - expect(element.text()).toEqual('shyam:true;zhenbo:false;'); - })); - it('should not ngRepeat over parent properties', inject(function($rootScope, $compile) { var Class = function() {}; |
