From 6afd59bf60823ce5818f14be2778411b108c34b3 Mon Sep 17 00:00:00 2001 From: Subin Varghese Date: Fri, 7 Aug 2015 14:17:10 +0530 Subject: [PATCH 1/3] Updated package dependencies and also updated tests to use Jasmine 2.0 --- package.json | 31 ++++++++++--------- .../appCtrlControllerSpec.js | 2 +- test/ngImprovedTesting/fullnameFilterSpec.js | 2 +- .../permissionServiceSpec.js | 3 +- test/ngImprovedTesting/promisesSpec.js | 2 +- test/vanilla/appCtrlControllerSpec.js | 2 +- test/vanilla/fullnameFilterSpec.js | 2 +- test/vanilla/permissionsServiceSpec.js | 2 +- test/vanilla/promisesSpec.js | 2 +- 9 files changed, 26 insertions(+), 22 deletions(-) diff --git a/package.json b/package.json index 984b183..1159e83 100644 --- a/package.json +++ b/package.json @@ -1,20 +1,23 @@ { "private": true, "devDependencies": { - "bower": "1.3.9", - "grunt": "0.4.5", - "grunt-cli": "0.1.13", - "grunt-contrib-clean": "0.6.0", - "grunt-contrib-concat": "0.5.0", - "grunt-contrib-jshint": "0.10.0", - "grunt-contrib-uglify": "0.5.1", - "grunt-contrib-watch": "0.6.1", - "grunt-karma": "0.8.3", - "karma-coverage": "0.2.6", - "karma-jasmine": "0.1.5", - "karma-phantomjs-launcher": "0.1.4", - "karma-script-launcher": "0.1.0", - "load-grunt-tasks": "0.6.0" + "grunt": "^0.4.5", + "grunt-cli": "^0.1.13", + "grunt-contrib-clean": "^0.6.0", + "grunt-contrib-concat": "^0.5.1", + "grunt-contrib-jshint": "^0.11.2", + "grunt-contrib-uglify": "^0.9.1", + "grunt-contrib-watch": "^0.6.1", + "grunt-karma": "^0.12.0", + "jasmine-core": "^2.3.4", + "karma": "^0.13.8", + "karma-chrome-launcher": "^0.2.0", + "karma-coverage": "^0.5.0", + "karma-jasmine": "^0.3.6", + "karma-phantomjs-launcher": "^0.2.1", + "karma-script-launcher": "^0.1.0", + "load-grunt-tasks": "^3.2.0", + "phantomjs": "^1.9.17" }, "scripts": { "test": "./node_modules/.bin/grunt test", diff --git a/test/ngImprovedTesting/appCtrlControllerSpec.js b/test/ngImprovedTesting/appCtrlControllerSpec.js index bb1a17f..06a08b0 100644 --- a/test/ngImprovedTesting/appCtrlControllerSpec.js +++ b/test/ngImprovedTesting/appCtrlControllerSpec.js @@ -18,7 +18,7 @@ describe('ngImprovedTesting mocked style AppController specification', function( describe('loggedInUserHasAdminAccess method', function() { it('should use permissions#hasAdminAccess and the logged in user', inject(function(permissionServiceMock) { $scope.login('anAdminUser'); - permissionServiceMock.hasAdminAccess.andReturn(true); + permissionServiceMock.hasAdminAccess.and.returnValue(true); expect($scope.loggedInUserHasAdminAccess()).toBe(true); expect(permissionServiceMock.hasAdminAccess).toHaveBeenCalledWith('anAdminUser'); diff --git a/test/ngImprovedTesting/fullnameFilterSpec.js b/test/ngImprovedTesting/fullnameFilterSpec.js index ddd1761..f9f1653 100644 --- a/test/ngImprovedTesting/fullnameFilterSpec.js +++ b/test/ngImprovedTesting/fullnameFilterSpec.js @@ -5,7 +5,7 @@ describe('ngImprovedTesting mocked style fullname filter specification', functio .build()); it('should return the fullname for a user name', inject(function (fullnameFilter, userServiceMock) { - userServiceMock.getUserDetails.andReturn({fullname: 'an admin user'}); + userServiceMock.getUserDetails.and.returnValue({fullname: 'an admin user'}); expect(fullnameFilter('anAdminUser')).toBe('an admin user'); expect(userServiceMock.getUserDetails).toHaveBeenCalledWith('anAdminUser'); diff --git a/test/ngImprovedTesting/permissionServiceSpec.js b/test/ngImprovedTesting/permissionServiceSpec.js index dd2bb7f..6115ea2 100644 --- a/test/ngImprovedTesting/permissionServiceSpec.js +++ b/test/ngImprovedTesting/permissionServiceSpec.js @@ -1,5 +1,6 @@ describe('ngImprovedTesting mocked style PermissionService specification', function() { + debugger; beforeEach(ModuleBuilder.forModules('myApp') .serviceWithMocksFor('permissionService', 'userService') .build()); @@ -8,7 +9,7 @@ describe('ngImprovedTesting mocked style PermissionService specification', funct it('should return true when user details has property: admin == true', inject(function(permissionService, userServiceMock) { - userServiceMock.getUserDetails.andReturn({admin: true}); + userServiceMock.getUserDetails.and.returnValue({admin: true}); expect(permissionService.hasAdminAccess('anAdminUser')).toBe(true); })); diff --git a/test/ngImprovedTesting/promisesSpec.js b/test/ngImprovedTesting/promisesSpec.js index 76445fe..845aa60 100644 --- a/test/ngImprovedTesting/promisesSpec.js +++ b/test/ngImprovedTesting/promisesSpec.js @@ -12,7 +12,7 @@ describe('ngImprovedTesting style of testing promises', function() { afterEach(inject(function($q, $rootScope) { // given - var promiseSuccessCallback = jasmine.createSpy('first').andReturn('someModifiedValue'); + var promiseSuccessCallback = jasmine.createSpy('first').and.returnValue('someModifiedValue'); var chainedPromiseSuccessCallback = jasmine.createSpy('second'); var deferred = $q.defer(); deferred.promise.then(promiseSuccessCallback).then(chainedPromiseSuccessCallback); diff --git a/test/vanilla/appCtrlControllerSpec.js b/test/vanilla/appCtrlControllerSpec.js index 621e1eb..a21ede7 100644 --- a/test/vanilla/appCtrlControllerSpec.js +++ b/test/vanilla/appCtrlControllerSpec.js @@ -23,7 +23,7 @@ describe('Vanilla mocked style AppController specification', function () { describe('loggedInUserHasAdminAccess method', function () { it('should use permissions#hasAdminAccess and the logged in user', function () { $scope.login('anAdminUser'); - permissionServiceMock.hasAdminAccess.andReturn(true); + permissionServiceMock.hasAdminAccess.and.returnValue(true); expect($scope.loggedInUserHasAdminAccess()).toBe(true); expect(permissionServiceMock.hasAdminAccess).toHaveBeenCalledWith('anAdminUser'); diff --git a/test/vanilla/fullnameFilterSpec.js b/test/vanilla/fullnameFilterSpec.js index 1cd09ce..ffd393d 100644 --- a/test/vanilla/fullnameFilterSpec.js +++ b/test/vanilla/fullnameFilterSpec.js @@ -12,7 +12,7 @@ describe('Vanilla mocked style fullname filter specification', function () { it('should return the fullname for a user name', inject(function (fullnameFilter) { - userServiceMock.getUserDetails.andReturn({fullname: 'an admin user'}); + userServiceMock.getUserDetails.and.returnValue({fullname: 'an admin user'}); expect(fullnameFilter('anAdminUser')).toBe('an admin user'); expect(userServiceMock.getUserDetails).toHaveBeenCalledWith('anAdminUser'); diff --git a/test/vanilla/permissionsServiceSpec.js b/test/vanilla/permissionsServiceSpec.js index f71d765..e372918 100644 --- a/test/vanilla/permissionsServiceSpec.js +++ b/test/vanilla/permissionsServiceSpec.js @@ -12,7 +12,7 @@ describe('Vanilla mocked style permissions service specification', function () { describe('hasAdminAccess method', function () { it('should return true when user details has property: admin == true', inject(function (permissionService) { - userServiceMock.getUserDetails.andReturn({admin: true}); + userServiceMock.getUserDetails.and.returnValue({admin: true}); expect(permissionService.hasAdminAccess('anAdminUser')).toBe(true); expect(userServiceMock.getUserDetails).toHaveBeenCalledWith('anAdminUser'); diff --git a/test/vanilla/promisesSpec.js b/test/vanilla/promisesSpec.js index 99f29d6..f665adc 100644 --- a/test/vanilla/promisesSpec.js +++ b/test/vanilla/promisesSpec.js @@ -10,7 +10,7 @@ xdescribe('Vanilla style of testing promises', function() { it('should invoke the then callback of a promise only after a $rootScope.$digest()', function() { // given - var promiseSuccessCallback = jasmine.createSpy('first').andReturn('someModifiedValue'); + var promiseSuccessCallback = jasmine.createSpy('first').and.returnValue('someModifiedValue'); var chainedPromiseSuccessCallback = jasmine.createSpy('second'); var deferred = $q.defer(); deferred.promise.then(promiseSuccessCallback).then(chainedPromiseSuccessCallback); From 06073abc773f24d2308647a8eb802d7ed20d7bf0 Mon Sep 17 00:00:00 2001 From: Subin Varghese Date: Fri, 7 Aug 2015 14:50:04 +0530 Subject: [PATCH 2/3] Removed unnecessary debugger statement --- test/ngImprovedTesting/permissionServiceSpec.js | 1 - 1 file changed, 1 deletion(-) diff --git a/test/ngImprovedTesting/permissionServiceSpec.js b/test/ngImprovedTesting/permissionServiceSpec.js index 6115ea2..4be02e6 100644 --- a/test/ngImprovedTesting/permissionServiceSpec.js +++ b/test/ngImprovedTesting/permissionServiceSpec.js @@ -1,6 +1,5 @@ describe('ngImprovedTesting mocked style PermissionService specification', function() { - debugger; beforeEach(ModuleBuilder.forModules('myApp') .serviceWithMocksFor('permissionService', 'userService') .build()); From 956eb123cd6debef9d234fb378fa2eefd0696c44 Mon Sep 17 00:00:00 2001 From: Subin Varghese Date: Fri, 7 Aug 2015 14:53:51 +0530 Subject: [PATCH 3/3] Added missing bower dependencies --- package.json | 1 + 1 file changed, 1 insertion(+) diff --git a/package.json b/package.json index 1159e83..e3f2178 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,7 @@ { "private": true, "devDependencies": { + "bower": "^1.4.1", "grunt": "^0.4.5", "grunt-cli": "^0.1.13", "grunt-contrib-clean": "^0.6.0",