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

Fix failing tests

Browse Source
This commit is contained in:
Joe Fiorini 2015-02-06 10:21:25 -05:00
parent 6a2fa3c6ce
commit 8d1898e4ae
4 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
awx/ui/static/js/services/host-count-graph-data.js
View File

@ -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);
});
}
};

5
awx/ui/static/js/services/job-status-graph-data.js
View File

@ -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);

3
awx/ui/tests/karma.conf.js
View File

@ -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/**/*'
],

3
awx/ui/tests/unit/services/host-count-graph-data-test.js
View File

@ -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);
}));