Skip to content

Commit 1d705bf

Browse files
Handle cases when PGP key metadata is 'nil'
1 parent 3cdd192 commit 1d705bf

File tree

2 files changed

+18
-1
lines changed

2 files changed

+18
-1
lines changed

app/models/rails/keyserver/key/pgp.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ def self.extension
1515
Engine.config.key_host = nil
1616

1717
def derive_metadata_if_empty
18-
derive_metadata if metadata.empty?
18+
derive_metadata if metadata.blank?
1919
end
2020

2121
# Pick the one without primar key grip.

spec/models/rails/key/pgp_spec.rb

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -796,6 +796,23 @@
796796
end
797797
end
798798

799+
describe "#derive_metadata_if_empty" do
800+
context "with nil metadata" do
801+
let(:key) do
802+
FactoryBot.build(:rails_keyserver_key_pgp).tap do |k|
803+
allow(k).to receive(:metadata).and_return(nil)
804+
allow(k).to receive(:derive_metadata)
805+
expect(k.metadata).to be_nil
806+
end
807+
end
808+
809+
it "runs #derive_metadata_if_empty" do
810+
expect(key).to receive :derive_metadata
811+
key.derive_metadata_if_empty
812+
end
813+
end
814+
end
815+
799816
# - wrong key
800817
#
801818
# …

0 commit comments

Comments
 (0)