Fixed tests running in Node v6

package.json

@@ -12,11 +12,10 @@
     "url": "https://github.com/marko-js/marko.git"
   },
   "scripts": {
-    "init-tests": "./test/init-tests.sh",
-    "test": "npm run init-tests && node_modules/.bin/mocha --ui bdd --reporter spec ./test && node_modules/.bin/jshint compiler/ runtime/ taglibs/",
-    "test-fast": "npm run init-tests && node_modules/.bin/mocha --ui bdd --reporter spec ./test/render-test",
-    "test-async": "npm run init-tests && node_modules/.bin/mocha --ui bdd --reporter spec ./test/render-async-test",
-    "test-taglib-loader": "npm run init-tests && node_modules/.bin/mocha --ui bdd --reporter spec ./test/taglib-loader-test",
+    "test": "node_modules/.bin/mocha --ui bdd --reporter spec ./test && node_modules/.bin/jshint compiler/ runtime/ taglibs/",
+    "test-fast": "node_modules/.bin/mocha --ui bdd --reporter spec ./test/render-test",
+    "test-async": "node_modules/.bin/mocha --ui bdd --reporter spec ./test/render-async-test",
+    "test-taglib-loader": "node_modules/.bin/mocha --ui bdd --reporter spec ./test/taglib-loader-test",
     "jshint": "node_modules/.bin/jshint compiler/ runtime/ taglibs/"
   },
   "author": "Patrick Steele-Idem <pnidem@gmail.com>",

test/adjustIndent-test.js

@@ -1,4 +1,6 @@
 'use strict';
+require('./patch-module');
+
 var chai = require('chai');
 chai.config.includeStack = true;
 var path = require('path');

test/api-tests.js

@@ -1,4 +1,6 @@
 'use strict';
+require('./patch-module');
+
 var chai = require('chai');
 chai.config.includeStack = true;
 var expect = require('chai').expect;

test/async-render-test.js

@@ -1,4 +1,6 @@
 'use strict';
+require('./patch-module');
+
 var chai = require('chai');
 chai.config.includeStack = true;
 var path = require('path');

test/codegen-test.js

@@ -1,4 +1,5 @@
 'use strict';
+require('./patch-module');
 
 var chai = require('chai');
 chai.config.includeStack = true;

test/compiler-test.js

@@ -1,4 +1,5 @@
 'use strict';
+require('./patch-module');
 
 var chai = require('chai');
 chai.config.includeStack = true;

test/expression-toString-test.js

@@ -1,4 +1,5 @@
 'use strict';
+require('./patch-module');
 
 var chai = require('chai');
 chai.config.includeStack = true;

test/hot-reload-test.js

@@ -1,4 +1,6 @@
 'use strict';
+require('./patch-module');
+
 var chai = require('chai');
 chai.config.includeStack = true;
 var expect = require('chai').expect;

test/init-tests.sh

@@ -1,10 +0,0 @@
-#!/bin/bash
-
-DIR=`dirname $0`
-
-cd ${DIR}
-
-if [ ! -L "./node_modules/marko" ]; then
-    mkdir -p node_modules
-    ln -s ../../ node_modules/marko
-fi

test/parseExpression-test.js

@@ -1,4 +1,6 @@
 'use strict';
+require('./patch-module');
+
 var chai = require('chai');
 chai.config.includeStack = true;
 var autotest = require('./autotest');

test/parseFor-test.js

@@ -1,4 +1,6 @@
 'use strict';
+require('./patch-module');
+
 var chai = require('chai');
 chai.config.includeStack = true;
 var parseFor = require('../taglibs/core/util/parseFor.js');

test/parseJavaScriptArgs-test.js

@@ -1,4 +1,6 @@
 'use strict';
+require('./patch-module');
+
 var chai = require('chai');
 chai.config.includeStack = true;
 var compiler = require('../compiler');

test/parser-test.js

@@ -1,4 +1,5 @@
 'use strict';
+require('./patch-module');
 
 var chai = require('chai');
 chai.config.includeStack = true;

test/patch-module.js

@@ -0,0 +1,13 @@
+var nodePath = require('path');
+
+var Module = require('module').Module;
+var oldResolveFilename = Module._resolveFilename;
+
+var rootDir = nodePath.join(__dirname, '../');
+Module._resolveFilename = function(request, parent, isMain) {
+    if (request.startsWith('marko')) {
+        request = request.substring('marko'.length);
+        request = rootDir + request;
+    }
+    return oldResolveFilename.call(this, request, parent, isMain);
+};

test/pretty-print-test.js

@@ -1,4 +1,5 @@
 'use strict';
+require('./patch-module');
 
 var chai = require('chai');
 chai.config.includeStack = true;

test/render-test.js

@@ -1,4 +1,6 @@
 'use strict';
+require('./patch-module');
+
 var chai = require('chai');
 chai.config.includeStack = true;
 var path = require('path');

test/taglib-finder-test.js

@@ -1,4 +1,6 @@
 'use strict';
+require('./patch-module');
+
 var chai = require('chai');
 chai.config.includeStack = true;
 require('chai').should();

test/taglib-loader-test.js

@@ -1,4 +1,6 @@
 'use strict';
+require('./patch-module');
+
 var chai = require('chai');
 chai.config.includeStack = true;
 require('chai').should();

test/taglib-lookup-test.js

@@ -1,4 +1,6 @@
 'use strict';
+require('./patch-module');
+
 var chai = require('chai');
 chai.config.includeStack = true;
 require('chai').should();

test/walker-test.js

@@ -1,4 +1,5 @@
 'use strict';
+require('./patch-module');
 
 var chai = require('chai');
 chai.config.includeStack = true;