fix some karma tests problems

js/directives.js

@@ -1,9 +1,7 @@
 'use strict';
 
 angular.module('copayApp.directives')
-  .directive('validAddress', ['$rootScope', 'notification',
+  .directive('validAddress', function($rootScope, notification) {
-    function($rootScope, notification) {
-
     var bitcore = require('bitcore');
     var Address = bitcore.Address;
     var bignum = bitcore.Bignum;
@@ -15,7 +13,9 @@ angular.module('copayApp.directives')
           var uri;
 
           if (/^https?:\/\//.test(value)) {
-              uri = { merchant: value };
+            uri = {
+              merchant: value
+            };
           } else {
             uri = copay.HDPath.parseBitcoinURI(value);
           }
@@ -67,24 +67,18 @@ angular.module('copayApp.directives')
                 scope.sendForm.amount.$setViewValue('');
                 scope.sendForm.amount.$render();
                 unregister();
-                  if ($rootScope.$$phase !== '$apply'
+                if ($rootScope.$$phase !== '$apply' && $rootScope.$$phase !== '$digest') {
-                      && $rootScope.$$phase !== '$digest') {
                   $rootScope.$apply();
                 }
               }
             });
 
-              if ($rootScope.$$phase !== '$apply'
+            if ($rootScope.$$phase !== '$apply' && $rootScope.$$phase !== '$digest') {
-                  && $rootScope.$$phase !== '$digest') {
               $rootScope.$apply();
             }
 
             notification.info('Payment Request',
-                'Server is requesting '
+              'Server is requesting ' + merchantData.unitTotal + ' ' + config.unitName + '.' + ' Message: ' + merchantData.pr.pd.memo);
-                + merchantData.unitTotal + ' '
-                + config.unitName + '.'
-                + ' Message: '
-                + merchantData.pr.pd.memo);
           });
 
           ctrl.$setValidity('validAddress', true);
@@ -96,8 +90,7 @@ angular.module('copayApp.directives')
         ctrl.$formatters.unshift(validator);
       }
     };
-    }
+  })
-  ])
   .directive('enoughAmount', ['$rootScope',
     function($rootScope) {
       var bitcore = require('bitcore');
@@ -284,7 +277,9 @@ angular.module('copayApp.directives')
     }
   })
 // From https://gist.github.com/asafge/7430497
-  .directive('ngReallyClick', [function() {
+.directive('ngReallyClick', [
+
+  function() {
     return {
       restrict: 'A',
       link: function(scope, element, attrs) {
@@ -324,7 +319,9 @@ angular.module('copayApp.directives')
 
     return {
       restric: 'A',
-      scope: { clipCopy: '=clipCopy' },
+      scope: {
+        clipCopy: '=clipCopy'
+      },
       link: function(scope, elm) {
         var client = new ZeroClipboard(elm);
 

test/unit/controllers/controllersSpec.js

@@ -221,47 +221,6 @@ describe("Unit: Controllers", function() {
       sinon.assert.callCount(scope.loadTxs, 1);
     });
 
-    it('#start the example server', function(done) {
-      startServer(function(err, s) {
-        if (err) return done(err);
-        server = s;
-        server.uri = 'https://localhost:8080/-';
-        done();
-      });
-    });
-
-    it('#create a payment protocol transaction proposal', function() {
-      var uri = 'bitcoin:1JqniWpWNA6Yvdivg3y9izLidETnurxRQm?amount=0.00001000&r=https://localhost:8080/-/request';
-      sendForm.address.$setViewValue(uri);
-      sendForm.amount.$setViewValue(1000);
-
-      scope.wallet.totalCopayers = scope.wallet.requiredCopayers = 3;
-      var spy = sinon.spy(scope.wallet, 'createTx');
-      var spy2 = sinon.spy(scope.wallet, 'sendTx');
-      scope.submitForm(sendForm);
-      sinon.assert.callCount(spy, 1);
-      sinon.assert.callCount(spy2, 0);
-    });
-
-    it('#create and send a payment protocol transaction proposal', function() {
-      var uri = 'bitcoin:1JqniWpWNA6Yvdivg3y9izLidETnurxRQm?amount=0.00001000&r=https://localhost:8080/-/request';
-      sendForm.address.$setViewValue(uri);
-      sendForm.amount.$setViewValue(1000);
-
-      scope.wallet.totalCopayers = scope.wallet.requiredCopayers = 1;
-      var spy = sinon.spy(scope.wallet, 'createTx');
-      var spy2 = sinon.spy(scope.wallet, 'sendTx');
-
-      scope.submitForm(sendForm);
-      sinon.assert.callCount(spy, 1);
-      sinon.assert.callCount(spy2, 1);
-    });
-
-    it('#stop the example server', function(done) {
-      server.close(function() {
-        done();
-      });
-    });
   });
 
   describe("Unit: Version Controller", function() {