From 694ba6f8af3fdc1336585f9853d2fc68a0dffc8b Mon Sep 17 00:00:00 2001
From: Romain Neutron <imprec@gmail.com>
Date: Fri, 1 Mar 2013 17:55:02 +0100
Subject: [PATCH] Move JS file to tests directory

---
 tests/js/login/config/testacular.conf.js         | 16 ++++++++++++++++
 .../js/login}/tests/unit/controllersSpec.js      |  0
 .../scripts/test.bat => tests/js/scripts/run.bat |  2 +-
 .../scripts/test.sh => tests/js/scripts/run.sh   |  2 +-
 .../js/angular => tests/js}/scripts/watchr.rb    |  0
 .../login/js/angular/config/testacular.conf.js   | 16 ----------------
 6 files changed, 18 insertions(+), 18 deletions(-)
 create mode 100644 tests/js/login/config/testacular.conf.js
 rename {www/skins/login/js/angular => tests/js/login}/tests/unit/controllersSpec.js (100%)
 rename www/skins/login/js/angular/scripts/test.bat => tests/js/scripts/run.bat (74%)
 mode change 100644 => 100755
 rename www/skins/login/js/angular/scripts/test.sh => tests/js/scripts/run.sh (75%)
 mode change 100644 => 100755
 rename {www/skins/login/js/angular => tests/js}/scripts/watchr.rb (100%)
 delete mode 100644 www/skins/login/js/angular/config/testacular.conf.js

diff --git a/tests/js/login/config/testacular.conf.js b/tests/js/login/config/testacular.conf.js
new file mode 100644
index 0000000000..a4b60d88c4
--- /dev/null
+++ b/tests/js/login/config/testacular.conf.js
@@ -0,0 +1,16 @@
+basePath = '../../../../';
+
+files = [
+    JASMINE,
+    JASMINE_ADAPTER,
+    'www/assets/angular/angular.js',
+    'www/assets/angular-ui/build/angular-ui.js',
+    'www/assets/underscore/underscore.js',
+    'www/assets/angular-mocks/angular-mocks.js',
+    'www/skins/login/js/angular/app/*.js',
+    'tests/js/login/tests/unit/*.js'
+];
+
+autoWatch = true;
+
+browsers = ['firefox'];
diff --git a/www/skins/login/js/angular/tests/unit/controllersSpec.js b/tests/js/login/tests/unit/controllersSpec.js
similarity index 100%
rename from www/skins/login/js/angular/tests/unit/controllersSpec.js
rename to tests/js/login/tests/unit/controllersSpec.js
diff --git a/www/skins/login/js/angular/scripts/test.bat b/tests/js/scripts/run.bat
old mode 100644
new mode 100755
similarity index 74%
rename from www/skins/login/js/angular/scripts/test.bat
rename to tests/js/scripts/run.bat
index 000242f53e..26c0121ea6
--- a/www/skins/login/js/angular/scripts/test.bat
+++ b/tests/js/scripts/run.bat
@@ -8,4 +8,4 @@ REM - NodeJS (http://nodejs.org/)
 REM - Testacular (npm install -g testacular)
 
 set BASE_DIR=%~dp0
-testacular start "%BASE_DIR%\..\config\testacular.conf.js" %*
+testacular start "%BASE_DIR%\..\login\config\testacular.conf.js" %*
diff --git a/www/skins/login/js/angular/scripts/test.sh b/tests/js/scripts/run.sh
old mode 100644
new mode 100755
similarity index 75%
rename from www/skins/login/js/angular/scripts/test.sh
rename to tests/js/scripts/run.sh
index 4c37cde250..cd62fae578
--- a/www/skins/login/js/angular/scripts/test.sh
+++ b/tests/js/scripts/run.sh
@@ -6,4 +6,4 @@ echo ""
 echo "Starting Testacular Server (http://vojtajina.github.com/testacular)"
 echo "-------------------------------------------------------------------"
 
-testacular start $BASE_DIR/../config/testacular.conf.js $*
+testacular start $BASE_DIR/../login/config/testacular.conf.js $*
diff --git a/www/skins/login/js/angular/scripts/watchr.rb b/tests/js/scripts/watchr.rb
similarity index 100%
rename from www/skins/login/js/angular/scripts/watchr.rb
rename to tests/js/scripts/watchr.rb
diff --git a/www/skins/login/js/angular/config/testacular.conf.js b/www/skins/login/js/angular/config/testacular.conf.js
deleted file mode 100644
index fd8f6c0362..0000000000
--- a/www/skins/login/js/angular/config/testacular.conf.js
+++ /dev/null
@@ -1,16 +0,0 @@
-basePath = '../../../../../';
-
-files = [
-    JASMINE,
-    JASMINE_ADAPTER,
-    'assets/angular/angular.js',
-    'assets/angular-ui/build/angular-ui.js',
-    'assets/underscore/underscore.js',
-    'assets/angular-mocks/angular-mocks.js',
-    'skins/login/js/angular/app/*.js',
-    'skins/login/js/angular/tests/unit/*.js'
-];
-
-autoWatch = true;
-
-browsers = ['firefox'];