Do load .env.local in Rails' test environment

README.md

@@ -210,7 +210,7 @@ If you use this gem to handle env vars for multiple Rails environments (developm
 | 1st (highest)      | `.env.development.local` | Development          | Yes!                                                | Local overrides of environment-specific settings.            |
 | 1st                | `.env.test.local`        | Test                 | Yes!                                                | Local overrides of environment-specific settings.            |
 | 1st                | `.env.production.local`  | Production           | Yes!                                                | Local overrides of environment-specific settings.            |
-| 2nd                | `.env.local`             | Wherever the file is | Definitely.                                         | Local overrides. This file is loaded for all environments _except_ `test`. |
+| 2nd                | `.env.local`             | Wherever the file is | Definitely.                                         | Local overrides. This file is loaded for all environments.   |
 | 3rd                | `.env.development`       | Development          | No.                                                 | Shared environment-specific settings                         |
 | 3rd                | `.env.test`              | Test                 | No.                                                 | Shared environment-specific settings                         |
 | 3rd                | `.env.production`        | Production           | No.                                                 | Shared environment-specific settings                         |

lib/dotenv/rails.rb

@@ -66,7 +66,7 @@ def self.load
     def dotenv_files
       [
         root.join(".env.#{Rails.env}.local"),
-        (root.join(".env.local") unless Rails.env.test?),
+        root.join(".env.local"),
         root.join(".env.#{Rails.env}"),
         root.join(".env")
       ].compact

spec/dotenv/rails_spec.rb

@@ -50,17 +50,18 @@ def add(*items)
       expect(Spring.watcher.items).to include(path)
     end
 
-    it "does not load .env.local in test rails environment" do
+    it "loads .env.local in test rails environment" do
       expect(Dotenv::Railtie.instance.send(:dotenv_files)).to eql(
         [
           Rails.root.join(".env.test.local"),
+          Rails.root.join(".env.local"),
           Rails.root.join(".env.test"),
           Rails.root.join(".env")
         ]
       )
     end
 
-    it "does load .env.local in development environment" do
+    it "loads .env.local in development environment" do
       Rails.env = "development"
       expect(Dotenv::Railtie.instance.send(:dotenv_files)).to eql(
         [
@@ -72,8 +73,8 @@ def add(*items)
       )
     end
 
-    it "loads .env.test before .env" do
-      expect(ENV["DOTENV"]).to eql("test")
+    it "loads .env.local before .env" do
+      expect(ENV["DOTENV"]).to eql("local")
     end
 
     context "when Rails.root is nil" do
@@ -91,17 +92,18 @@ def add(*items)
   context "overload" do
     before { Dotenv::Railtie.overload }
 
-    it "does not load .env.local in test rails environment" do
+    it "loads .env.local in test rails environment" do
       expect(Dotenv::Railtie.instance.send(:dotenv_files)).to eql(
         [
           Rails.root.join(".env.test.local"),
+          Rails.root.join(".env.local"),
           Rails.root.join(".env.test"),
           Rails.root.join(".env")
         ]
       )
     end
 
-    it "does load .env.local in development environment" do
+    it "loads .env.local in development environment" do
       Rails.env = "development"
       expect(Dotenv::Railtie.instance.send(:dotenv_files)).to eql(
         [
@@ -113,7 +115,7 @@ def add(*items)
       )
     end
 
-    it "overloads .env.test with .env" do
+    it "overloads .env.local with .env" do
       expect(ENV["DOTENV"]).to eql("true")
     end
 

spec/fixtures/.env.local

@@ -1,2 +1 @@
-FROM_LOCAL=true
 DOTENV=local