aboutsummaryrefslogtreecommitdiffstats
path: root/test/service/logSpec.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/service/logSpec.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/service/logSpec.js')
-rw-r--r--test/service/logSpec.js114
1 files changed, 55 insertions, 59 deletions
diff --git a/test/service/logSpec.js b/test/service/logSpec.js
index c4efb8c5..8c56d99e 100644
--- a/test/service/logSpec.js
+++ b/test/service/logSpec.js
@@ -1,65 +1,61 @@
'use strict';
describe('$log', function() {
- var scope;
-
- beforeEach(function() {
- scope = angular.scope();
- });
-
-
- afterEach(function() {
- dealoc(scope);
- });
-
-
- it('should use console if present', function() {
- var logger = "";
- function log() { logger+= 'log;'; }
- function warn() { logger+= 'warn;'; }
- function info() { logger+= 'info;'; }
- function error() { logger+= 'error;'; }
- var scope = createScope({$log: $logFactory},
- {$exceptionHandler: rethrow,
- $window: {console: {log: log,
- warn: warn,
- info: info,
- error: error}}}),
- $log = scope.$service('$log');
-
- $log.log();
- $log.warn();
- $log.info();
- $log.error();
- expect(logger).toEqual('log;warn;info;error;');
- });
-
-
- it('should use console.log() if other not present', function() {
- var logger = "";
- function log() { logger+= 'log;'; }
- var scope = createScope({$log: $logFactory},
- {$window: {console:{log:log}},
- $exceptionHandler: rethrow});
- var $log = scope.$service('$log');
- $log.log();
- $log.warn();
- $log.info();
- $log.error();
- expect(logger).toEqual('log;log;log;log;');
- });
-
-
- it('should use noop if no console', function() {
- var scope = createScope({$log: $logFactory},
- {$window: {},
- $exceptionHandler: rethrow}),
- $log = scope.$service('$log');
- $log.log();
- $log.warn();
- $log.info();
- $log.error();
- });
+ var $window;
+ var logger;
+
+ function log() { logger+= 'log;'; }
+ function warn() { logger+= 'warn;'; }
+ function info() { logger+= 'info;'; }
+ function error() { logger+= 'error;'; }
+
+ beforeEach(inject(function(service){
+ $window = {};
+ logger = '';
+ service('$log', $logFactory);
+ service('$exceptionHandler', valueFn(rethrow));
+ service('$window', valueFn($window));
+ }));
+
+ it('should use console if present', inject(
+ function(){
+ $window.console = {log: log,
+ warn: warn,
+ info: info,
+ error: error};
+ },
+ function($log) {
+ $log.log();
+ $log.warn();
+ $log.info();
+ $log.error();
+ expect(logger).toEqual('log;warn;info;error;');
+ }
+ ));
+
+
+ it('should use console.log() if other not present', inject(
+ function(){
+ $window.console = {log: log};
+ },
+ function($log) {
+ $log.log();
+ $log.warn();
+ $log.info();
+ $log.error();
+ expect(logger).toEqual('log;log;log;log;');
+ }
+ ));
+
+
+ it('should use noop if no console', inject(
+ function($log) {
+ $log.log();
+ $log.warn();
+ $log.info();
+ $log.error();
+ }
+ ));
describe('$log.error', function() {