From 57058493bea0ff247d9bfe4610ee6dbc7e08ed55 Mon Sep 17 00:00:00 2001
From: Joe Fiorini <joe@joefiorini.com>
Date: Thu, 23 Jul 2015 15:38:14 -0400
Subject: [PATCH] Rename packaging folder for node stuff

---
 Makefile     | 10 +++++-----
 nodemon.json |  4 ++--
 testem.yml   |  2 +-
 3 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/Makefile b/Makefile
index 07b8ebe3e2..306941f042 100644
--- a/Makefile
+++ b/Makefile
@@ -299,7 +299,7 @@ reports/ui_code: node_modules clean-ui Brocfile.js bower.json Gruntfile.js
 
 # Run UI unit tests
 test_ui: node_modules minjs_ci
-	$(TESTEM) ci --file testem.yml -R xunit
+	$(TESTEM) ci --file testem.yml -p 7359 -R xunit
 
 # Run API unit tests across multiple Python/Django versions with Tox.
 test_tox:
@@ -309,16 +309,16 @@ test_tox:
 test_jenkins:
 	$(PYTHON) manage.py jenkins -v2 --enable-coverage --project-apps-tests
 
-Gruntfile.js: packaging/grunt/Gruntfile.js
+Gruntfile.js: packaging/node/Gruntfile.js
 	cp $< $@
 
-Brocfile.js: packaging/grunt/Brocfile.js
+Brocfile.js: packaging/node/Brocfile.js
 	cp $< $@
 
-bower.json: packaging/grunt/bower.json
+bower.json: packaging/node/bower.json
 	cp $< $@
 
-package.json: packaging/grunt/package.template
+package.json: packaging/node/package.template
 	sed -e 's#%NAME%#$(NAME)#;s#%VERSION%#$(VERSION)#;s#%GIT_REMOTE_URL%#$(GIT_REMOTE_URL)#;' $< > $@
 
 sync_ui: node_modules Brocfile.js
diff --git a/nodemon.json b/nodemon.json
index a9384ab872..b41431b7ba 100644
--- a/nodemon.json
+++ b/nodemon.json
@@ -7,8 +7,8 @@
   ],
   "watch": [
     "tools/ui/timepiece.js",
-    "packaging/grunt/Brocfile.js",
-    "packaging/grunt/tower-app.js"
+    "packaging/node/Brocfile.js",
+    "packaging/node/tower-app.js"
   ],
   "ext": "js json less html"
 }
diff --git a/testem.yml b/testem.yml
index fe6c8a0fae..514dc4b93f 100644
--- a/testem.yml
+++ b/testem.yml
@@ -14,7 +14,7 @@ test_page: tests.html
 disable_watching: true
 routes:
   /static: ../static
-  /tests.html: ../../../packaging/grunt/testem.mustache
+  /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