Skip to content

Commit

Permalink
Fix tests for spring changes
Browse files Browse the repository at this point in the history
  • Loading branch information
bkeepers committed Sep 17, 2024
1 parent 54aa1f6 commit 8c7e460
Show file tree
Hide file tree
Showing 2 changed files with 14 additions and 3 deletions.
4 changes: 2 additions & 2 deletions lib/dotenv/rails.rb
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,8 @@
Dotenv.instrumenter = ActiveSupport::Notifications

# Watch all loaded env files with Spring
if defined?(Spring)
ActiveSupport::Notifications.subscribe("load.dotenv") do |*args|
ActiveSupport::Notifications.subscribe("load.dotenv") do |*args|
if defined?(Spring)
event = ActiveSupport::Notifications::Event.new(*args)
Spring.watch event.payload[:env].filename if Rails.application
end
Expand Down
13 changes: 12 additions & 1 deletion spec/dotenv/rails_spec.rb
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,6 @@
Rails.env = "test"
Rails.application = nil
Rails.logger = nil
Spring.watcher = Set.new # Responds to #add

begin
# Remove the singleton instance if it exists
Expand Down Expand Up @@ -76,6 +75,7 @@
end

it "watches other loaded files with Spring" do
stub_spring
application.initialize!
path = fixture_path("plain.env")
Dotenv.load(path)
Expand All @@ -93,6 +93,7 @@
subject { application.initialize! }

it "watches .env with Spring" do
stub_spring
subject
expect(Spring.watcher).to include(fixture_path(".env").to_s)
end
Expand Down Expand Up @@ -204,4 +205,14 @@
expect(Dotenv::Rails.logger).to be(logger)
end
end

def stub_spring
spring = Struct.new("Spring", :watcher) do
def watch(path)
watcher.add path
end
end

stub_const "Spring", spring.new(Set.new)
end
end

0 comments on commit 8c7e460

Please sign in to comment.