External-Mirrors/awx
2
0
Fork 0
mirror of https://github.com/ansible/awx.git synced 2026-01-12 18:40:01 -03:30
Code Issues Packages Projects Releases Wiki Activity

fixed job results controller unit tests w moment dep

Browse Source
This commit is contained in:
John Mitchell 2016-12-19 15:51:46 -05:00
parent bd95aebe36
commit fc4c16465a
2 changed files with 4 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
awx/ui/client/src/job-results/main.js
View File

@ -17,7 +17,7 @@ import eventQueueService from './event-queue.service';
import parseStdoutService from './parse-stdout.service';
export default
angular.module('jobResults', [hostStatusBar.name, jobResultsStdOut.name, hostEvent.name])
angular.module('jobResults', [hostStatusBar.name, jobResultsStdOut.name, hostEvent.name, 'angularMoment'])
.run(['$stateExtender', function($stateExtender) {
$stateExtender.addState(route);
}])

18
awx/ui/tests/spec/job-results/job-results.controller-test.js
View File

@ -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, moment;
let jobData, jobDataOptions, jobLabels, jobFinished, count, $scope, ParseTypeChange, ParseVariableString, jobResultsService, eventQueue, $compile, eventResolve, populateResolve, $rScope, q, $log, Dataset, Rest, $state, QuerySet;
jobData = {
related: {}
@ -58,15 +58,6 @@ describe('Controller: jobResultsController', () => {
'encodeQueryset'
]);
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);
@ -80,12 +71,11 @@ describe('Controller: jobResultsController', () => {
$provide.value('Rest', Rest);
$provide.value('$state', $state);
$provide.value('QuerySet', QuerySet);
$provide.value('moment', moment);
});
};
let injectVals = () => {
angular.mock.inject((_jobData_, _jobDataOptions_, _jobLabels_, _jobFinished_, _count_, _ParseTypeChange_, _ParseVariableString_, _jobResultsService_, _eventQueue_, _$compile_, $rootScope, $controller, $q, $httpBackend, _$log_, _Dataset_, _Rest_, _$state_, _QuerySet_, _moment_) => {
angular.mock.inject((_jobData_, _jobDataOptions_, _jobLabels_, _jobFinished_, _count_, _ParseTypeChange_, _ParseVariableString_, _jobResultsService_, _eventQueue_, _$compile_, $rootScope, $controller, $q, $httpBackend, _$log_, _Dataset_, _Rest_, _$state_, _QuerySet_) => {
// when you call $scope.$apply() (which you need to do to
// to get inside of .then blocks to test), something is
// causing a request for all static files.
@ -120,7 +110,6 @@ describe('Controller: jobResultsController', () => {
Rest = _Rest_;
$state = _$state_;
QuerySet = _QuerySet_;
moment = _moment_;
jobResultsService.getEvents.and
.returnValue(eventResolve);
@ -145,8 +134,7 @@ describe('Controller: jobResultsController', () => {
Dataset: Dataset,
Rest: Rest,
$state: $state,
QuerySet: QuerySet,
moment: moment
QuerySet: QuerySet
});
});
};