Fixed tests, waiting for CI now

tests/check_output_matches.js

@@ -0,0 +1,41 @@
+var fs = require('fs');
+var path = require('path');
+var testsDir = path.dirname(require.main.filename);
+var incorrectFiles = [];
+
+var error = false;
+
+var filesToWatch = [
+    'css.css',
+    'js.js',
+    'less.css',
+    'sass.css'
+];
+
+console.log('Testing...');
+
+for (var i = 0, l = filesToWatch.length; i < l; i++) {
+    var file = filesToWatch[i];
+    var outputContent = fs.readFileSync(testsDir+'/output_tests/'+file).toString().trim();
+    var expectedContent = fs.readFileSync(testsDir+'/output_expected/'+file).toString().trim();
+
+    if (outputContent !== expectedContent) {
+        error = true;
+        incorrectFiles.push({
+            file: file,
+            expected: expectedContent,
+            test_result: outputContent
+        });
+        process.stdout.write('\x1b[37m\x1b[41mE\x1b[0m');
+    } else {
+        process.stdout.write('\x1b[32m.\x1b[0m');
+    }
+}
+
+if (error) {
+    console.log("\nErrors:");
+    console.log(JSON.stringify(incorrectFiles, null, 4));
+    process.exit(1);
+} else {
+    console.log("\nOk!");
+}

tests/input/css.css

@@ -3,5 +3,5 @@ Testing file
 */
 body
 {
-    background: #fff;
+    background: #ffffff;
 }

tests/input/less.less

@@ -1,8 +1,10 @@
-.border {
-    border: solid 1px black;
+@color: #333333;
+
+.color() {
+    color: @color;
 }
 
-.element {
-    display: none;
-    .border;
+body {
+    border-radius: 3px;
+    .color();
 }

tests/input/sass.scss

@@ -0,0 +1,10 @@
+$color: #333333;
+
+@mixin color {
+    color: $color;
+}
+
+body {
+    border-radius: 3px;
+    @include color();
+}

tests/output_expected/css.css

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

tests/output_expected/js.js

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

tests/output_expected/less.css

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

tests/output_expected/sass.css

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

tests/prepare_tests.js

@@ -1,39 +1,39 @@
 var fs = require('fs');
 var path = require('path');
 var testsDir = path.dirname(require.main.filename);
-var gulpfileContents = fs.readFileSync(testsDir+'/../gulpfile.js').toString()
 
-    // Update output directory
-    .replace(
-        /"output_directory": "web",/g,
-        '"output_directory": "output_tests",'
-    )
+var config = {
+    "output_directory": "output_tests",
+    "images": {},
+    "files_to_watch": [],
+    "css": {
+        "css.css": [
+            "input/css.css"
+        ]
+    },
+    "less": {
+        "less.css": [
+            "input/less.less"
+        ]
+    },
+    "sass": {
+        "sass.css": [
+            "input/sass.scss"
+        ]
+    },
+    "js": {
+        "js.js": [
+            "input/js.js"
+        ]
+    }
+};
 
-    // Setup all command options to run everything
-
-    .replace(
-        /"css": \{([^}]+)\}/g,
-        '"css": {' +
-            '"output_expected/css.css": [' +
-                '"input/css.css"' +
-            ']' +
-        '}'
-    )
-    .replace(
-        /"less": \{([^}]+)\}/g,
-        '"less": {' +
-            '"output_expected/less.less": [' +
-                '"input/less.less"' +
-            ']' +
-        '}'
-    )
+var gulpfileContents = fs
+    .readFileSync(testsDir+'/../gulpfile.js')
+    .toString()
     .replace(
-        /"js": \{([^}]+)\}/g,
-        '"js": {' +
-            '"output_expected/js.js": [' +
-                '"input/js.js"' +
-            ']' +
-        '}'
+        /var config =(?:[^£]+)(\*)+ End config/g,
+        'var config = ' + JSON.stringify(config, null, 4) + ";\n"+ '/$1 End config'
     )
 ;
 

tests/tests.bash

@@ -3,16 +3,31 @@
 # Go back to root project directory
 cd `dirname $0`/../
 
-if [[ '--reinstall' == *"$*"* ]]; then
+REINSTALL=0
+
+while test $# -gt 0
+do
+    case "$1" in
+        --reinstall) REINSTALL=1
+            ;;
+    esac
+    shift
+done
+
+
+if [[ ${REINSTALL} == 1 ]]; then
     echo "Removing node modules..."
     rm -rf node_modules/
 
     echo "Installing dependencies..."
     npm install
 fi
 
+rm tests/output_tests/*
+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
+./node_modules/.bin/gulp --gulpfile tests/gulpfile.js dump --prod