From dbf812f84807babedc23799a03faf49aede1a837 Mon Sep 17 00:00:00 2001
From: Gustavo Maximiliano Cortez <cmgustavo83@gmail.com>
Date: Thu, 31 Jul 2014 22:49:11 -0300
Subject: [PATCH] Fix Karma test

---
 js/controllers/sidebar.js | 5 +----
 js/routes.js              | 4 +++-
 karma.conf.js             | 1 +
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/js/controllers/sidebar.js b/js/controllers/sidebar.js
index 92917054f..7f4a8128c 100644
--- a/js/controllers/sidebar.js
+++ b/js/controllers/sidebar.js
@@ -1,7 +1,7 @@
 'use strict';
 
 angular.module('copayApp.controllers').controller('SidebarController', 
-    function($scope, $rootScope, $sce, $location, $http, $idle, notification, controllerUtils) {
+    function($scope, $rootScope, $sce, $location, $http, notification, controllerUtils) {
 
     $scope.version = copay.version;
     $scope.networkName = config.networkName;
@@ -83,14 +83,11 @@ angular.module('copayApp.controllers').controller('SidebarController',
     controllerUtils.setSocketHandlers();
 
     if ($rootScope.wallet) {
-      $idle.watch();
-      
       $scope.$on('$idleStart', function(a) {
         notification.warning('Timing', 'You were enought time in inactivity. This session will be closed in 10 seconds if continues without activity');
       });
 
       $scope.$on('$idleTimeout', function() {
-        $idle.unwatch();
         $scope.signout();
         notification.warning('Session closed', 'Session closed for a long time of inactivity');
       });
diff --git a/js/routes.js b/js/routes.js
index 192d44609..00ab8b185 100644
--- a/js/routes.js
+++ b/js/routes.js
@@ -73,12 +73,14 @@ angular
     $idleProvider.idleDuration(15 * 60); // in seconds
     $idleProvider.warningDuration(10); // in seconds
   })
-  .run(function($rootScope, $location) {
+  .run(function($rootScope, $location, $idle) {
+    $idle.watch();
     $rootScope.$on('$routeChangeStart', function(event, next, current) {
       if (!util.supports.data) {
         $location.path('unsupported');
       } else {
         if ((!$rootScope.wallet || !$rootScope.wallet.id) && next.validate) {
+          $idle.unwatch();
           $location.path('/');
         }
         if ($rootScope.wallet && !$rootScope.wallet.isReady()) {
diff --git a/karma.conf.js b/karma.conf.js
index 8bd9d8e1b..fd2c586fe 100644
--- a/karma.conf.js
+++ b/karma.conf.js
@@ -21,6 +21,7 @@ module.exports = function(config) {
       'lib/angular/angular.min.js',
       'lib/angular-mocks/angular-mocks.js',
       'lib/moment/moment.js',
+      'lib/ng-idle/angular-idle.min.js',
       'lib/angular-moment/angular-moment.js',
       'lib/qrcode-generator/js/qrcode.js',
       'lib/angular-qrcode/qrcode.js',