Fix incorrect resource path (#9)

* fix incorrect require path * version bump to 0.1.1 * remove log
Vermonster · Jun 18, 2018 · 854a7ac · 854a7ac
1 parent cef2af5
commit 854a7ac
Show file tree

Hide file tree

Showing 5 changed files with 4 additions and 10 deletions.
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "fhir-kit-models",
-  "version": "0.1.0",
+  "version": "0.1.1",
   "main": "dist/index.js",
   "repository": "[email protected]:Vermonster/fhir-kit-models.git",
   "author": "Stephen MacVicar <[email protected]>",

diff --git a/src/helpers.js b/src/helpers.js
@@ -10,7 +10,7 @@ const checkResourceType = resourceType => {
 
 const loadResource = resourceType => {
   checkResourceType(resourceType);
-  const resourcePath = `resources/${resourceType}`;
+  const resourcePath = `./${resourceType}`;
   try {
     return require(resourcePath); // eslint-disable-line import/no-dynamic-require
   } catch (_error) {

diff --git a/test/array-proxy-test.js b/test/array-proxy-test.js
@@ -8,16 +8,13 @@ describe('ArrayProxy', function () {
   let template;
 
   before(function () {
-    mock('./ArrayProxy', require('../src/ArrayProxy'));
-    mock('./helpers', require('../src/helpers'));
-
     template = loadResourceTemplates();
     const schema = JSON.parse(fs.readFileSync(path.normalize(`${__dirname}/fixtures/base-resource.json`)));
 
     generateClass(schema, 'tmp', template);
 
     BaseResource = require('../tmp/BaseResource');
-    mock('resources/BaseResource', require('../tmp/BaseResource'));
+    mock('../src/BaseResource', BaseResource);
   });
 
   after(function () {

diff --git a/test/helpers-test.js b/test/helpers-test.js
@@ -61,7 +61,7 @@ describe('loadResource', function () {
   const testResource = { abc: '123' };
 
   before(function () {
-    mock('resources/TestResource', testResource);
+    mock('../src/TestResource', testResource);
   });
 
   after(function () {

diff --git a/test/resource-test.js b/test/resource-test.js
@@ -6,9 +6,6 @@ describe('Generated Resources', function () {
   let template;
 
   before(function () {
-    mock('../ArrayProxy', require('../src/ArrayProxy'));
-    mock('../helpers', require('../src/helpers'));
-
     template = loadResourceTemplates();
     const schema = JSON.parse(fs.readFileSync(path.normalize(`${__dirname}/fixtures/base-resource.json`)));
     generateClass(schema, 'tmp', template);