From bad9e9fcf0664165207fc2ac39612b19b62c47c7 Mon Sep 17 00:00:00 2001
From: jaredevantabor <jtabor@ansible.com>
Date: Thu, 26 Jan 2017 10:43:18 -0800
Subject: [PATCH] fixing unit test failures

---
 awx/ui/client/src/job-results/job-results.controller.js      | 2 +-
 awx/ui/tests/spec/job-results/job-results.controller-test.js | 4 +++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/awx/ui/client/src/job-results/job-results.controller.js b/awx/ui/client/src/job-results/job-results.controller.js
index ac0f0ef18e..67a3745133 100644
--- a/awx/ui/client/src/job-results/job-results.controller.js
+++ b/awx/ui/client/src/job-results/job-results.controller.js
@@ -110,7 +110,7 @@ function(jobData, jobDataOptions, jobLabels, jobFinished, count, $scope, ParseTy
     $scope.hideTraceback = false;
 
     toDestroy.push($scope.$watch('job.job_explanation', function(explanation) {
-        if (explanation.split(":")[0] === "Previous Task Failed") {
+        if (explanation && explanation.split(":")[0] === "Previous Task Failed") {
             $scope.previousTaskFailed = true;
             var taskObj = JSON.parse(explanation.substring(explanation.split(":")[0].length + 1));
             // return a promise from the options request with the permission type choices (including adhoc) as a param
diff --git a/awx/ui/tests/spec/job-results/job-results.controller-test.js b/awx/ui/tests/spec/job-results/job-results.controller-test.js
index f3ef4f822d..585d7d75e8 100644
--- a/awx/ui/tests/spec/job-results/job-results.controller-test.js
+++ b/awx/ui/tests/spec/job-results/job-results.controller-test.js
@@ -4,7 +4,7 @@ describe('Controller: jobResultsController', () => {
     // Setup
     let jobResultsController;
 
-    let jobData, jobDataOptions, jobLabels, jobFinished, count, $scope, ParseTypeChange, ParseVariableString, jobResultsService, eventQueue, $compile, eventResolve, populateResolve, $rScope, q, $log, Dataset, Rest, $state, QuerySet, i18n;
+    let jobData, jobDataOptions, jobLabels, jobFinished, count, $scope, ParseTypeChange, ParseVariableString, jobResultsService, eventQueue, $compile, eventResolve, populateResolve, $rScope, q, $log, Dataset, Rest, $state, QuerySet, i18n,fieldChoices, fieldLabels;
 
     jobData = {
         related: {}
@@ -78,6 +78,8 @@ describe('Controller: jobResultsController', () => {
             $provide.value('$state', $state);
             $provide.value('QuerySet', QuerySet);
             $provide.value('i18n', i18n);
+            $provide.value('fieldChoices', fieldChoices);
+            $provide.value('fieldLabels', fieldLabels);
         });
     };