Refactored tests

# Conflicts: # gulpfile.js # tests/tests.bash
Orbitale · Apr 9, 2017 · b00a69d · b00a69d
1 parent 803ebf2
commit b00a69d
Show file tree

Hide file tree

Showing 7 changed files with 24 additions and 14 deletions.
diff --git a/gulpfile.js b/gulpfile.js
@@ -1,9 +1,9 @@
 /*
-There here is YOUR config
-This var is an example of the assets you can use in your own application.
-The array KEYS correspond to the OUTPUT files/directories,
-The array VALUES contain a LIST OF SOURCE FILES
-*/
+ * There here is YOUR config
+ * This var is an example of the assets you can use in your own application.
+ * The array KEYS correspond to the OUTPUT files/directories,
+ * The array VALUES contain a LIST OF SOURCE FILES
+ */
 const config = {
 
     // The base output directory for all your assets

diff --git a/tests/output_expected/css.css b/tests/output_expected/css.css
@@ -1 +1 @@
-body{background:#fff}
+body{background:#fff}
diff --git a/tests/output_expected/js.js b/tests/output_expected/js.js
@@ -1 +1 @@
-!function(e){e("#element").hide()}(jQuery);
+!function(e){e("#element").hide()}(jQuery);
diff --git a/tests/output_expected/less.css b/tests/output_expected/less.css
@@ -1 +1 @@
-body{border-radius:3px;color:#333}
+body{border-radius:3px;color:#333}
diff --git a/tests/output_expected/sass.css b/tests/output_expected/sass.css
@@ -1 +1 @@
-body{border-radius:3px;color:#333}
+body{border-radius:3px;color:#333}
diff --git a/tests/prepare_tests.js b/tests/prepare_tests.js
@@ -32,8 +32,8 @@ var gulpfileContents = fs
     .readFileSync(testsDir+'/../gulpfile.js')
     .toString()
     .replace(
-        /var config =(?:[^£]+)(\*)+ End config/g,
-        'var config = ' + JSON.stringify(config, null, 4) + ";\n"+ '/$1 End config'
+        /const config =(?:[^£]+)(\*+) End config \*/g,
+        'const config = ' + JSON.stringify(config, null, 4) + ";\n"+ '/$1 End config *'
     )
 ;
 

diff --git a/tests/tests.bash b/tests/tests.bash
@@ -1,8 +1,12 @@
 #!/bin/bash
 
+set -e
+
 # Go back to root project directory
 cd `dirname $0`/../
 
+echo "Directory: `pwd`"
+
 REINSTALL=0
 
 while test $# -gt 0
@@ -23,11 +27,17 @@ if [[ ${REINSTALL} == 1 ]]; then
     npm install
 fi
 
-rm tests/output_tests/*
-rm tests/gulpfile.js
+rm -f tests/output_tests/*
+test -f tests/gulpfile.js && rm tests/gulpfile.js
 
 echo "Preparing tests..."
 node tests/prepare_tests.js
 
 echo "Executing gulp dump..."
-./node_modules/.bin/gulp --gulpfile tests/gulpfile.js dump --prod
+node node_modules/gulp/bin/gulp.js --gulpfile tests/gulpfile.js dump --prod
+
+echo "Test expected files are correctly dumped"
+echo -e " > css.css\c" && cmp tests/output_expected/css.css tests/output_tests/css.css && echo -e " > OK"
+echo -e " > js.js\c" && cmp tests/output_expected/js.js tests/output_tests/js.js && echo -e " > OK"
+echo -e " > less.css\c" && cmp tests/output_expected/less.css tests/output_tests/less.css && echo -e " > OK"
+echo -e " > sass.css\c" && cmp tests/output_expected/sass.css tests/output_tests/sass.css && echo -e " > OK"
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		!function(e){e("#element").hide()}(jQuery);
		!function(e){e("#element").hide()}(jQuery);
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		body{border-radius:3px;color:#333}
		body{border-radius:3px;color:#333}