aboutsummaryrefslogtreecommitdiffstats
path: root/test/widget/formSpec.js
diff options
context:
space:
mode:
authorMisko Hevery2011-10-17 16:56:56 -0700
committerMisko Hevery2011-11-14 16:39:31 -0800
commit48697a2b86dbb12ea8de64cc5fece7caf68b321e (patch)
tree1fa50659f0bb5de2640dea2a2e5bb5628f2bb14a /test/widget/formSpec.js
parent93b777c916ccff243c5a6080bf5f39860ac7bf39 (diff)
downloadangular.js-48697a2b86dbb12ea8de64cc5fece7caf68b321e.tar.bz2
refactor(injector): turn scope into a service
- turn scope into a $rootScope service. - injector is now a starting point for creating angular application. - added inject() method which wraps jasmine its/beforeEach/afterEach, and which allows configuration and injection of services. - refactor tests to use inject() where possible BREAK: - removed angular.scope() method
Diffstat (limited to 'test/widget/formSpec.js')
-rw-r--r--test/widget/formSpec.js58
1 files changed, 29 insertions, 29 deletions
diff --git a/test/widget/formSpec.js b/test/widget/formSpec.js
index 4f5630ba..a30f21eb 100644
--- a/test/widget/formSpec.js
+++ b/test/widget/formSpec.js
@@ -8,17 +8,17 @@ describe('form', function() {
});
- it('should attach form to DOM', function() {
+ it('should attach form to DOM', inject(function($rootScope) {
doc = angular.element('<form>');
- var scope = angular.compile(doc)();
+ angular.compile(doc)($rootScope);
expect(doc.data('$form')).toBeTruthy();
- });
+ }));
- it('should prevent form submission', function() {
+ it('should prevent form submission', inject(function($rootScope) {
var startingUrl = '' + window.location;
doc = angular.element('<form name="myForm"><input type=submit val=submit>');
- var scope = angular.compile(doc)();
+ angular.compile(doc)($rootScope);
browserTrigger(doc.find('input'));
waitsFor(
function() { return true; },
@@ -26,44 +26,44 @@ describe('form', function() {
runs(function() {
expect('' + window.location).toEqual(startingUrl);
});
- });
+ }));
- it('should publish form to scope', function() {
+ it('should publish form to scope', inject(function($rootScope) {
doc = angular.element('<form name="myForm"></form>');
- var scope = angular.compile(doc)();
- expect(scope.myForm).toBeTruthy();
+ angular.compile(doc)($rootScope);
+ expect($rootScope.myForm).toBeTruthy();
expect(doc.data('$form')).toBeTruthy();
- expect(doc.data('$form')).toEqual(scope.myForm);
- });
+ expect(doc.data('$form')).toEqual($rootScope.myForm);
+ }));
- it('should have ng-valide/ng-invalid style', function() {
+ it('should have ng-valide/ng-invalid style', inject(function($rootScope) {
doc = angular.element('<form name="myForm"><input type=text ng:model=text required>');
- var scope = angular.compile(doc)();
- scope.text = 'misko';
- scope.$digest();
+ angular.compile(doc)($rootScope);
+ $rootScope.text = 'misko';
+ $rootScope.$digest();
expect(doc.hasClass('ng-valid')).toBe(true);
expect(doc.hasClass('ng-invalid')).toBe(false);
- scope.text = '';
- scope.$digest();
+ $rootScope.text = '';
+ $rootScope.$digest();
expect(doc.hasClass('ng-valid')).toBe(false);
expect(doc.hasClass('ng-invalid')).toBe(true);
- });
+ }));
- it('should chain nested forms', function() {
+ it('should chain nested forms', inject(function($rootScope) {
doc = angular.element(
'<ng:form name=parent>' +
'<ng:form name=child>' +
'<input type=text ng:model=text name=text>' +
'</ng:form>' +
'</ng:form>');
- var scope = angular.compile(doc)();
- var parent = scope.parent;
- var child = scope.child;
+ angular.compile(doc)($rootScope);
+ var parent = $rootScope.parent;
+ var child = $rootScope.child;
var input = child.text;
input.$emit('$invalid', 'MyError');
@@ -73,21 +73,21 @@ describe('form', function() {
input.$emit('$valid', 'MyError');
expect(parent.$error.MyError).toBeUndefined();
expect(child.$error.MyError).toBeUndefined();
- });
+ }));
- it('should chain nested forms in repeater', function() {
+ it('should chain nested forms in repeater', inject(function($rootScope) {
doc = angular.element(
'<ng:form name=parent>' +
'<ng:form ng:repeat="f in forms" name=child>' +
'<input type=text ng:model=text name=text>' +
'</ng:form>' +
'</ng:form>');
- var scope = angular.compile(doc)();
- scope.forms = [1];
- scope.$digest();
+ angular.compile(doc)($rootScope);
+ $rootScope.forms = [1];
+ $rootScope.$digest();
- var parent = scope.parent;
+ var parent = $rootScope.parent;
var child = doc.find('input').scope().child;
var input = child.text;
expect(parent).toBeDefined();
@@ -102,5 +102,5 @@ describe('form', function() {
input.$emit('$valid', 'myRule');
expect(parent.$error.myRule).toBeUndefined();
expect(child.$error.myRule).toBeUndefined();
- });
+ }));
});