Merge pull request #231 from Kashoo/issue-230-template-file-paths

Issue 230: Fix file path resolution for test and validation environment templates
OldSneerJaw · Feb 17, 2018 · f1df768 · f1df768
2 parents 1138012 + 16fed54
commit f1df768
Show file tree

Hide file tree

Showing 4 changed files with 16 additions and 4 deletions.
diff --git a/src/testing/test-environment-maker.js b/src/testing/test-environment-maker.js
@@ -9,6 +9,7 @@
 exports.init = init;
 
 var fs = require('fs');
+var path = require('path');
 var vm = require('vm');
 var underscore = require('../../lib/underscore/underscore-min');
 var simpleMock = require('../../lib/simple-mock/index');
@@ -19,7 +20,8 @@ function init(rawSyncFunction, syncFunctionFile) {
     displayErrors: true
   };
 
-  var environmentTemplate = fs.readFileSync('templates/test-environment-template.js', 'utf8').trim();
+  var filePath = path.resolve(__dirname, '../../templates/test-environment-template.js');
+  var environmentTemplate = fs.readFileSync(filePath, 'utf8').trim();
 
   // The test environment includes a placeholder string called "%SYNC_FUNC_PLACEHOLDER%" that is to be replaced with the contents of
   // the sync function

diff --git a/src/testing/test-environment-maker.spec.js b/src/testing/test-environment-maker.spec.js
@@ -1,4 +1,5 @@
 var expect = require('chai').expect;
+var path = require('path');
 var simpleMock = require('../../lib/simple-mock/index.js');
 var mockRequire = require('mock-require');
 
@@ -48,7 +49,10 @@ describe('Test environment maker', function() {
     expect(result).to.eql(expectedResult);
 
     expect(fsMock.readFileSync.callCount).to.equal(1);
-    expect(fsMock.readFileSync.calls[0].args).to.eql([ 'templates/test-environment-template.js', 'utf8' ]);
+    expect(fsMock.readFileSync.calls[0].args).to.eql([
+      path.resolve(__dirname, '../../templates/test-environment-template.js'),
+      'utf8'
+    ]);
 
     expect(vmMock.runInThisContext.callCount).to.equal(1);
     expect(vmMock.runInThisContext.calls[0].args).to.eql([

diff --git a/src/validation/validation-environment-maker.js b/src/validation/validation-environment-maker.js
@@ -12,6 +12,7 @@
 exports.init = init;
 
 var fs = require('fs');
+var path = require('path');
 var vm = require('vm');
 var underscore = require('../../lib/underscore/underscore-min');
 var simpleMock = require('../../lib/simple-mock/index');
@@ -22,7 +23,8 @@ function init(docDefinitionsString, originalFilename) {
     displayErrors: true
   };
 
-  var envTemplateString = fs.readFileSync('templates/validation-environment-template.js', 'utf8').trim();
+  var filePath = path.resolve(__dirname, '../../templates/validation-environment-template.js');
+  var envTemplateString = fs.readFileSync(filePath, 'utf8').trim();
 
   // The test helper environment includes a placeholder string called "%DOC_DEFINITIONS_PLACEHOLDER%" that is to be replaced with the
   // contents of the document definitions

diff --git a/src/validation/validation-environment-maker.spec.js b/src/validation/validation-environment-maker.spec.js
@@ -1,4 +1,5 @@
 var expect = require('chai').expect;
+var path = require('path');
 var simpleMock = require('../../lib/simple-mock/index');
 var mockRequire = require('mock-require');
 
@@ -40,7 +41,10 @@ describe('Validation environment maker', function() {
     expect(result).to.eql(expectedResult);
 
     expect(fsMock.readFileSync.callCount).to.equal(1);
-    expect(fsMock.readFileSync.calls[0].args).to.eql([ 'templates/validation-environment-template.js', 'utf8' ]);
+    expect(fsMock.readFileSync.calls[0].args).to.eql([
+      path.resolve(__dirname, '../../templates/validation-environment-template.js'),
+      'utf8'
+    ]);
 
     expect(vmMock.runInThisContext.callCount).to.equal(1);
     expect(vmMock.runInThisContext.calls[0].args).to.eql([