aboutsummaryrefslogtreecommitdiffstats
path: root/test/service/scopeSpec.js
diff options
context:
space:
mode:
authorVojta Jina2011-11-29 21:51:59 -0800
committerVojta Jina2012-01-23 11:05:36 -0800
commit992c790f0786fa45c1cc3710f29bf49c7c322ba7 (patch)
tree581d06ea9ba275a14d5891d83b2df03f9930bd45 /test/service/scopeSpec.js
parentf5343c9fd3c7cd0fefdb4d71d2b579dbae998d6a (diff)
downloadangular.js-992c790f0786fa45c1cc3710f29bf49c7c322ba7.tar.bz2
refactor(scope): separate controller from scope
Controller is standalone object, created using "new" operator, not messed up with scope anymore. Instead, related scope is injected as $scope. See design proposal: https://docs.google.com/document/pub?id=1SsgVj17ec6tnZEX3ugsvg0rVVR11wTso5Md-RdEmC0k Closes #321 Closes #425 Breaks controller methods are not exported to scope automatically Breaks Scope#$new() does not take controller as argument anymore
Diffstat (limited to 'test/service/scopeSpec.js')
-rw-r--r--test/service/scopeSpec.js31
1 files changed, 1 insertions, 30 deletions
diff --git a/test/service/scopeSpec.js b/test/service/scopeSpec.js
index 96271bc9..68ef2834 100644
--- a/test/service/scopeSpec.js
+++ b/test/service/scopeSpec.js
@@ -53,35 +53,6 @@ describe('Scope', function() {
$rootScope.a = 123;
expect(child.a).toEqual(123);
}));
-
-
- it('should instantiate controller and bind functions', inject(function($rootScope) {
- function Cntl($browser, name) {
- this.$browser = $browser;
- this.callCount = 0;
- this.name = name;
- }
- Cntl.$inject = ['$browser', 'name'];
-
- Cntl.prototype = {
- myFn: function() {
- expect(this).toEqual(cntl);
- this.callCount++;
- }
- };
-
- var cntl = $rootScope.$new(Cntl, {name:'misko'});
-
- expect($rootScope.$browser).toBeUndefined();
- expect($rootScope.myFn).toBeUndefined();
-
- expect(cntl.$browser).toBeDefined();
- expect(cntl.name).toEqual('misko');
-
- cntl.myFn();
- cntl.$new().myFn();
- expect(cntl.callCount).toEqual(2);
- }));
});
@@ -341,7 +312,7 @@ describe('Scope', function() {
$rootScope.$digest();
expect(isNaN(log.shift())).toBe(true); //jasmine's toBe and toEqual don't work well with NaNs
expect(log).toEqual([undefined, '', false, {}, 23]);
- log = []
+ log = [];
$rootScope.$digest();
expect(log).toEqual([]);
}));