Add latest changes from gitlab-org/gitlab@13-0-stable-ee

1 files changed, 23 insertions, 9 deletions

diff --git a/spec/models/x509_commit_signature_spec.rb b/spec/models/x509_commit_signature_spec.rb
index a2f72228a86..2efb77c96ad 100644
--- a/spec/models/x509_commit_signature_spec.rb
+++ b/spec/models/x509_commit_signature_spec.rb
@@ -9,6 +9,15 @@ RSpec.describe X509CommitSignature do
   let(:x509_certificate) { create(:x509_certificate) }
   let(:x509_signature) { create(:x509_commit_signature, commit_sha: commit_sha) }
 
+  let(:attributes) do
+    {
+      commit_sha: commit_sha,
+      project: project,
+      x509_certificate_id: x509_certificate.id,
+      verification_status: "verified"
+    }
+  end
+
   it_behaves_like 'having unique enum values'
 
   describe 'validation' do
@@ -23,15 +32,6 @@ RSpec.describe X509CommitSignature do
   end
 
   describe '.safe_create!' do
-    let(:attributes) do
-      {
-        commit_sha: commit_sha,
-        project: project,
-        x509_certificate_id: x509_certificate.id,
-        verification_status: "verified"
-      }
-    end
-
     it 'finds a signature by commit sha if it existed' do
       x509_signature
 
@@ -50,4 +50,18 @@ RSpec.describe X509CommitSignature do
       expect(signature.x509_certificate_id).to eq(x509_certificate.id)
     end
   end
+
+  describe '#user' do
+    context 'if email is assigned to a user' do
+      let!(:user) { create(:user, email: X509Helpers::User1.certificate_email) }
+
+      it 'returns user' do
+        expect(described_class.safe_create!(attributes).user).to eq(user)
+      end
+    end
+
+    it 'if email is not assigned to a user, return nil' do
+      expect(described_class.safe_create!(attributes).user).to be_nil
+    end
+  end
 end