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 33f93bb535..b257b9e750 100644 --- a/awx/ui/client/src/job-results/job-results.controller.js +++ b/awx/ui/client/src/job-results/job-results.controller.js @@ -665,7 +665,7 @@ function(jobData, jobDataOptions, jobLabels, jobFinished, count, $scope, ParseTy })); // get previously set up socket messages from resolve - if (statusSocket[0].job_status) { + if (statusSocket && statusSocket[0] && statusSocket[0].job_status) { $scope.job_status = statusSocket[0].job_status; } if ($scope.job_status === "running" && !$scope.job.elapsed) { @@ -709,10 +709,12 @@ function(jobData, jobDataOptions, jobLabels, jobFinished, count, $scope, ParseTy } })); - statusSocket[1](); + if (statusSocket && statusSocket[1]) { + statusSocket[1](); + } $scope.$on('$destroy', function(){ - if (statusSocket[1]) { + if (statusSocket && statusSocket[1]) { statusSocket[1](); } $( ".JobResultsStdOut-aLineOfStdOut" ).remove(); diff --git a/awx/ui/karma.conf.js b/awx/ui/karma.conf.js index 4d7d4c8363..12998b4ebf 100644 --- a/awx/ui/karma.conf.js +++ b/awx/ui/karma.conf.js @@ -15,7 +15,7 @@ module.exports = function(config) { frameworks: [ 'jasmine', ], - reporters: ['progress', 'coverage', 'junit'], + reporters: ['progress', 'coverage'], files: [ './client/src/app.js', './node_modules/angular-mocks/angular-mocks.js', 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 8a27faaeab..e9a1629143 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 @@ -7,6 +7,10 @@ describe('Controller: jobResultsController', () => { let jobData, jobDataOptions, jobLabels, jobFinished, count, $scope, ParseTypeChange, ParseVariableString, jobResultsService, eventQueue, $compile, eventResolve, populateResolve, $rScope, q, $log, Dataset, Rest, $state, QuerySet, i18n,fieldChoices, fieldLabels, $interval, workflowResultsService, statusSocket; + statusSocket = function() { + var fn = function() {}; + return fn; + } jobData = { related: {} }; @@ -70,6 +74,8 @@ describe('Controller: jobResultsController', () => { return jasmine.createSpyObj('workflowResultsService', ['createOneSecondTimer', 'destroyTimer']); }); + $provide.value('statusSocket', statusSocket); + $provide.value('jobData', jobData); $provide.value('jobDataOptions', jobDataOptions); $provide.value('jobLabels', jobLabels);