Move testem.yml to packaging

This commit is contained in:
Joe Fiorini 2015-08-03 15:33:03 -04:00
parent bddcb06fab
commit b643dae4d5
2 changed files with 5 additions and 31 deletions

View File

@ -314,6 +314,9 @@ bower.json: packaging/node/bower.json
package.json: packaging/node/package.template
sed -e 's#%NAME%#$(NAME)#;s#%VERSION%#$(VERSION)#;s#%GIT_REMOTE_URL%#$(GIT_REMOTE_URL)#;' $< > $@
testem.yml: packaging/node/testem.yml
cp $< $@
# Update local npm install
node_modules: package.json
npm install
@ -331,11 +334,11 @@ minjs: awx/ui/static node_modules clean-ui Brocfile.js
# Performs build to awx/ui/build_test and runs node tests via mocha
testjs: UI_FLAGS=--node-tests --no-concat --no-styles $(EXTRA_UI_FLAGS)
testjs: awx/ui/build_test node-tests
testjs: awx/ui/build_test node-tests testem.yml
# Performs minified, compressed build to awx/ui/static and runs browsers tests with testem ci
testjs_ci: UI_FLAGS=--compress --no-docs --no-debug --browser-tests $(EXTRA_UI_FLAGS)
testjs_ci: awx/ui/static browser-tests
testjs_ci: awx/ui/static browser-tests testem.yml
# Runs node tests via mocha without building
node-tests:

View File

@ -1,29 +0,0 @@
---
framework: mocha
cwd: awx/ui/client
port: 7358
src_files:
- src/**/*.js
- tests/**/*.js
serve_files:
- ../static/tower.concat.js
- ../static/tests/**/*.js
- ../static/tests/unit.js
unsafe_file_serving: true
test_page: tests.html
disable_watching: true
routes:
/static: ../static
/tests.html: ../../../packaging/node/testem.mustache
/test-loader.js: lib/ember-cli-test-loader/test-loader.js
/vendor: ../../../node_modules
/angular-mocks.js: lib/angular-mocks/angular-mocks.js
reporter: xunit
report_file: reports/test-results-ui.xml
launch_in_dev:
- Mocha
launch_in_ci:
- PhantomJS
launchers:
Mocha:
command: make node-tests