Refactored tests

gulpfile.js

@@ -185,7 +185,8 @@ gulp.task('less', function(done) {
             console.info("       > "+assets[i]);
         }
     }
-    done();
+
+    pipes ? pipes.on('end', function(){done();}) : done();
 });
 
 /**
@@ -215,7 +216,8 @@ gulp.task('sass', function(done) {
             console.info("       > "+assets[i]);
         }
     }
-    done();
+
+    pipes ? pipes.on('end', function(){done();}) : done();
 });
 
 /**
@@ -242,7 +244,8 @@ gulp.task('copy', function(done) {
             console.info("       > "+assets[i]);
         }
     }
-    done();
+
+    pipes ? pipes.on('end', function(){done();}) : done();
 });
 
 /**
@@ -275,7 +278,8 @@ gulp.task('images', function(done) {
             console.info("       > "+assets[i]);
         }
     }
-    done();
+
+    pipes ? pipes.on('end', function(){done();}) : done();
 });
 
 /**
@@ -304,7 +308,8 @@ gulp.task('css', function(done) {
             console.info("       > "+assets[i]);
         }
     }
-    done();
+
+    pipes ? pipes.on('end', function(){done();}) : done();
 });
 
 /**
@@ -333,20 +338,16 @@ gulp.task('js', function(done) {
             console.info("       > "+assets[i]);
         }
     }
-    done();
+
+    pipes ? pipes.on('end', function(){done();}) : done();
 });
 
 /**
  * Runs all the needed commands to dump all assets and manifests
  */
-var dumpTasks = [];
-if (hasImages) { dumpTasks.push('images'); }
-if (hasCopy) { dumpTasks.push('copy'); }
-if (hasLess) { dumpTasks.push('less'); }
-if (hasSass) { dumpTasks.push('sass'); }
-if (hasCss) { dumpTasks.push('css'); }
-if (hasJs) { dumpTasks.push('js'); }
-gulp.task('dump', gulp.parallel.apply(gulp, dumpTasks), function(done) { done(); });
+gulp.task('dump', gulp.series('images', 'copy', 'less', 'sass', 'css', 'js', function(done){
+    done();
+}));
 
 /**
  * Will watch for files and run "dump" for each modification

tests/output_expected/css.css

@@ -1 +1 @@
-body{background:#fff}
+body{background:#fff}

tests/output_expected/js.js

@@ -1 +1 @@
-!function(e){e("#element").hide()}(jQuery);
+!function(e){e("#element").hide()}(jQuery);

tests/output_expected/less.css

@@ -1 +1 @@
-body{border-radius:3px;color:#333}
+body{border-radius:3px;color:#333}

tests/output_expected/sass.css

@@ -1 +1 @@
-body{border-radius:3px;color:#333}
+body{border-radius:3px;color:#333}

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 *'
     )
 ;
 

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 node_modules/gulp4/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"