From 54c7d12ba321f5630c88ca389afcd09e6d9ca31b Mon Sep 17 00:00:00 2001
From: Simone Deponti <simone.deponti@gmail.com>
Date: Thu, 20 Sep 2012 12:54:04 +0200
Subject: [PATCH] Fixed path replacements in text a little bit better.

---
 test/less-test.js | 30 ++++++++++++++++++------------
 1 file changed, 18 insertions(+), 12 deletions(-)

diff --git a/test/less-test.js b/test/less-test.js
index f39447cf..55041684 100644
--- a/test/less-test.js
+++ b/test/less-test.js
@@ -25,7 +25,7 @@ sys.puts("\n" + stylize("LESS", 'underline') + "\n");
 
 runTestSet();
 
-runTestSet(null, "errors/", function(name, err, compiledLess) {
+runTestSet(null, "errors/", function(name, err, compiledLess, doReplacements) {
     fs.readFile(path.join('test/less/', name) + '.txt', 'utf-8', function (e, expectedErr) {
         sys.print("- " + name + ": ");
         expectedErr = doReplacements(expectedErr, 'test/less/errors/');
@@ -44,7 +44,12 @@ runTestSet(null, "errors/", function(name, err, compiledLess) {
             }
         }
         sys.puts("");
-    });});
+    });}, null, function(input, directory) {
+        return input.replace(
+            "{path}", path.join(process.cwd(), "/test/less/errors/"))
+            .replace("{pathrel}", path.join("test", "less", "errors/"))
+            .replace(/\r\n/g, '\n');
+    });
 
 runTestSet({dumpLineNumbers: 'comments'}, "debug/", null,
            function(name) { return name + '-comments'; });
@@ -53,9 +58,18 @@ runTestSet({dumpLineNumbers: 'mediaquery'}, "debug/", null,
 runTestSet({dumpLineNumbers: 'all'}, "debug/", null,
            function(name) { return name + '-all'; });
 
-function runTestSet(options, foldername, verifyFunction, nameModifier) {
+function globalReplacements(input, directory) {
+    return input.replace(/\{path\}/g, path.join(process.cwd(), directory))
+            .replace(/\{pathimport\}/g, path.join(process.cwd(), directory + "import/"))
+            .replace(/\r\n/g, '\n');
+}
+
+function runTestSet(options, foldername, verifyFunction, nameModifier, doReplacements) {
     foldername = foldername || "";
 
+    if(!doReplacements)
+        doReplacements = globalReplacements;
+
     fs.readdirSync(path.join('test/less/', foldername)).forEach(function (file) {
         if (! /\.less/.test(file)) { return }
         
@@ -68,7 +82,7 @@ function runTestSet(options, foldername, verifyFunction, nameModifier) {
         toCSS(options, path.join('test/less/', foldername + file), function (err, less) {
 
             if (verifyFunction) {
-                return verifyFunction(name, err, less);
+                return verifyFunction(name, err, less, doReplacements);
             }
             var css_name = name;
             if(nameModifier) css_name=nameModifier(name);
@@ -88,14 +102,6 @@ function runTestSet(options, foldername, verifyFunction, nameModifier) {
     });
 }
 
-function doReplacements(input, directory) {
-    return input.replace(/\{path\}/g, path.join(process.cwd(), directory))
-            .replace(/\{pathimport\}/g, path.join(process.cwd(), directory + "import/"))
-            .replace("{path}", path.join(process.cwd(), "/test/less/errors/"))
-            .replace("{pathrel}", path.join("test", "less", "errors/"))
-            .replace(/\r\n/g, '\n');
-}
-
 function diff(left, right) {
     sys.puts("");
     require('diff').diffLines(left, right).forEach(function(item) {