Setup testing for ci and development

This commit is contained in:
Joe Fiorini 2015-01-29 12:06:17 -05:00
parent 2e87454e5a
commit 1809fec52e
4 changed files with 13 additions and 11 deletions

1
.gitignore vendored
View File

@ -6,6 +6,7 @@ awx/projects
awx/job_output
awx/public/media
awx/public/static
awx/ui/tests/test-results.xml
awx/ui/static/js/awx.min.js
awx/ui/static/js/local_config.js
awx/ui/static/css/awx.min.css

View File

@ -240,9 +240,9 @@ test_coverage:
coverage_html:
coverage html
# Run UI unit tests using Selenium.
test_ui:
$(PYTHON) manage.py test -v2 awx.ui.tests
# Run UI unit tests
test_ui: node_modules
$(GRUNT) karma:ci
# Run API unit tests across multiple Python/Django versions with Tox.
test_tox:

View File

@ -179,9 +179,6 @@
<script src="{{ STATIC_URL }}js/helpers/AboutAnsible.js"></script>
<script src="{{ STATIC_URL }}js/widgets/JobStatus.js"></script>
<script src="{{ STATIC_URL }}js/widgets/DashboardCounts.js"></script>
<script src="{{ STATIC_URL }}js/widgets/HostPieChart.js"></script>
<script src="{{ STATIC_URL }}js/widgets/HostGraph.js"></script>
<script src="{{ STATIC_URL }}js/widgets/JobStatusGraph.js"></script>
<script src="{{ STATIC_URL }}js/widgets/DashboardJobs.js"></script>
<script src="{{ STATIC_URL }}js/widgets/PortalJobs.js"></script>
<script src="{{ STATIC_URL }}js/widgets/Stream.js"></script>

View File

@ -1,8 +1,8 @@
// Karma configuration
// Generated on Mon Aug 04 2014 21:17:04 GMT-0400 (EDT)
module.exports = function() {
return {
module.exports = function(config) {
config.set({
// base path that will be used to resolve all patterns (eg. files, exclude)
basePath: '',
@ -53,7 +53,11 @@ module.exports = function() {
'../static/js/config.js',
'../static/js/directives/dashboard-graphs.js',
'../static/js/*/*.js',
'../static/js/app.js'
'../static/js/app.js',
'../static/lib/angular-mocks/angular-mocks.js',
'../../../node_modules/ng-midway-tester/src/ngMidwayTester.js',
'./unit/*',
'./unit/**/*'
],
@ -72,7 +76,7 @@ module.exports = function() {
// test results reporter to use
// possible values: 'dots', 'progress'
// available reporters: https://npmjs.org/browse/keyword/karma-reporter
reporters: ['progress'],
reporters: ['dots', 'progress'],
client: {
mocha: {
@ -102,5 +106,5 @@ module.exports = function() {
// if true, Karma captures browsers, runs the tests and exits
singleRun: false
};
});
};