Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 1 addition & 2 deletions lib/suma/apps.rb
Original file line number Diff line number Diff line change
Expand Up @@ -161,8 +161,7 @@ class AdminAPI < Suma::Service
end

UrlRedirects = Rack::Builder.new do
shortener = Suma::UrlShortener.new_shortener
run ::UrlShortener::RackApp.new(shortener)
run ::UrlShortener::RackApp.new(Suma::UrlShortener.shortener)
end

def self.emplace_dynamic_config
Expand Down
1 change: 0 additions & 1 deletion lib/suma/url_shortener.rb
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,6 @@ def enabled? = !self.disabled

# @return [UrlShortener]
def shortener
return nil unless self.enabled?
return @shortener ||= new_shortener
end

Expand Down
5 changes: 2 additions & 3 deletions spec/suma/url_shortener_spec.rb
Original file line number Diff line number Diff line change
Expand Up @@ -3,10 +3,9 @@
require "suma/url_shortener"

RSpec.describe Suma::UrlShortener do
it "returns nil for the shortener if disabled", reset_configuration: Suma::UrlShortener do
it "returns the shortener (even if disabled)", reset_configuration: Suma::UrlShortener do
described_class.disabled = true
expect(described_class.shortener).to be_nil
described_class.disabled = false
expect(described_class).to_not be_enabled
expect(described_class.shortener).to be_a(UrlShortener)
end
end