Merge 0fe5eb6 into 1945a05

motdotla · Apr 26, 2018 · f00faeb · f00faeb
2 parents 1945a05 + 0fe5eb6
commit f00faeb
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 1 deletion.
diff --git a/lib/main.js b/lib/main.js
@@ -51,7 +51,7 @@ function config (options) {
 
   if (options) {
     if (options.path) {
-      dotenvPath = options.path
+      dotenvPath = options.path.replace(/^file:\/\//, '')
     }
     if (options.encoding) {
       encoding = options.encoding

diff --git a/test/main.js b/test/main.js
@@ -1,6 +1,7 @@
 'use strict'
 
 require('should')
+var path = require('path')
 var sinon = require('sinon')
 var Lab = require('lab')
 var lab = exports.lab = Lab.script()
@@ -43,6 +44,24 @@ describe('dotenv', function () {
       done()
     })
 
+    it('takes option for path (file url, relative)', function (done) {
+      var testPath = 'test/.env'
+      var testUrl = 'file://' + testPath
+      dotenv.config({path: testUrl})
+
+      readFileSyncStub.args[0][0].should.eql(testPath)
+      done()
+    })
+
+    it('takes option for path (file url, absolute)', function (done) {
+      var testPath = path.join(__dirname, 'test', '.env')
+      var testUrl = 'file://' + testPath
+      dotenv.config({path: testUrl})
+
+      readFileSyncStub.args[0][0].should.eql(testPath)
+      done()
+    })
+
     it('takes option for encoding', function (done) {
       var testEncoding = 'base64'
       dotenv.config({encoding: testEncoding})