From 7432f216bb357c2aeba176d0a47eeabd974a3056 Mon Sep 17 00:00:00 2001 From: Matias Alejo Garcia Date: Tue, 3 Jun 2014 15:03:14 -0300 Subject: [PATCH 1/4] add handler for missing configuration errors --- js/controllers/signin.js | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/js/controllers/signin.js b/js/controllers/signin.js index 213e0a4aa..7185c0922 100644 --- a/js/controllers/signin.js +++ b/js/controllers/signin.js @@ -24,10 +24,16 @@ angular.module('copay.signin').controller('SigninController', console.log('## Obtaining passphrase...'); Passphrase.getBase64Async(password, function(passphrase){ console.log('## Passphrase obtained'); - var w = walletFactory.open($scope.selectedWalletId, { passphrase: passphrase}); + var w, errMsg; + try{ + var w = walletFactory.open($scope.selectedWalletId, { passphrase: passphrase}); + } catch (e){ + errMsg = e.message; + }; + if (!w) { $scope.loading = $scope.failure = false; - $rootScope.$flashMessage = { message: 'Wrong password', type: 'error'}; + $rootScope.$flashMessage = { message: errMsg || 'Wrong password', type: 'error'}; $rootScope.$digest(); return; } From ac58d9744e96a073131d4419c42492e56dfd4b25 Mon Sep 17 00:00:00 2001 From: Matias Alejo Garcia Date: Tue, 3 Jun 2014 16:39:06 -0300 Subject: [PATCH 2/4] change angular module namespace to copayApp --- js/app.js | 69 ++++++++++++----------- js/controllers/addresses.js | 2 +- js/controllers/backup.js | 2 +- js/controllers/footer.js | 2 +- js/controllers/header.js | 2 +- js/controllers/import.js | 2 +- js/controllers/send.js | 2 +- js/controllers/settings.js | 2 +- js/controllers/setup.js | 2 +- js/controllers/signin.js | 2 +- js/controllers/transactions.js | 2 +- js/directives.js | 2 +- js/filters.js | 2 +- js/init.js | 2 +- js/routes.js | 4 +- js/services/controllerUtils.js | 2 +- js/services/passphrase.js | 2 +- js/services/socket.js | 2 +- js/services/video.js | 2 +- js/services/walletFactory.js | 2 +- test/unit/controllers/controllersSpec.js | 72 ++++++++++++------------ 21 files changed, 92 insertions(+), 89 deletions(-) diff --git a/js/app.js b/js/app.js index 64e9245b9..ce3c7e391 100644 --- a/js/app.js +++ b/js/app.js @@ -16,46 +16,47 @@ var log = function() { if (config.verbose) console.log(arguments); } +// From the bundle var copay = require('copay'); -var copayApp = window.copayApp = angular.module('copay',[ +var copayApp = window.copayApp = angular.module('copayApp',[ 'ngRoute', 'angularMoment', 'mm.foundation', 'monospaced.qrcode', 'notifications', - 'copay.filters', - 'copay.header', - 'copay.footer', - 'copay.addresses', - 'copay.transactions', - 'copay.send', - 'copay.backup', - 'copay.walletFactory', - 'copay.signin', - 'copay.socket', - 'copay.controllerUtils', - 'copay.setup', - 'copay.directives', - 'copay.video', - 'copay.import', - 'copay.passphrase', - 'copay.settings' + 'copayApp.filters', + 'copayApp.header', + 'copayApp.footer', + 'copayApp.addresses', + 'copayApp.transactions', + 'copayApp.send', + 'copayApp.backup', + 'copayApp.walletFactory', + 'copayApp.signin', + 'copayApp.socket', + 'copayApp.controllerUtils', + 'copayApp.setup', + 'copayApp.directives', + 'copayApp.video', + 'copayApp.import', + 'copayApp.passphrase', + 'copayApp.settings' ]); -angular.module('copay.header', []); -angular.module('copay.footer', []); -angular.module('copay.addresses', []); -angular.module('copay.transactions', []); -angular.module('copay.send', []); -angular.module('copay.backup', []); -angular.module('copay.walletFactory', []); -angular.module('copay.controllerUtils', []); -angular.module('copay.signin', []); -angular.module('copay.setup', []); -angular.module('copay.socket', []); -angular.module('copay.directives', []); -angular.module('copay.video', []); -angular.module('copay.import', []); -angular.module('copay.passphrase', []); -angular.module('copay.settings', []); +angular.module('copayApp.header', []); +angular.module('copayApp.footer', []); +angular.module('copayApp.addresses', []); +angular.module('copayApp.transactions', []); +angular.module('copayApp.send', []); +angular.module('copayApp.backup', []); +angular.module('copayApp.walletFactory', []); +angular.module('copayApp.controllerUtils', []); +angular.module('copayApp.signin', []); +angular.module('copayApp.setup', []); +angular.module('copayApp.socket', []); +angular.module('copayApp.directives', []); +angular.module('copayApp.video', []); +angular.module('copayApp.import', []); +angular.module('copayApp.passphrase', []); +angular.module('copayApp.settings', []); diff --git a/js/controllers/addresses.js b/js/controllers/addresses.js index 943b5a6f4..a1884cab1 100644 --- a/js/controllers/addresses.js +++ b/js/controllers/addresses.js @@ -1,6 +1,6 @@ 'use strict'; -angular.module('copay.addresses').controller('AddressesController', +angular.module('copayApp.addresses').controller('AddressesController', function($scope, $rootScope, $timeout, controllerUtils) { $scope.loading = false; var w = $rootScope.wallet; diff --git a/js/controllers/backup.js b/js/controllers/backup.js index e2605153a..e48836277 100644 --- a/js/controllers/backup.js +++ b/js/controllers/backup.js @@ -1,6 +1,6 @@ 'use strict'; -angular.module('copay.backup').controller('BackupController', +angular.module('copayApp.backup').controller('BackupController', function($scope, $rootScope, $location, $window, $timeout, $modal) { $scope.title = 'Backup'; diff --git a/js/controllers/footer.js b/js/controllers/footer.js index 7fe81808d..82fe4762b 100644 --- a/js/controllers/footer.js +++ b/js/controllers/footer.js @@ -1,6 +1,6 @@ 'use strict'; -angular.module('copay.footer').controller('FooterController', function($rootScope, $sce, $scope, $http) { +angular.module('copayApp.footer').controller('FooterController', function($rootScope, $sce, $scope, $http) { if (config.themes && Array.isArray(config.themes) && config.themes[0]) { $scope.themes = config.themes; diff --git a/js/controllers/header.js b/js/controllers/header.js index 30eb00d59..cdec7c5c4 100644 --- a/js/controllers/header.js +++ b/js/controllers/header.js @@ -1,6 +1,6 @@ 'use strict'; -angular.module('copay.header').controller('HeaderController', +angular.module('copayApp.header').controller('HeaderController', function($scope, $rootScope, $location, $notification, $http, walletFactory, controllerUtils) { $scope.menu = [ { diff --git a/js/controllers/import.js b/js/controllers/import.js index c2328e0ae..b65fc655c 100644 --- a/js/controllers/import.js +++ b/js/controllers/import.js @@ -1,6 +1,6 @@ 'use strict'; -angular.module('copay.import').controller('ImportController', +angular.module('copayApp.import').controller('ImportController', function($scope, $rootScope, walletFactory, controllerUtils, Passphrase) { $scope.title = 'Import a backup'; var reader = new FileReader(); diff --git a/js/controllers/send.js b/js/controllers/send.js index cc52b40b2..ff8e9b369 100644 --- a/js/controllers/send.js +++ b/js/controllers/send.js @@ -1,6 +1,6 @@ 'use strict'; -angular.module('copay.send').controller('SendController', +angular.module('copayApp.send').controller('SendController', function($scope, $rootScope, $window, $location, $timeout) { $scope.title = 'Send'; $scope.loading = false; diff --git a/js/controllers/settings.js b/js/controllers/settings.js index b87237eef..facceb343 100644 --- a/js/controllers/settings.js +++ b/js/controllers/settings.js @@ -1,6 +1,6 @@ 'use strict'; -angular.module('copay.settings').controller('SettingsController', +angular.module('copayApp.settings').controller('SettingsController', function($scope, $rootScope, $window, $location) { $scope.title = 'Settings'; diff --git a/js/controllers/setup.js b/js/controllers/setup.js index 6020b4acb..6523c2daa 100644 --- a/js/controllers/setup.js +++ b/js/controllers/setup.js @@ -32,7 +32,7 @@ var valid_pairs = { '1,12': 489 }; -angular.module('copay.setup').controller('SetupController', +angular.module('copayApp.setup').controller('SetupController', function($scope, $rootScope, $location, $timeout, walletFactory, controllerUtils, Passphrase) { $rootScope.videoInfo = {}; diff --git a/js/controllers/signin.js b/js/controllers/signin.js index 7185c0922..42e73446a 100644 --- a/js/controllers/signin.js +++ b/js/controllers/signin.js @@ -1,6 +1,6 @@ 'use strict'; -angular.module('copay.signin').controller('SigninController', +angular.module('copayApp.signin').controller('SigninController', function($scope, $rootScope, $location, walletFactory, controllerUtils, Passphrase) { var cmp = function(o1, o2){ var v1 = o1.show.toLowerCase(), v2 = o2.show.toLowerCase(); diff --git a/js/controllers/transactions.js b/js/controllers/transactions.js index ede169280..3f47ffae1 100644 --- a/js/controllers/transactions.js +++ b/js/controllers/transactions.js @@ -1,6 +1,6 @@ 'use strict'; -angular.module('copay.transactions').controller('TransactionsController', +angular.module('copayApp.transactions').controller('TransactionsController', function($scope, $rootScope, $timeout, controllerUtils) { $scope.title = 'Transactions'; diff --git a/js/directives.js b/js/directives.js index 33fad2040..5e6ad0883 100644 --- a/js/directives.js +++ b/js/directives.js @@ -1,6 +1,6 @@ 'use strict'; -angular.module('copay.directives') +angular.module('copayApp.directives') .directive('validAddress', [ function() { diff --git a/js/filters.js b/js/filters.js index 5954ea5d1..dd52d20e6 100644 --- a/js/filters.js +++ b/js/filters.js @@ -1,6 +1,6 @@ 'use strict'; -angular.module('copay.filters', []) +angular.module('copayApp.filters', []) .filter('amTimeAgo', ['amMoment', function(amMoment) { return function(input) { return amMoment.preprocessDate(input).fromNow(); diff --git a/js/init.js b/js/init.js index 4c8f29b30..57a364790 100644 --- a/js/init.js +++ b/js/init.js @@ -2,5 +2,5 @@ angular.element(document).ready(function() { // Init the app - angular.bootstrap(document, ['copay']); + angular.bootstrap(document, ['copayApp']); }); diff --git a/js/routes.js b/js/routes.js index 5e44085eb..366b5f29f 100644 --- a/js/routes.js +++ b/js/routes.js @@ -2,7 +2,7 @@ //Setting up route angular - .module('copay') + .module('copayApp') .config(function($routeProvider) { $routeProvider @@ -56,7 +56,7 @@ angular //Setting HTML5 Location Mode angular - .module('copay') + .module('copayApp') .config(function($locationProvider) { $locationProvider .html5Mode(false); diff --git a/js/services/controllerUtils.js b/js/services/controllerUtils.js index 25f4bcb11..b2b4f8579 100644 --- a/js/services/controllerUtils.js +++ b/js/services/controllerUtils.js @@ -1,6 +1,6 @@ 'use strict'; -angular.module('copay.controllerUtils') +angular.module('copayApp.controllerUtils') .factory('controllerUtils', function($rootScope, $sce, $location, $notification, Socket, video) { var root = {}; var bitcore = require('bitcore'); diff --git a/js/services/passphrase.js b/js/services/passphrase.js index 21fd495ae..fb8196321 100644 --- a/js/services/passphrase.js +++ b/js/services/passphrase.js @@ -1,3 +1,3 @@ 'use strict'; -angular.module('copay.passphrase').value('Passphrase', new copay.Passphrase(config.passphrase)); +angular.module('copayApp.passphrase').value('Passphrase', new copay.Passphrase(config.passphrase)); diff --git a/js/services/socket.js b/js/services/socket.js index f9ac7bb26..7b3c4713f 100644 --- a/js/services/socket.js +++ b/js/services/socket.js @@ -1,6 +1,6 @@ 'use strict'; -angular.module('copay.socket').factory('Socket', +angular.module('copayApp.socket').factory('Socket', function($rootScope) { var listeners = []; var url = 'http://' + config.socket.host + ':' + config.socket.port; diff --git a/js/services/video.js b/js/services/video.js index e206f4ed2..9f4fb8523 100644 --- a/js/services/video.js +++ b/js/services/video.js @@ -93,4 +93,4 @@ Video.prototype.close = function() { this.mediaConnections = {}; }; -angular.module('copay.video').value('video', new Video()); +angular.module('copayApp.video').value('video', new Video()); diff --git a/js/services/walletFactory.js b/js/services/walletFactory.js index 49af6ef26..ba2497425 100644 --- a/js/services/walletFactory.js +++ b/js/services/walletFactory.js @@ -1,4 +1,4 @@ 'use strict'; -angular.module('copay.walletFactory').value('walletFactory', new copay.WalletFactory(config, copay.version)); +angular.module('copayApp.walletFactory').value('walletFactory', new copay.WalletFactory(config, copay.version)); diff --git a/test/unit/controllers/controllersSpec.js b/test/unit/controllers/controllersSpec.js index 12502bd8a..904c31377 100644 --- a/test/unit/controllers/controllersSpec.js +++ b/test/unit/controllers/controllersSpec.js @@ -3,39 +3,41 @@ // describe("Unit: Testing Controllers", function() { - beforeEach(angular.mock.module('copay')); - - it('should have a AddressesController controller', function() { - expect(copayApp.AddressesController).not.to.equal(null); - }); - - it('should have a BackupController controller', function() { - expect(copayApp.Backupcontroller).not.to.equal(null); - }); - - it('should have a HeaderController controller', function() { - expect(copayApp.HeaderController).not.to.equal(null); - }); - - it('should have a SendController controller', function() { - expect(copayApp.SendController).not.to.equal(null); - }); - - it('should have a SetupController controller', function() { - expect(copayApp.SetupController).not.to.equal(null); - }); - - it('should have a SigninController controller', function() { - expect(copayApp.SigninController).not.to.equal(null); - }); - - it('should have a TransactionsController controller', function() { - expect(copayApp.TransactionsController).not.to.equal(null); - }); - - beforeEach(angular.mock.module('copay.walletFactory')); - it('should display a link to create a new wallet if no wallets in localStorage', inject(function(walletFactory) { - expect(walletFactory.storage.getWalletIds()).to.be.empty; - })); - +// beforeEach(module('copay')); + beforeEach(module('copay.signin')); + + it('should have a AddressesController controller', function() { +console.log('[controllersSpec.js.10:copayApp:]',copayApp.controller); //TODO + expect(copayApp.AddressesController).not.to.equal(null); + }); +// +// it('should have a BackupController controller', function() { +// expect(copayApp.Backupcontroller).not.to.equal(null); +// }); +// +// it('should have a HeaderController controller', function() { +// expect(copayApp.HeaderController).not.to.equal(null); +// }); +// +// it('should have a SendController controller', function() { +// expect(copayApp.SendController).not.to.equal(null); +// }); +// +// it('should have a SetupController controller', function() { +// expect(copayApp.SetupController).not.to.equal(null); +// }); +// +// it('should have a SigninController controller', function() { +// expect(copayApp.SigninController).not.to.equal(null); +// console.log('[controllersSpec.js.30:copayApp:]',copayApp); //TODO +// }); +// +// it('should have a TransactionsController controller', function() { +// expect(copayApp.TransactionsController).not.to.equal(null); +// }); +// +// beforeEach(angular.mock.module('copay.walletFactory')); +// it('should display a link to create a new wallet if no wallets in localStorage', inject(function(walletFactory) { +// expect(walletFactory.storage.getWalletIds()).to.be.empty; +// })); }); From 77f6a8221a48cd7a6b6125a4686352190214c582 Mon Sep 17 00:00:00 2001 From: Matias Alejo Garcia Date: Tue, 3 Jun 2014 17:42:36 -0300 Subject: [PATCH 3/4] change names in services --- js/app.js | 36 ++++-------------------- js/controllers/addresses.js | 2 +- js/controllers/backup.js | 2 +- js/controllers/footer.js | 2 +- js/controllers/header.js | 2 +- js/controllers/import.js | 2 +- js/controllers/send.js | 2 +- js/controllers/settings.js | 2 +- js/controllers/setup.js | 2 +- js/controllers/signin.js | 2 +- js/controllers/transactions.js | 2 +- js/services/controllerUtils.js | 2 +- js/services/passphrase.js | 3 +- js/services/socket.js | 2 +- js/services/video.js | 2 +- js/services/walletFactory.js | 2 +- karma.conf.js | 8 ++++-- test/unit/controllers/controllersSpec.js | 28 ++++++++++++++---- test/unit/directives/directivesSpec.js | 2 +- test/unit/services/servicesSpec.js | 7 ++--- 20 files changed, 53 insertions(+), 59 deletions(-) diff --git a/js/app.js b/js/app.js index ce3c7e391..2060979fc 100644 --- a/js/app.js +++ b/js/app.js @@ -26,37 +26,13 @@ var copayApp = window.copayApp = angular.module('copayApp',[ 'monospaced.qrcode', 'notifications', 'copayApp.filters', - 'copayApp.header', - 'copayApp.footer', - 'copayApp.addresses', - 'copayApp.transactions', - 'copayApp.send', - 'copayApp.backup', - 'copayApp.walletFactory', - 'copayApp.signin', - 'copayApp.socket', - 'copayApp.controllerUtils', - 'copayApp.setup', + 'copayApp.controllers', 'copayApp.directives', - 'copayApp.video', - 'copayApp.import', - 'copayApp.passphrase', - 'copayApp.settings' + 'copayApp.services', ]); -angular.module('copayApp.header', []); -angular.module('copayApp.footer', []); -angular.module('copayApp.addresses', []); -angular.module('copayApp.transactions', []); -angular.module('copayApp.send', []); -angular.module('copayApp.backup', []); -angular.module('copayApp.walletFactory', []); -angular.module('copayApp.controllerUtils', []); -angular.module('copayApp.signin', []); -angular.module('copayApp.setup', []); -angular.module('copayApp.socket', []); +angular.module('copayApp.filters', []); +angular.module('copayApp.controllers', []); angular.module('copayApp.directives', []); -angular.module('copayApp.video', []); -angular.module('copayApp.import', []); -angular.module('copayApp.passphrase', []); -angular.module('copayApp.settings', []); +angular.module('copayApp.services', []); + diff --git a/js/controllers/addresses.js b/js/controllers/addresses.js index a1884cab1..8e9e0a213 100644 --- a/js/controllers/addresses.js +++ b/js/controllers/addresses.js @@ -1,6 +1,6 @@ 'use strict'; -angular.module('copayApp.addresses').controller('AddressesController', +angular.module('copayApp.controllers').controller('AddressesController', function($scope, $rootScope, $timeout, controllerUtils) { $scope.loading = false; var w = $rootScope.wallet; diff --git a/js/controllers/backup.js b/js/controllers/backup.js index e48836277..f23a44f5d 100644 --- a/js/controllers/backup.js +++ b/js/controllers/backup.js @@ -1,6 +1,6 @@ 'use strict'; -angular.module('copayApp.backup').controller('BackupController', +angular.module('copayApp.controllers').controller('BackupController', function($scope, $rootScope, $location, $window, $timeout, $modal) { $scope.title = 'Backup'; diff --git a/js/controllers/footer.js b/js/controllers/footer.js index 82fe4762b..280fff354 100644 --- a/js/controllers/footer.js +++ b/js/controllers/footer.js @@ -1,6 +1,6 @@ 'use strict'; -angular.module('copayApp.footer').controller('FooterController', function($rootScope, $sce, $scope, $http) { +angular.module('copayApp.controllers').controller('FooterController', function($rootScope, $sce, $scope, $http) { if (config.themes && Array.isArray(config.themes) && config.themes[0]) { $scope.themes = config.themes; diff --git a/js/controllers/header.js b/js/controllers/header.js index cdec7c5c4..c33362952 100644 --- a/js/controllers/header.js +++ b/js/controllers/header.js @@ -1,6 +1,6 @@ 'use strict'; -angular.module('copayApp.header').controller('HeaderController', +angular.module('copayApp.controllers').controller('HeaderController', function($scope, $rootScope, $location, $notification, $http, walletFactory, controllerUtils) { $scope.menu = [ { diff --git a/js/controllers/import.js b/js/controllers/import.js index b65fc655c..f58d261bb 100644 --- a/js/controllers/import.js +++ b/js/controllers/import.js @@ -1,6 +1,6 @@ 'use strict'; -angular.module('copayApp.import').controller('ImportController', +angular.module('copayApp.controllers').controller('ImportController', function($scope, $rootScope, walletFactory, controllerUtils, Passphrase) { $scope.title = 'Import a backup'; var reader = new FileReader(); diff --git a/js/controllers/send.js b/js/controllers/send.js index ff8e9b369..9bb5d7700 100644 --- a/js/controllers/send.js +++ b/js/controllers/send.js @@ -1,6 +1,6 @@ 'use strict'; -angular.module('copayApp.send').controller('SendController', +angular.module('copayApp.controllers').controller('SendController', function($scope, $rootScope, $window, $location, $timeout) { $scope.title = 'Send'; $scope.loading = false; diff --git a/js/controllers/settings.js b/js/controllers/settings.js index facceb343..4c1bb13c1 100644 --- a/js/controllers/settings.js +++ b/js/controllers/settings.js @@ -1,6 +1,6 @@ 'use strict'; -angular.module('copayApp.settings').controller('SettingsController', +angular.module('copayApp.controllers').controller('SettingsController', function($scope, $rootScope, $window, $location) { $scope.title = 'Settings'; diff --git a/js/controllers/setup.js b/js/controllers/setup.js index 6523c2daa..4f49dcb96 100644 --- a/js/controllers/setup.js +++ b/js/controllers/setup.js @@ -32,7 +32,7 @@ var valid_pairs = { '1,12': 489 }; -angular.module('copayApp.setup').controller('SetupController', +angular.module('copayApp.controllers').controller('SetupController', function($scope, $rootScope, $location, $timeout, walletFactory, controllerUtils, Passphrase) { $rootScope.videoInfo = {}; diff --git a/js/controllers/signin.js b/js/controllers/signin.js index 42e73446a..506c42512 100644 --- a/js/controllers/signin.js +++ b/js/controllers/signin.js @@ -1,6 +1,6 @@ 'use strict'; -angular.module('copayApp.signin').controller('SigninController', +angular.module('copayApp.controllers').controller('SigninController', function($scope, $rootScope, $location, walletFactory, controllerUtils, Passphrase) { var cmp = function(o1, o2){ var v1 = o1.show.toLowerCase(), v2 = o2.show.toLowerCase(); diff --git a/js/controllers/transactions.js b/js/controllers/transactions.js index 3f47ffae1..3613012c4 100644 --- a/js/controllers/transactions.js +++ b/js/controllers/transactions.js @@ -1,6 +1,6 @@ 'use strict'; -angular.module('copayApp.transactions').controller('TransactionsController', +angular.module('copayApp.controllers').controller('TransactionsController', function($scope, $rootScope, $timeout, controllerUtils) { $scope.title = 'Transactions'; diff --git a/js/services/controllerUtils.js b/js/services/controllerUtils.js index b2b4f8579..3581fa682 100644 --- a/js/services/controllerUtils.js +++ b/js/services/controllerUtils.js @@ -1,6 +1,6 @@ 'use strict'; -angular.module('copayApp.controllerUtils') +angular.module('copayApp.services') .factory('controllerUtils', function($rootScope, $sce, $location, $notification, Socket, video) { var root = {}; var bitcore = require('bitcore'); diff --git a/js/services/passphrase.js b/js/services/passphrase.js index fb8196321..00ff9e2be 100644 --- a/js/services/passphrase.js +++ b/js/services/passphrase.js @@ -1,3 +1,4 @@ 'use strict'; -angular.module('copayApp.passphrase').value('Passphrase', new copay.Passphrase(config.passphrase)); +angular.module('copayApp.services') + .value('Passphrase', new copay.Passphrase(config.passphrase)); diff --git a/js/services/socket.js b/js/services/socket.js index 7b3c4713f..1642309c2 100644 --- a/js/services/socket.js +++ b/js/services/socket.js @@ -1,6 +1,6 @@ 'use strict'; -angular.module('copayApp.socket').factory('Socket', +angular.module('copayApp.services').factory('Socket', function($rootScope) { var listeners = []; var url = 'http://' + config.socket.host + ':' + config.socket.port; diff --git a/js/services/video.js b/js/services/video.js index 9f4fb8523..af2073589 100644 --- a/js/services/video.js +++ b/js/services/video.js @@ -93,4 +93,4 @@ Video.prototype.close = function() { this.mediaConnections = {}; }; -angular.module('copayApp.video').value('video', new Video()); +angular.module('copayApp.services').value('video', new Video()); diff --git a/js/services/walletFactory.js b/js/services/walletFactory.js index ba2497425..3e201b6f1 100644 --- a/js/services/walletFactory.js +++ b/js/services/walletFactory.js @@ -1,4 +1,4 @@ 'use strict'; -angular.module('copayApp.walletFactory').value('walletFactory', new copay.WalletFactory(config, copay.version)); +angular.module('copayApp.services').value('walletFactory', new copay.WalletFactory(config, copay.version)); diff --git a/karma.conf.js b/karma.conf.js index 63e9fb1e0..8331b8672 100644 --- a/karma.conf.js +++ b/karma.conf.js @@ -47,8 +47,6 @@ module.exports = function(config) { //Mocha stuff 'test/mocha.conf.js', - //test files - 'test/unit/**/*.js', //App-specific Code 'js/app.js', @@ -57,7 +55,11 @@ module.exports = function(config) { 'js/filters.js', 'js/services/*.js', 'js/controllers/*.js', - 'js/init.js' + 'js/init.js', + + + //test files + 'test/unit/**/*.js' ], diff --git a/test/unit/controllers/controllersSpec.js b/test/unit/controllers/controllersSpec.js index 904c31377..75d45e881 100644 --- a/test/unit/controllers/controllersSpec.js +++ b/test/unit/controllers/controllersSpec.js @@ -3,13 +3,31 @@ // describe("Unit: Testing Controllers", function() { -// beforeEach(module('copay')); - beforeEach(module('copay.signin')); - + beforeEach(module('notifications')); + beforeEach(module('copayApp.services')); + beforeEach(module('copayApp.controllers')); + + var scope, addressCtrl; +// + beforeEach(inject(function($controller, $rootScope) { + scope = $rootScope.$new(); + addressCtrl = $controller('AddressesController', { + $scope: scope, + }); + })); + + + it('should have a AddressesController controller', function() { -console.log('[controllersSpec.js.10:copayApp:]',copayApp.controller); //TODO - expect(copayApp.AddressesController).not.to.equal(null); + expect(scope.loading).equal(false); }); + + it('selectedAddr should modify scope', function() { + expect(scope.selectedAddress).equal(undefined); + scope.selectAddress('hola'); + expect(scope.selectedAddr).equal('hola'); + }); + // // it('should have a BackupController controller', function() { // expect(copayApp.Backupcontroller).not.to.equal(null); diff --git a/test/unit/directives/directivesSpec.js b/test/unit/directives/directivesSpec.js index 42aa5f521..4f3b76d82 100644 --- a/test/unit/directives/directivesSpec.js +++ b/test/unit/directives/directivesSpec.js @@ -6,7 +6,7 @@ describe("Unit: Testing Directives", function() { var $scope, form; - beforeEach(module('copay.directives')); + beforeEach(module('copayApp.directives')); describe('Validate Address', function() { beforeEach(inject(function($compile, $rootScope) { diff --git a/test/unit/services/servicesSpec.js b/test/unit/services/servicesSpec.js index fd3563eee..fbb8f6c2d 100644 --- a/test/unit/services/servicesSpec.js +++ b/test/unit/services/servicesSpec.js @@ -3,22 +3,19 @@ // describe("Unit: Testing Services", function() { - beforeEach(angular.mock.module('copay.socket')); + beforeEach(angular.mock.module('copayApp.services')); it('should contain a Socket service', inject(function(Socket) { expect(Socket).not.to.equal(null); })); - - beforeEach(angular.mock.module('copay.walletFactory')); - it('should contain a walletFactory service', inject(function(walletFactory) { expect(walletFactory).not.to.equal(null); })); // TODO - /*beforeEach(angular.mock.module('copay.controllerUtils')); + /*beforeEach(angular.mock.module('copayApp.controllerUtils')); it('should contain a controllerUtils service', inject(function(controllerUtils) { expect(controllerUtils).not.to.equal(null); From ca7b9168c34efcce6504c5f2a1bdbdcc6e8b8c17 Mon Sep 17 00:00:00 2001 From: Matias Alejo Garcia Date: Tue, 3 Jun 2014 17:46:37 -0300 Subject: [PATCH 4/4] rm log --- js/models/core/Wallet.js | 1 - 1 file changed, 1 deletion(-) diff --git a/js/models/core/Wallet.js b/js/models/core/Wallet.js index 0d2e99086..ee4da36ec 100644 --- a/js/models/core/Wallet.js +++ b/js/models/core/Wallet.js @@ -65,7 +65,6 @@ Wallet.prototype.seedCopayer = function(pubKey) { Wallet.prototype.connectToAll = function() { var all = this.publicKeyRing.getAllCopayerIds(); - console.log('[Wallet.js.58] connecting'); //TODO this.network.connectToCopayers(all); if (this.seededCopayerId) { this.sendWalletReady(this.seededCopayerId);