diff options
| author | Matias Niemelä | 2013-06-05 18:12:00 -0400 | 
|---|---|---|
| committer | Misko Hevery | 2013-06-06 22:06:50 -0700 | 
| commit | 9faabd1ba0b1929785bcf166dc0ff60008e7c442 (patch) | |
| tree | 53412b42b9276cd7d5c679c65ea065d3679c6b77 /test/AngularSpec.js | |
| parent | 65f5e856a161e7c91b9ebde1360242dc704d0510 (diff) | |
| download | angular.js-9faabd1ba0b1929785bcf166dc0ff60008e7c442.tar.bz2 | |
chore(AngularPublic): remove angular.noConflict feature
Diffstat (limited to 'test/AngularSpec.js')
| -rw-r--r-- | test/AngularSpec.js | 22 | 
1 files changed, 0 insertions, 22 deletions
| diff --git a/test/AngularSpec.js b/test/AngularSpec.js index de029623..790f605a 100644 --- a/test/AngularSpec.js +++ b/test/AngularSpec.js @@ -877,26 +877,4 @@ describe('angular', function() {      }));    }); -  describe('noConflict', function() { -    var globalAngular; -    beforeEach(function() { -      globalAngular = angular; -    }); - -    afterEach(function() { -      angular = globalAngular; -    }); - -    it('should return angular', function() { -      var a = angular.noConflict(); -      expect(a).toBe(globalAngular); -    }); - -    it('should restore original angular', function() { -      var a = angular.noConflict(); -      expect(angular).toBeUndefined(); -    }); - -  }); -  }); | 
