fix: incorrect .js config resolving

mad-gooze · mad-gooze · commit db6b53901b36 · 2017-06-23T16:37:11.000+03:00
diff --git a/lib/config/config-reader.js b/lib/config/config-reader.js
@@ -23,12 +23,12 @@ function getDefaultConfig() {
         throw new GeminiError('No config found');
     }
 
-    return path.resolve(configFile);
+    return configFile;
 }
 
 function requireModule(file) {
     try {
-        return require(file);
+        return require(path.resolve(file));
     } catch (e) {
         if (e.code === 'MODULE_NOT_FOUND') {
             throw new GeminiError('Config file does not exist: ' + file);
diff --git a/test/unit/config/config-reader.js b/test/unit/config/config-reader.js
@@ -25,21 +25,31 @@ describe('config/config-reader', () => {
     }
 
     describe('default config (js|json)', () => {
-        function test_(fileName) {
+        const test_ = (fileName) => {
             it('should read ' + fileName, () => {
-                const files = {};
-                files[fileName] = {some: 'data'};
-                const reader = initReader_(files);
-
+                const reader = initReader_({[fileName]: {foo: 'bar'}});
                 const result = reader.read();
-
-                assert.deepEqual(result, {some: 'data'});
+                assert.deepEqual(result, {foo: 'bar'});
             });
-        }
+        };
 
         test_('.gemini.conf.js');
         test_('.gemini.js');
         test_('.gemini.conf.json');
         test_('.gemini.json');
     });
+
+    describe('custom config (js|json)', () => {
+        const test_ = (fileName) => {
+            it('should read ' + fileName, () => {
+                const reader = initReader_({[fileName]: {foo: 'bar'}});
+                const result = reader.read(fileName);
+                assert.deepEqual(result, {foo: 'bar'});
+            });
+        };
+        test_('some-file.js');
+        test_('some-file.json');
+        test_('some-dir/some-file.js');
+        test_('some-dir/some-file.json');
+    });
 });

Original file line number	Diff line number	Diff line change
`@@ -23,12 +23,12 @@ function getDefaultConfig() {`
`23`	`23`	`throw new GeminiError('No config found');`
`24`	`24`	`}`
`25`	`25`
`26`		`- return path.resolve(configFile);`
	`26`	`+ return configFile;`
`27`	`27`	`}`
`28`	`28`
`29`	`29`	`function requireModule(file) {`
`30`	`30`	`try {`
`31`		`- return require(file);`
	`31`	`+ return require(path.resolve(file));`
`32`	`32`	`} catch (e) {`
`33`	`33`	`if (e.code === 'MODULE_NOT_FOUND') {`
`34`	`34`	`throw new GeminiError('Config file does not exist: ' + file);`