move signature cache read to Gpg::Commit

as we write the cache in the gpg commit class already the read should
also happen there.

This also removes all logic from the main commit class, which just
proxies the call to the Gpg::Commit now.

1 files changed, 0 insertions, 82 deletions

diff --git a/spec/models/commit_spec.rb b/spec/models/commit_spec.rb
index 4370c78e6fd..528b211c9d6 100644
--- a/spec/models/commit_spec.rb
+++ b/spec/models/commit_spec.rb
@@ -414,86 +414,4 @@ eos
       expect(described_class.valid_hash?('a' * 41)).to be false
     end
   end
-
-  describe '#signature' do
-    it 'returns nil if the commit is not signed' do
-      expect(commit.signature).to be_nil
-    end
-
-    context 'signed commit', :gpg do
-      context 'known public key' do
-        it 'returns a valid signature' do
-          create :gpg_key, key: GpgHelpers::User1.public_key
-
-          raw_commit = double(:raw_commit, signature: [
-            GpgHelpers::User1.signed_commit_signature,
-            GpgHelpers::User1.signed_commit_base_data
-          ], sha: '0beec7b5ea3f0fdbc95d0dd47f3c5bc275da8a33')
-          allow(raw_commit).to receive :save!
-
-          commit = create :commit,
-            git_commit: raw_commit,
-            project: project
-
-          expect(commit.signature.valid_signature?).to be_truthy
-        end
-
-        it 'returns the cached validation result on second call', :gpg do
-          create :gpg_key, key: GpgHelpers::User1.public_key
-
-          raw_commit = double(:raw_commit, signature: [
-            GpgHelpers::User1.signed_commit_signature,
-            GpgHelpers::User1.signed_commit_base_data
-          ], sha: '0beec7b5ea3f0fdbc95d0dd47f3c5bc275da8a33')
-          allow(raw_commit).to receive :save!
-
-          commit = create :commit,
-            git_commit: raw_commit,
-            project: project
-
-          expect(Gitlab::Gpg::Commit).to receive(:new).and_call_original
-          expect(commit.signature.valid_signature?).to be_truthy
-
-          # second call returns the cache
-          expect(Gitlab::Gpg::Commit).not_to receive(:new).and_call_original
-          expect(commit.signature.valid_signature?).to be_truthy
-        end
-      end
-
-      context 'unknown public key' do
-        it 'returns an invalid signature if the public key is unknown', :gpg do
-          raw_commit = double(:raw_commit, signature: [
-            GpgHelpers::User1.signed_commit_signature,
-            GpgHelpers::User1.signed_commit_base_data
-          ], sha: '0beec7b5ea3f0fdbc95d0dd47f3c5bc275da8a33')
-          allow(raw_commit).to receive :save!
-
-          commit = create :commit,
-            git_commit: raw_commit,
-            project: project
-
-          expect(commit.signature.valid_signature?).to be_falsey
-        end
-
-        it 'returns the cached validation result on second call', :gpg do
-          raw_commit = double(:raw_commit, signature: [
-            GpgHelpers::User1.signed_commit_signature,
-            GpgHelpers::User1.signed_commit_base_data
-          ], sha: '0beec7b5ea3f0fdbc95d0dd47f3c5bc275da8a33')
-          allow(raw_commit).to receive :save!
-
-          commit = create :commit,
-            git_commit: raw_commit,
-            project: project
-
-          expect(Gitlab::Gpg::Commit).to receive(:new).and_call_original
-          expect(commit.signature.valid_signature?).to be_falsey
-
-          # second call returns the cache
-          expect(Gitlab::Gpg::Commit).not_to receive(:new).and_call_original
-          expect(commit.signature.valid_signature?).to be_falsey
-        end
-      end
-    end
-  end
 end