From 2ebe9d681a32da211ebefcac873723ec6b944c74 Mon Sep 17 00:00:00 2001
From: Hristo Deshev <hristo@deshev.com>
Date: Mon, 30 May 2016 12:41:18 +0300
Subject: [PATCH] Fix node-tests on OSX by explicitly requiring modules with
 relative paths.

---
 gruntfile.js                   | 12 ++++++------
 node-tests/node-shims.ts       |  1 +
 node-tests/test-angular-xml.ts |  5 +++--
 node-tests/test-xml.ts         |  5 +++--
 4 files changed, 13 insertions(+), 10 deletions(-)
 create mode 100644 node-tests/node-shims.ts

diff --git a/gruntfile.js b/gruntfile.js
index 346d5dfc7..7d94af638 100644
--- a/gruntfile.js
+++ b/gruntfile.js
@@ -152,7 +152,7 @@ module.exports = function(grunt) {
     };
 
     var nodeTestEnv = JSON.parse(JSON.stringify(process.env));
-    nodeTestEnv.NODE_PATH = localCfg.outTnsCoreModules
+    nodeTestEnv.NODE_PATH = localCfg.outTnsCoreModules;
 
     localCfg.nodeTestsDir = path.join(localCfg.outDir, 'node-tests');
 
@@ -546,10 +546,10 @@ module.exports = function(grunt) {
         grunt.file.write(combinedDtsPath, dtsLines.join('\n'));
     }
     function generateModulesDts(outDir) {
-        var angularConflicts = ['module.d.ts']
+        var angularConflicts = ['module.d.ts'];
         var angularExcludes = angularConflicts.map(function(file) {
             return '!' + file;
-        })
+        });
         var nonES6Files = [
             'es-collections.d.ts',
             'es6-promise.d.ts',
@@ -558,7 +558,7 @@ module.exports = function(grunt) {
         ];
         var es6Excludes = nonES6Files.map(function(file) {
             return '!' + file;
-        })
+        });
         var dtsFiles = grunt.file.expand({cwd: localCfg.outTnsCoreModules }, [
             "**/*.d.ts",
             //Exclude the d.ts files in the apps folder - these are part of the apps and are already packed there!
@@ -582,8 +582,8 @@ module.exports = function(grunt) {
         writeDtsFile(es6Files, outDir, 'tns-core-modules/tns-core-modules.es6.d.ts');
         var allFiles = angularConflicts.concat(nonES6Files).concat(['tns-core-modules.base.d.ts']);
         writeDtsFile(allFiles, outDir, 'tns-core-modules/tns-core-modules.d.ts');
-    };
-    
+    }
+
     grunt.registerTask("processTestsApp", function(outTestsAppDir, pkgAppNameSuffix) {
         var tasks = [
             {
diff --git a/node-tests/node-shims.ts b/node-tests/node-shims.ts
new file mode 100644
index 000000000..97f749657
--- /dev/null
+++ b/node-tests/node-shims.ts
@@ -0,0 +1 @@
+declare var require: any;
diff --git a/node-tests/test-angular-xml.ts b/node-tests/test-angular-xml.ts
index 66e1ef92c..f39887e0a 100644
--- a/node-tests/test-angular-xml.ts
+++ b/node-tests/test-angular-xml.ts
@@ -1,5 +1,6 @@
 import {assert} from "chai";
-import xml = require('xml');
+import * as xmlModule from "xml";
+var xml: typeof xmlModule = require("../tns-core-modules/xml");
 
 describe("angular xml parser", () => {
     let last_element = null;
@@ -7,7 +8,7 @@ describe("angular xml parser", () => {
     let parser = null;
 
     beforeEach(() => {
-        parser = new xml.XmlParser(function (event: xml.ParserEvent) {
+        parser = new xml.XmlParser(function (event: xmlModule.ParserEvent) {
             switch (event.eventType) {
                 case xml.ParserEventType.StartElement:
                     last_element = event.elementName;
diff --git a/node-tests/test-xml.ts b/node-tests/test-xml.ts
index 3d68641f5..009c20689 100644
--- a/node-tests/test-xml.ts
+++ b/node-tests/test-xml.ts
@@ -1,5 +1,6 @@
 import {assert} from "chai";
-import xml = require('xml');
+import * as xmlModule from "xml";
+var xml: typeof xmlModule = require("../tns-core-modules/xml");
 
 describe("xml parser", () => {
     let last_element = null;
@@ -8,7 +9,7 @@ describe("xml parser", () => {
     let parser = null;
 
     beforeEach(() => {
-        parser = new xml.XmlParser(function (event: xml.ParserEvent) {
+        parser = new xml.XmlParser(function (event: xmlModule.ParserEvent) {
             switch (event.eventType) {
                 case xml.ParserEventType.StartElement:
                     last_element = event.elementName;