Skip to content

Commit

Permalink
Merge pull request #3447 from alphagov/update-banner-env-var
Browse files Browse the repository at this point in the history
Use only `EMERGENCY_BANNER_REDIS_URL` environment variable
  • Loading branch information
brucebolt authored Sep 30, 2024
2 parents 9ef2da2 + 0aa9f6f commit 62bef37
Show file tree
Hide file tree
Showing 2 changed files with 1 addition and 56 deletions.
2 changes: 1 addition & 1 deletion lib/emergency_banner/display.rb
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ class Display
class << self
def client
@client ||= Redis.new(
url: ENV.fetch("EMERGENCY_BANNER_REDIS_URL", ENV["REDIS_URL"]),
url: ENV["EMERGENCY_BANNER_REDIS_URL"],
reconnect_attempts: [
15,
30,
Expand Down
55 changes: 0 additions & 55 deletions test/unit/emergency_banner/display_test.rb
Original file line number Diff line number Diff line change
Expand Up @@ -7,51 +7,6 @@
@banner = EmergencyBanner::Display.new
end

context ".client" do
context "when the EMERGENCY_BANNER_REDIS_URL environment variable has been set" do
should "use that value as the URL for the Redis client" do
mock_env("EMERGENCY_BANNER_REDIS_URL" => "redis://emergency-banner") do
EmergencyBanner::Display.instance_variable_set(:@client, nil)

Redis.expects(:new).with(
url: "redis://emergency-banner",
reconnect_attempts: [
15,
30,
45,
60,
],
)

EmergencyBanner::Display.client
end
end
end

context "when the EMERGENCY_BANNER_REDIS_URL environment variable has not been set" do
should "use the default REDIS_URL as the URL for the Redis client" do
mock_env({
"EMERGENCY_BANNER_REDIS_URL" => nil,
"REDIS_URL" => "redis://my-redis-url",
}) do
EmergencyBanner::Display.instance_variable_set(:@client, nil)

Redis.expects(:new).with(
url: "redis://my-redis-url",
reconnect_attempts: [
15,
30,
45,
60,
],
)

EmergencyBanner::Display.client
end
end
end
end

context "#enabled?" do
should "return enabled is false when redis connection times out and send an error notification" do
err = Redis::CannotConnectError.new("Timed out connecting to Redis")
Expand Down Expand Up @@ -200,15 +155,5 @@
assert_nil @banner.link_text
end
end

def mock_env(partial_env_hash)
old_env = ENV.to_hash
ENV.update partial_env_hash
begin
yield
ensure
ENV.replace old_env
end
end
end
# rubocop:enable Rails/RefuteMethods

0 comments on commit 62bef37

Please sign in to comment.