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 b4e6793f2c..56aed6ce5b 100644 --- a/awx/ui/client/src/job-results/job-results.controller.js +++ b/awx/ui/client/src/job-results/job-results.controller.js @@ -463,7 +463,7 @@ function(jobData, jobDataOptions, jobLabels, jobFinished, count, $scope, ParseTy // correct anything that was out of sync from the job run jobResultsService.getJobData($scope.job.id).then(function(data){ $scope.job = data; - }) + }); } } else if (parseInt(data.project_id, 10) === parseInt($scope.job.project,10)) { diff --git a/awx/ui/client/src/job-results/job-results.service.js b/awx/ui/client/src/job-results/job-results.service.js index 1a5210cff7..02f4a31548 100644 --- a/awx/ui/client/src/job-results/job-results.service.js +++ b/awx/ui/client/src/job-results/job-results.service.js @@ -5,7 +5,8 @@ *************************************************/ -export default ['$q', 'Prompt', '$filter', 'Wait', 'Rest', '$state', 'ProcessErrors', 'InitiatePlaybookRun', 'GetBasePath', function ($q, Prompt, $filter, Wait, Rest, $state, ProcessErrors, InitiatePlaybookRun, GetBasePath) { +export default ['$q', 'Prompt', '$filter', 'Wait', 'Rest', '$state', 'ProcessErrors', 'InitiatePlaybookRun', 'GetBasePath', 'Alert', +function ($q, Prompt, $filter, Wait, Rest, $state, ProcessErrors, InitiatePlaybookRun, GetBasePath, Alert) { var val = { // the playbook_on_stats event returns the count data in a weird format. // format to what we need! 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 56333fab6a..aa70041f8a 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 @@ -29,8 +29,6 @@ describe('Controller: jobResultsController', () => { data: {foo: "bar"} }; - moment = function(){}; - let provideVals = () => { angular.mock.module('jobResults', ($provide) => { ParseTypeChange = jasmine.createSpy('ParseTypeChange'); @@ -60,10 +58,15 @@ describe('Controller: jobResultsController', () => { 'encodeQueryset' ]); - moment = jasmine.createSpyObj('moment', [ - 'diff' + moment = jasmine.createSpyObj('momentStub', [ + 'diff' ]); - + spyOn(window, 'moment').andReturn(momentStub); + // spyOn(window, 'moment').and.callFake(function (date) { + // return { + // diff: function (diff) { /* your format implementation */ } + // }; + // }); $provide.value('jobData', jobData); $provide.value('jobDataOptions', jobDataOptions); $provide.value('jobLabels', jobLabels);