Fix angulat mocks for unit tests

This commit is contained in:
Tankred Hase 2014-10-09 15:56:35 +02:00 committed by Felix Hammerl
parent 7e09add0f4
commit 85afb0be01
18 changed files with 17 additions and 18 deletions

View File

@ -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',

View File

@ -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",

View File

@ -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'),

View File

@ -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'),

View File

@ -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'),

View File

@ -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() {

View File

@ -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'),

View File

@ -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'),

View File

@ -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'),

View File

@ -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'),

View File

@ -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'),

View File

@ -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'),

View File

@ -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'),

View File

@ -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'),

View File

@ -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'),

View File

@ -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'),

View File

@ -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'),

View File

@ -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'),