Skip to content

Updated package dependencies and also updated tests to use Jasmine 2.0 #4

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
subinvarghesein wants to merge 3 commits into
base: master
Choose a base branch
from
Open

Updated package dependencies and also updated tests to use Jasmine 2.0 #4

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
6afd59b
Updated package dependencies and also updated tests to use Jasmine 2.0
Aug 7, 2015
06073ab
Removed unnecessary debugger statement
Aug 7, 2015
956eb12
Added missing bower dependencies
Aug 7, 2015
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
32 changes: 18 additions & 14 deletions package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,20 +1,24 @@
{
"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"
"bower": "^1.4.1",
"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",
Expand Down
2 changes: 1 addition & 1 deletion test/ngImprovedTesting/appCtrlControllerSpec.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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');
Expand Down
2 changes: 1 addition & 1 deletion test/ngImprovedTesting/fullnameFilterSpec.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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');
Expand Down
2 changes: 1 addition & 1 deletion test/ngImprovedTesting/permissionServiceSpec.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,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);
}));
Expand Down
2 changes: 1 addition & 1 deletion test/ngImprovedTesting/promisesSpec.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down
2 changes: 1 addition & 1 deletion test/vanilla/appCtrlControllerSpec.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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');
Expand Down
2 changes: 1 addition & 1 deletion test/vanilla/fullnameFilterSpec.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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');
Expand Down
2 changes: 1 addition & 1 deletion test/vanilla/permissionsServiceSpec.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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');
Expand Down
2 changes: 1 addition & 1 deletion test/vanilla/promisesSpec.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down