From 8d1898e4ae63fcae96b7aa6f9580e3f73dd06c56 Mon Sep 17 00:00:00 2001
From: Joe Fiorini <joe@joefiorini.com>
Date: Fri, 6 Feb 2015 10:21:25 -0500
Subject: [PATCH] Fix failing tests

---
 awx/ui/static/js/services/host-count-graph-data.js       | 2 +-
 awx/ui/static/js/services/job-status-graph-data.js       | 5 +++--
 awx/ui/tests/karma.conf.js                               | 3 +--
 awx/ui/tests/unit/services/host-count-graph-data-test.js | 3 ++-
 4 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/awx/ui/static/js/services/host-count-graph-data.js b/awx/ui/static/js/services/host-count-graph-data.js
index e44525a735..db6b2139e9 100644
--- a/awx/ui/static/js/services/host-count-graph-data.js
+++ b/awx/ui/static/js/services/host-count-graph-data.js
@@ -40,7 +40,7 @@ function HostCountGraphData(Rest, getBasePath, processErrors, $q) {
                 processErrors(null, response.data, response.status, null, { hdr: 'Error!',
                               msg: errorMessage
                 });
-                throw response;
+                return $q.reject(response);
             });
         }
     };
diff --git a/awx/ui/static/js/services/job-status-graph-data.js b/awx/ui/static/js/services/job-status-graph-data.js
index e590bb7682..be3a846ad7 100644
--- a/awx/ui/static/js/services/job-status-graph-data.js
+++ b/awx/ui/static/js/services/job-status-graph-data.js
@@ -4,9 +4,10 @@ angular.module('DataServices')
              "GetBasePath",
              "ProcessErrors",
              "$rootScope",
+             "$q",
              JobStatusGraphData]);
 
-function JobStatusGraphData(Rest, getBasePath, processErrors, $rootScope) {
+function JobStatusGraphData(Rest, getBasePath, processErrors, $rootScope, $q) {
 
     function pluck(property, promise) {
         return promise.then(function(value) {
@@ -28,7 +29,7 @@ function JobStatusGraphData(Rest, getBasePath, processErrors, $rootScope) {
                     hdr: 'Error!',
                     msg: errorMessage
                 });
-            throw response;
+            return $q.reject(response);
         });
 
         return pluck('data', result);
diff --git a/awx/ui/tests/karma.conf.js b/awx/ui/tests/karma.conf.js
index 12a315cf88..e4c75001eb 100644
--- a/awx/ui/tests/karma.conf.js
+++ b/awx/ui/tests/karma.conf.js
@@ -51,11 +51,10 @@ module.exports = function(config) {
       '../static/lib/lrInfiniteScroll/lrInfiniteScroll.js',
       '../static/lib/ansible/*.js',
       '../static/js/config.js',
-      '../static/js/directives/dashboard-graphs.js',
+      '../static/js/directives/_dashboard-graphs.js',
       '../static/js/*/*.js',
       '../static/js/app.js',
       '../static/lib/angular-mocks/angular-mocks.js',
-      '../../../node_modules/ng-midway-tester/src/ngMidwayTester.js',
       './unit/*',
       './unit/**/*'
     ],
diff --git a/awx/ui/tests/unit/services/host-count-graph-data-test.js b/awx/ui/tests/unit/services/host-count-graph-data-test.js
index ed5b0699ec..58f956f636 100644
--- a/awx/ui/tests/unit/services/host-count-graph-data-test.js
+++ b/awx/ui/tests/unit/services/host-count-graph-data-test.js
@@ -14,7 +14,7 @@ describe('Host Count Graph Data Service', function() {
     window.setTimeout(function() {
       inject(function($rootScope) {
         $rootScope.$apply();
-      });
+      }, 1000);
     });
   }
 
@@ -74,6 +74,7 @@ describe('Host Count Graph Data Service', function() {
 
     $provide.value("$cookieStore", { get: angular.noop });
 
+    $provide.value('ProcessErrors', processErrors);
     $provide.value('Rest', restStub);
     $provide.value('GetBasePath', getBasePath);
   }));