Skip to content

Commit cf32b9a

Browse files
committed
fix: Correct dead fallback for service name
Since `respond_to?(:name)` returns always `true`.
1 parent ac13300 commit cf32b9a

2 files changed

Lines changed: 13 additions & 1 deletion

File tree

lib/active_storage/service/db_service.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -111,7 +111,7 @@ def headers_for_direct_upload(_key, content_type:, **)
111111
private
112112

113113
def service_name_for_token
114-
respond_to?(:name) ? name : "db"
114+
name.presence || "db"
115115
end
116116

117117
def adapter_sqlite?

spec/service/active_storage/service/db_service_spec.rb

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -317,6 +317,18 @@
317317
end
318318
end
319319

320+
describe "service_name_for_token" do
321+
it "returns the service name when set" do
322+
service.name = "custom_db"
323+
expect(service.send(:service_name_for_token)).to eq("custom_db")
324+
end
325+
326+
it "falls back to 'db' when name is nil" do
327+
service.name = nil
328+
expect(service.send(:service_name_for_token)).to eq("db")
329+
end
330+
end
331+
320332
describe "chunk_size validation" do
321333
it "enforces a minimum chunk size of 1" do
322334
allow(ENV).to receive(:fetch).with("ASDB_CHUNK_SIZE").and_return("0")

0 commit comments

Comments
 (0)