From 85afb0be01de8c7d4cb30cc029817b148910cd5e Mon Sep 17 00:00:00 2001 From: Tankred Hase Date: Thu, 9 Oct 2014 15:56:35 +0200 Subject: [PATCH] Fix angulat mocks for unit tests --- Gruntfile.js | 2 +- package.json | 1 - test/unit/account-ctrl-test.js | 2 +- test/unit/add-account-ctrl-test.js | 2 +- test/unit/contacts-ctrl-test.js | 2 +- test/unit/dialog-ctrl-test.js | 2 +- test/unit/login-ctrl-test.js | 2 +- test/unit/login-existing-ctrl-test.js | 2 +- test/unit/login-initial-ctrl-test.js | 2 +- test/unit/login-new-device-ctrl-test.js | 2 +- test/unit/login-privatekey-download-ctrl-test.js | 2 +- test/unit/login-set-credentials-ctrl-test.js | 2 +- test/unit/mail-list-ctrl-test.js | 2 +- test/unit/navigation-ctrl-test.js | 2 +- test/unit/privatekey-upload-ctrl-test.js | 2 +- test/unit/read-ctrl-test.js | 2 +- test/unit/set-passphrase-ctrl-test.js | 2 +- test/unit/write-ctrl-test.js | 2 +- 18 files changed, 17 insertions(+), 18 deletions(-) diff --git a/Gruntfile.js b/Gruntfile.js index 147da86..e0cd425 100644 --- a/Gruntfile.js +++ b/Gruntfile.js @@ -222,7 +222,7 @@ module.exports = function(grunt) { 'src/lib/angular/angular-animate.min.js', 'src/lib/ngtagsinput/ng-tags-input.min.js', 'node_modules/ng-infinite-scroll/build/ng-infinite-scroll.min.js', - 'node_modules/angular-mocks/angular-mocks.js', + 'node_modules/angularjs/src/ngMock/angular-mocks.js', 'src/lib/fastclick/fastclick.js', 'src/lib/lawnchair/lawnchair-git.js', 'src/lib/lawnchair/lawnchair-adapter-webkit-sqlite-git.js', diff --git a/package.json b/package.json index 7f82920..fcacaa1 100644 --- a/package.json +++ b/package.json @@ -46,7 +46,6 @@ "wo-smtpclient": "^0.3.8" }, "devDependencies": { - "angular-mocks": "^1.2.25", "angularjs": "https://github.com/whiteout-io/angular.js/tarball/npm-version", "browsercrow": "https://github.com/whiteout-io/browsercrow/tarball/master", "browsersmtp": "https://github.com/whiteout-io/browsersmtp/tarball/master", diff --git a/test/unit/account-ctrl-test.js b/test/unit/account-ctrl-test.js index 5deacd7..5eba46d 100644 --- a/test/unit/account-ctrl-test.js +++ b/test/unit/account-ctrl-test.js @@ -1,6 +1,6 @@ 'use strict'; -var mocks = angular.mocks, +var mocks = angular.mock, AccountCtrl = require('../../src/js/controller/account'), PGP = require('../../src/js/crypto/pgp'), dl = require('../../src/js/util/download'), diff --git a/test/unit/add-account-ctrl-test.js b/test/unit/add-account-ctrl-test.js index 69d2430..baf3ed4 100644 --- a/test/unit/add-account-ctrl-test.js +++ b/test/unit/add-account-ctrl-test.js @@ -1,6 +1,6 @@ 'use strict'; -var mocks = angular.mocks, +var mocks = angular.mock, AddAccountCtrl = require('../../src/js/controller/add-account'), Auth = require('../../src/js/bo/auth'), AdminDao = require('../../src/js/dao/admin-dao'), diff --git a/test/unit/contacts-ctrl-test.js b/test/unit/contacts-ctrl-test.js index 05212c4..d91061e 100644 --- a/test/unit/contacts-ctrl-test.js +++ b/test/unit/contacts-ctrl-test.js @@ -1,6 +1,6 @@ 'use strict'; -var mocks = angular.mocks, +var mocks = angular.mock, ContactsCtrl = require('../../src/js/controller/contacts'), appController = require('../../src/js/app-controller'), KeychainDAO = require('../../src/js/dao/keychain-dao'), diff --git a/test/unit/dialog-ctrl-test.js b/test/unit/dialog-ctrl-test.js index 191cd4f..48ac9d9 100644 --- a/test/unit/dialog-ctrl-test.js +++ b/test/unit/dialog-ctrl-test.js @@ -1,6 +1,6 @@ 'use strict'; -var mocks = angular.mocks, +var mocks = angular.mock, DialogCtrl = require('../../src/js/controller/dialog'); describe('Dialog Controller unit test', function() { diff --git a/test/unit/login-ctrl-test.js b/test/unit/login-ctrl-test.js index 65ad8aa..cf312fd 100644 --- a/test/unit/login-ctrl-test.js +++ b/test/unit/login-ctrl-test.js @@ -1,6 +1,6 @@ 'use strict'; -var mocks = angular.mocks, +var mocks = angular.mock, LoginCtrl = require('../../src/js/controller/login'), EmailDAO = require('../../src/js/dao/email-dao'), Auth = require('../../src/js/bo/auth'), diff --git a/test/unit/login-existing-ctrl-test.js b/test/unit/login-existing-ctrl-test.js index 70843cb..521b954 100644 --- a/test/unit/login-existing-ctrl-test.js +++ b/test/unit/login-existing-ctrl-test.js @@ -1,7 +1,7 @@ 'use strict'; var Auth = require('../../src/js/bo/auth'), - mocks = angular.mocks, + mocks = angular.mock, LoginExistingCtrl = require('../../src/js/controller/login-existing'), EmailDAO = require('../../src/js/dao/email-dao'), KeychainDAO = require('../../src/js/dao/keychain-dao'), diff --git a/test/unit/login-initial-ctrl-test.js b/test/unit/login-initial-ctrl-test.js index 17fdbfe..170db85 100644 --- a/test/unit/login-initial-ctrl-test.js +++ b/test/unit/login-initial-ctrl-test.js @@ -1,7 +1,7 @@ 'use strict'; var Auth = require('../../src/js/bo/auth'), - mocks = angular.mocks, + mocks = angular.mock, LoginInitialCtrl = require('../../src/js/controller/login-initial'), PGP = require('../../src/js/crypto/pgp'), EmailDAO = require('../../src/js/dao/email-dao'), diff --git a/test/unit/login-new-device-ctrl-test.js b/test/unit/login-new-device-ctrl-test.js index 3577949..2115bb2 100644 --- a/test/unit/login-new-device-ctrl-test.js +++ b/test/unit/login-new-device-ctrl-test.js @@ -1,6 +1,6 @@ 'use strict'; -var mocks = angular.mocks, +var mocks = angular.mock, PGP = require('../../src/js/crypto/pgp'), LoginNewDeviceCtrl = require('../../src/js/controller/login-new-device'), KeychainDAO = require('../../src/js/dao/keychain-dao'), diff --git a/test/unit/login-privatekey-download-ctrl-test.js b/test/unit/login-privatekey-download-ctrl-test.js index 2c6d62d..b8986f3 100644 --- a/test/unit/login-privatekey-download-ctrl-test.js +++ b/test/unit/login-privatekey-download-ctrl-test.js @@ -1,6 +1,6 @@ 'use strict'; -var mocks = angular.mocks, +var mocks = angular.mock, Auth = require('../../src/js/bo/auth'), LoginPrivateKeyDownloadCtrl = require('../../src/js/controller/login-privatekey-download'), EmailDAO = require('../../src/js/dao/email-dao'), diff --git a/test/unit/login-set-credentials-ctrl-test.js b/test/unit/login-set-credentials-ctrl-test.js index 4b54066..54d6c25 100644 --- a/test/unit/login-set-credentials-ctrl-test.js +++ b/test/unit/login-set-credentials-ctrl-test.js @@ -1,6 +1,6 @@ 'use strict'; -var mocks = angular.mocks, +var mocks = angular.mock, Auth = require('../../src/js/bo/auth'), ConnectionDoctor = require('../../src/js/util/connection-doctor'), SetCredentialsCtrl = require('../../src/js/controller/login-set-credentials'), diff --git a/test/unit/mail-list-ctrl-test.js b/test/unit/mail-list-ctrl-test.js index 7fe4e98..eed0b50 100644 --- a/test/unit/mail-list-ctrl-test.js +++ b/test/unit/mail-list-ctrl-test.js @@ -1,6 +1,6 @@ 'use strict'; -var mocks = angular.mocks, +var mocks = angular.mock, MailListCtrl = require('../../src/js/controller/mail-list'), EmailDAO = require('../../src/js/dao/email-dao'), DeviceStorageDAO = require('../../src/js/dao/devicestorage-dao'), diff --git a/test/unit/navigation-ctrl-test.js b/test/unit/navigation-ctrl-test.js index 56b27d6..53b7c98 100644 --- a/test/unit/navigation-ctrl-test.js +++ b/test/unit/navigation-ctrl-test.js @@ -1,6 +1,6 @@ 'use strict'; -var mocks = angular.mocks, +var mocks = angular.mock, NavigationCtrl = require('../../src/js/controller/navigation'), EmailDAO = require('../../src/js/dao/email-dao'), OutboxBO = require('../../src/js/bo/outbox'), diff --git a/test/unit/privatekey-upload-ctrl-test.js b/test/unit/privatekey-upload-ctrl-test.js index b7649a2..293760f 100644 --- a/test/unit/privatekey-upload-ctrl-test.js +++ b/test/unit/privatekey-upload-ctrl-test.js @@ -1,6 +1,6 @@ 'use strict'; -var mocks = angular.mocks, +var mocks = angular.mock, PrivateKeyUploadCtrl = require('../../src/js/controller/privatekey-upload'), appController = require('../../src/js/app-controller'), KeychainDAO = require('../../src/js/dao/keychain-dao'), diff --git a/test/unit/read-ctrl-test.js b/test/unit/read-ctrl-test.js index 104b6b1..174a430 100644 --- a/test/unit/read-ctrl-test.js +++ b/test/unit/read-ctrl-test.js @@ -1,6 +1,6 @@ 'use strict'; -var mocks = angular.mocks, +var mocks = angular.mock, KeychainDAO = require('../../src/js/dao/keychain-dao'), InvitationDAO = require('../../src/js/dao/invitation-dao'), PGP = require('../../src/js/crypto/pgp'), diff --git a/test/unit/set-passphrase-ctrl-test.js b/test/unit/set-passphrase-ctrl-test.js index aaa9bc8..bb4c4b1 100644 --- a/test/unit/set-passphrase-ctrl-test.js +++ b/test/unit/set-passphrase-ctrl-test.js @@ -1,6 +1,6 @@ 'use strict'; -var mocks = angular.mocks, +var mocks = angular.mock, SetPassphraseCtrl = require('../../src/js/controller/set-passphrase'), PGP = require('../../src/js/crypto/pgp'), appController = require('../../src/js/app-controller'), diff --git a/test/unit/write-ctrl-test.js b/test/unit/write-ctrl-test.js index 2df9468..60a2dd9 100644 --- a/test/unit/write-ctrl-test.js +++ b/test/unit/write-ctrl-test.js @@ -1,6 +1,6 @@ 'use strict'; -var mocks = angular.mocks, +var mocks = angular.mock, WriteCtrl = require('../../src/js/controller/write'), EmailDAO = require('../../src/js/dao/email-dao'), OutboxBO = require('../../src/js/bo/outbox'),