diff options
Diffstat (limited to 'test')
| -rw-r--r-- | test/angular-mocks.js | 2 | ||||
| -rw-r--r-- | test/servicesSpec.js | 33 |
2 files changed, 33 insertions, 2 deletions
diff --git a/test/angular-mocks.js b/test/angular-mocks.js index c5784ac9..8838b2cd 100644 --- a/test/angular-mocks.js +++ b/test/angular-mocks.js @@ -54,7 +54,7 @@ function MockBrowser() { var expect = expectations[method] || (expectations[method] = {}); return { respond: function(code, response) { - if (!isNumber(code)) { + if (!angular.isNumber(code)) { response = code; code = 200; } diff --git a/test/servicesSpec.js b/test/servicesSpec.js index 60b465d2..c2c13461 100644 --- a/test/servicesSpec.js +++ b/test/servicesSpec.js @@ -31,6 +31,37 @@ describe("service", function(){ scope.$document.addStyleSheet('css/angular.css'); }); + describe("$log", function(){ + it('should use console if present', function(){ + function log(){}; + function warn(){}; + function info(){}; + function error(){}; + var scope = createScope(null, angularService, {$window: {console:{log:log, warn:warn, info:info, error:error}}}); + expect(scope.$log.log).toEqual(log); + expect(scope.$log.warn).toEqual(warn); + expect(scope.$log.info).toEqual(info); + expect(scope.$log.error).toEqual(error); + }); + + it('should use console.log if other not present', function(){ + function log(){}; + var scope = createScope(null, angularService, {$window: {console:{log:log}}}); + expect(scope.$log.log).toEqual(log); + expect(scope.$log.warn).toEqual(log); + expect(scope.$log.info).toEqual(log); + expect(scope.$log.error).toEqual(log); + }); + + it('should use noop if no console', function(){ + var scope = createScope(null, angularService, {$window: {}}); + expect(scope.$log.log).toEqual(noop); + expect(scope.$log.warn).toEqual(noop); + expect(scope.$log.info).toEqual(noop); + expect(scope.$log.error).toEqual(noop); + }); + }); + describe("$location", function(){ it("should inject $location", function(){ scope.$location.parse('http://host:123/p/a/t/h.html?query=value#path?key=value'); @@ -257,7 +288,7 @@ describe("service", function(){ expect(typeof cb).toEqual('function'); expect($xhrError).wasCalledWith( {url:'/req1', method:'GET', data:null, callback:cb}, - {status:404, body:'NotFound'}); + {status:404, response:'NotFound'}); expect(log).toEqual('"second";DONE'); }); |