From b643dae4d5db6b482dde6a5ad03609a9afe82d20 Mon Sep 17 00:00:00 2001
From: Joe Fiorini <joe@joefiorini.com>
Date: Mon, 3 Aug 2015 15:33:03 -0400
Subject: [PATCH] Move testem.yml to packaging

---
 Makefile   |  7 +++++--
 testem.yml | 29 -----------------------------
 2 files changed, 5 insertions(+), 31 deletions(-)
 delete mode 100644 testem.yml

diff --git a/Makefile b/Makefile
index 20e4776d7d..148798cf5f 100644
--- a/Makefile
+++ b/Makefile
@@ -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:
diff --git a/testem.yml b/testem.yml
deleted file mode 100644
index 2d747a39b7..0000000000
--- a/testem.yml
+++ /dev/null
@@ -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