aboutsummaryrefslogtreecommitdiffstats
path: root/test/widget
diff options
context:
space:
mode:
authorMisko Hevery2011-10-25 22:21:21 -0700
committerMisko Hevery2011-11-14 16:39:32 -0800
commitd12df0d360fe0dabdca3591654327834bee2803b (patch)
tree605694ecc056869e9dd20283d8256c92655a44d4 /test/widget
parentd9b58f23f6b3fe5635c3ec5259e6a0002cff78b7 (diff)
downloadangular.js-d12df0d360fe0dabdca3591654327834bee2803b.tar.bz2
refactor(compiler) turn compiler into a service
BREAK - remove angular.compile() since the compile method is now a service and needs to be injected
Diffstat (limited to 'test/widget')
-rw-r--r--test/widget/formSpec.js24
-rw-r--r--test/widget/inputSpec.js30
-rw-r--r--test/widget/selectSpec.js4
3 files changed, 31 insertions, 27 deletions
diff --git a/test/widget/formSpec.js b/test/widget/formSpec.js
index a30f21eb..7a92dbf4 100644
--- a/test/widget/formSpec.js
+++ b/test/widget/formSpec.js
@@ -8,17 +8,17 @@ describe('form', function() {
});
- it('should attach form to DOM', inject(function($rootScope) {
+ it('should attach form to DOM', inject(function($rootScope, $compile) {
doc = angular.element('<form>');
- angular.compile(doc)($rootScope);
+ $compile(doc)($rootScope);
expect(doc.data('$form')).toBeTruthy();
}));
- it('should prevent form submission', inject(function($rootScope) {
+ it('should prevent form submission', inject(function($rootScope, $compile) {
var startingUrl = '' + window.location;
doc = angular.element('<form name="myForm"><input type=submit val=submit>');
- angular.compile(doc)($rootScope);
+ $compile(doc)($rootScope);
browserTrigger(doc.find('input'));
waitsFor(
function() { return true; },
@@ -29,18 +29,18 @@ describe('form', function() {
}));
- it('should publish form to scope', inject(function($rootScope) {
+ it('should publish form to scope', inject(function($rootScope, $compile) {
doc = angular.element('<form name="myForm"></form>');
- angular.compile(doc)($rootScope);
+ $compile(doc)($rootScope);
expect($rootScope.myForm).toBeTruthy();
expect(doc.data('$form')).toBeTruthy();
expect(doc.data('$form')).toEqual($rootScope.myForm);
}));
- it('should have ng-valide/ng-invalid style', inject(function($rootScope) {
+ it('should have ng-valide/ng-invalid style', inject(function($rootScope, $compile) {
doc = angular.element('<form name="myForm"><input type=text ng:model=text required>');
- angular.compile(doc)($rootScope);
+ $compile(doc)($rootScope);
$rootScope.text = 'misko';
$rootScope.$digest();
@@ -54,14 +54,14 @@ describe('form', function() {
}));
- it('should chain nested forms', inject(function($rootScope) {
+ it('should chain nested forms', inject(function($rootScope, $compile) {
doc = angular.element(
'<ng:form name=parent>' +
'<ng:form name=child>' +
'<input type=text ng:model=text name=text>' +
'</ng:form>' +
'</ng:form>');
- angular.compile(doc)($rootScope);
+ $compile(doc)($rootScope);
var parent = $rootScope.parent;
var child = $rootScope.child;
var input = child.text;
@@ -76,14 +76,14 @@ describe('form', function() {
}));
- it('should chain nested forms in repeater', inject(function($rootScope) {
+ it('should chain nested forms in repeater', inject(function($rootScope, $compile) {
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>');
- angular.compile(doc)($rootScope);
+ $compile(doc)($rootScope);
$rootScope.forms = [1];
$rootScope.$digest();
diff --git a/test/widget/inputSpec.js b/test/widget/inputSpec.js
index a889212f..6ab53ab0 100644
--- a/test/widget/inputSpec.js
+++ b/test/widget/inputSpec.js
@@ -2,10 +2,12 @@
describe('widget: input', function() {
var compile = null, element = null, scope = null, defer = null;
+ var $compile = null;
var doc = null;
- beforeEach(inject(function($rootScope) {
+ beforeEach(inject(function($rootScope, $compile) {
scope = $rootScope;
+ set$compile($compile);
element = null;
compile = function(html, parent) {
if (parent) {
@@ -14,13 +16,15 @@ describe('widget: input', function() {
} else {
element = jqLite(html);
}
- angular.compile(element)(scope);
+ $compile(element)(scope);
scope.$apply();
defer = scope.$service('$browser').defer;
return scope;
};
}));
+ function set$compile(c) { $compile = c; }
+
afterEach(function() {
dealoc(element);
dealoc(doc);
@@ -40,7 +44,7 @@ describe('widget: input', function() {
formElement = doc = angular.element('<form name="form"><input ' + prefix +
'type="text" ng:model="name" name="name" ng:change="change()"></form>');
inputElement = formElement.find('input');
- angular.compile(doc)(scope);
+ $compile(doc)(scope);
form = formElement.inheritedData('$form');
};
@@ -90,16 +94,16 @@ describe('widget: input', function() {
});
- it('should change non-html5 types to text', inject(function($rootScope) {
+ it('should change non-html5 types to text', inject(function($rootScope, $compile) {
doc = angular.element('<form name="form"><input type="abc" ng:model="name"></form>');
- angular.compile(doc)($rootScope);
+ $compile(doc)($rootScope);
expect(doc.find('input').attr('type')).toEqual('text');
}));
- it('should not change html5 types to text', inject(function($rootScope) {
+ it('should not change html5 types to text', inject(function($rootScope, $compile) {
doc = angular.element('<form name="form"><input type="number" ng:model="name"></form>');
- angular.compile(doc)($rootScope);
+ $compile(doc)($rootScope);
expect(doc.find('input')[0].getAttribute('type')).toEqual('number');
}));
});
@@ -454,7 +458,7 @@ describe('widget: input', function() {
describe('scope declaration', function() {
- it('should read the declaration from scope', inject(function($rootScope) {
+ it('should read the declaration from scope', inject(function($rootScope, $compile) {
var input, $formFactory;
element = angular.element('<input type="@MyType" ng:model="abc">');
$rootScope.MyType = function($f, i) {
@@ -463,18 +467,18 @@ describe('widget: input', function() {
};
$rootScope.MyType.$inject = ['$formFactory'];
- angular.compile(element)($rootScope);
+ $compile(element)($rootScope);
expect($formFactory).toBe($rootScope.$service('$formFactory'));
expect(input[0]).toBe(element[0]);
}));
- it('should throw an error of Controller not declared in scope', inject(function($rootScope) {
+ it('should throw an error of Controller not declared in scope', inject(function($rootScope, $compile) {
var input, $formFactory;
element = angular.element('<input type="@DontExist" ng:model="abc">');
var error;
try {
- angular.compile(element)($rootScope);
+ $compile(element)($rootScope);
error = 'no error thrown';
} catch (e) {
error = e;
@@ -577,9 +581,9 @@ describe('widget: input', function() {
{'ng:maxlength': 3});
- it('should throw an error when scope pattern can\'t be found', inject(function($rootScope) {
+ it('should throw an error when scope pattern can\'t be found', inject(function($rootScope, $compile) {
var el = jqLite('<input ng:model="foo" ng:pattern="fooRegexp">');
- angular.compile(el)($rootScope);
+ $compile(el)($rootScope);
el.val('xx');
browserTrigger(el, 'keydown');
diff --git a/test/widget/selectSpec.js b/test/widget/selectSpec.js
index 31e5223d..5d92e674 100644
--- a/test/widget/selectSpec.js
+++ b/test/widget/selectSpec.js
@@ -3,7 +3,7 @@
describe('select', function() {
var compile = null, element = null, scope = null;
- beforeEach(inject(function($rootScope) {
+ beforeEach(inject(function($compile, $rootScope) {
scope = $rootScope;
element = null;
compile = function(html, parent) {
@@ -13,7 +13,7 @@ describe('select', function() {
} else {
element = jqLite(html);
}
- angular.compile(element)($rootScope);
+ $compile(element)($rootScope);
scope.$apply();
return scope;
};