aboutsummaryrefslogtreecommitdiffstats
path: root/test
diff options
context:
space:
mode:
authorVojta Jina2012-03-08 15:59:32 -0800
committerVojta Jina2012-03-09 10:10:28 -0800
commit00d4427388eeec81d434f9ee96bb7ccc70190923 (patch)
treecd85a694576045cf822ef6e043f5ad87f1df1a8c /test
parente0c9551fd7c716d9d71ed6f4f1d2f5911f53032c (diff)
downloadangular.js-00d4427388eeec81d434f9ee96bb7ccc70190923.tar.bz2
refactor($provide) Rename service -> provider
It registers a provider class, so this makes more sense. Breaks Rename $provide.service -> $provide.provider
Diffstat (limited to 'test')
-rw-r--r--test/InjectorSpec.js16
-rw-r--r--test/loaderSpec.js4
-rw-r--r--test/service/exceptionHandlerSpec.js4
-rw-r--r--test/service/logSpec.js2
4 files changed, 13 insertions, 13 deletions
diff --git a/test/InjectorSpec.js b/test/InjectorSpec.js
index 87373228..b0682b29 100644
--- a/test/InjectorSpec.js
+++ b/test/InjectorSpec.js
@@ -180,7 +180,7 @@ describe('injector', function() {
var injector = createInjector([function($provide) {
$provide.value('value', 'value;');
$provide.factory('fn', valueFn('function;'));
- $provide.service('service', function() {
+ $provide.provider('service', function() {
this.$get = valueFn('service;');
});
}, function(valueProvider, fnProvider, serviceProvider) {
@@ -315,31 +315,31 @@ describe('injector', function() {
});
- describe('service', function() {
- it('should configure $provide service object', function() {
+ describe('provider', function() {
+ it('should configure $provide provider object', function() {
expect(createInjector([function($provide) {
- $provide.service('value', {
+ $provide.provider('value', {
$get: valueFn('abc')
});
}]).get('value')).toEqual('abc');
});
- it('should configure $provide service type', function() {
+ it('should configure $provide provider type', function() {
function Type() {};
Type.prototype.$get = function() {
expect(this instanceof Type).toBe(true);
return 'abc';
};
expect(createInjector([function($provide) {
- $provide.service('value', Type);
+ $provide.provider('value', Type);
}]).get('value')).toEqual('abc');
});
- it('should configure a set of services', function() {
+ it('should configure a set of providers', function() {
expect(createInjector([function($provide) {
- $provide.service({value: valueFn({$get:Array})});
+ $provide.provider({value: valueFn({$get:Array})});
}]).get('value')).toEqual([]);
});
});
diff --git a/test/loaderSpec.js b/test/loaderSpec.js
index 5d234b6d..ea1046f7 100644
--- a/test/loaderSpec.js
+++ b/test/loaderSpec.js
@@ -32,7 +32,7 @@ describe('module loader', function() {
var myModule = window.angular.module('my', ['other'], 'config');
expect(myModule.
- service('sk', 'sv').
+ provider('sk', 'sv').
factory('fk', 'fv').
value('k', 'v').
filter('f', 'ff').
@@ -45,7 +45,7 @@ describe('module loader', function() {
expect(myModule._invokeQueue).toEqual([
['$provide', 'constant', ['abc', 123] ],
['$injector', 'invoke', ['config'] ],
- ['$provide', 'service', ['sk', 'sv'] ],
+ ['$provide', 'provider', ['sk', 'sv'] ],
['$provide', 'factory', ['fk', 'fv'] ],
['$provide', 'value', ['k', 'v'] ],
['$filterProvider', 'register', ['f', 'ff'] ],
diff --git a/test/service/exceptionHandlerSpec.js b/test/service/exceptionHandlerSpec.js
index 4ab94679..3f3dd800 100644
--- a/test/service/exceptionHandlerSpec.js
+++ b/test/service/exceptionHandlerSpec.js
@@ -3,7 +3,7 @@
describe('$exceptionHandler', function() {
it('should log errors with single argument', function() {
module(function($provide){
- $provide.service('$exceptionHandler', $ExceptionHandlerProvider);
+ $provide.provider('$exceptionHandler', $ExceptionHandlerProvider);
});
inject(function($log, $exceptionHandler) {
$exceptionHandler('myError');
@@ -14,7 +14,7 @@ describe('$exceptionHandler', function() {
it('should log errors with multiple arguments', function() {
module(function($provide){
- $provide.service('$exceptionHandler', $ExceptionHandlerProvider);
+ $provide.provider('$exceptionHandler', $ExceptionHandlerProvider);
});
inject(function($log, $exceptionHandler) {
$exceptionHandler('myError', 'comment');
diff --git a/test/service/logSpec.js b/test/service/logSpec.js
index df2bc933..72ce6a5c 100644
--- a/test/service/logSpec.js
+++ b/test/service/logSpec.js
@@ -12,7 +12,7 @@ describe('$log', function() {
beforeEach(module(function($provide){
$window = {};
logger = '';
- $provide.service('$log', $LogProvider);
+ $provide.provider('$log', $LogProvider);
$provide.value('$exceptionHandler', angular.mock.rethrow);
$provide.value('$window', $window);
}));