From fcdeac4f822b3c03a013a0c43f3e6b95c442f336 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dominik=20=C4=8Cerm=C3=A1k?= Date: Sat, 25 Jun 2022 12:54:48 +0200 Subject: [PATCH] Fix Dotenv::Railtie.overload to keep .env files priority policy https://github.com/bkeepers/dotenv/issues/424 --- lib/dotenv/rails.rb | 2 +- spec/dotenv/rails_spec.rb | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/lib/dotenv/rails.rb b/lib/dotenv/rails.rb index c799ffb4..38d71c57 100644 --- a/lib/dotenv/rails.rb +++ b/lib/dotenv/rails.rb @@ -45,7 +45,7 @@ def load # # Same as `load`, but will override existing values in `ENV` def overload - Dotenv.overload(*dotenv_files) + Dotenv.overload(*dotenv_files.reverse) end # Internal: `Rails.root` is nil in Rails 4.1 before the application is diff --git a/spec/dotenv/rails_spec.rb b/spec/dotenv/rails_spec.rb index 110e2496..71122b75 100644 --- a/spec/dotenv/rails_spec.rb +++ b/spec/dotenv/rails_spec.rb @@ -113,8 +113,8 @@ def add(*items) ) end - it "overloads .env.test with .env" do - expect(ENV["DOTENV"]).to eql("true") + it "overloads .env with .env.test" do + expect(ENV["DOTENV"]).to eql("test") end context "when loading a file containing already set variables" do @@ -125,7 +125,7 @@ def add(*items) expect do subject - end.to(change { ENV["DOTENV"] }.from("predefined").to("true")) + end.to(change { ENV["DOTENV"] }.from("predefined").to("test")) end end end