Merge branch 'mmj-presence-validator-webauthn_registration' into 'master'

Remove presence validator on name on WebauthnRegistration

See merge request gitlab-org/gitlab!74376

app/models/webauthn_registration.rb

@@ -5,7 +5,8 @@
 class WebauthnRegistration < ApplicationRecord
   belongs_to :user
 
-  validates :credential_xid, :public_key, :name, :counter, presence: true
+  validates :credential_xid, :public_key, :counter, presence: true
+  validates :name, length: { minimum: 0, allow_nil: false }
   validates :counter,
             numericality: { only_integer: true, greater_than_or_equal_to: 0, less_than_or_equal_to: 2**32 - 1 }
 end

spec/models/u2f_registration_spec.rb

@@ -5,9 +5,11 @@ require 'spec_helper'
 RSpec.describe U2fRegistration do
   let_it_be(:user) { create(:user) }
 
+  let(:u2f_registration_name) { 'u2f_device' }
+
   let(:u2f_registration) do
     device = U2F::FakeU2F.new(FFaker::BaconIpsum.characters(5))
-    create(:u2f_registration, name: 'u2f_device',
+    create(:u2f_registration, name: u2f_registration_name,
                               user: user,
                               certificate: Base64.strict_encode64(device.cert_raw),
                               key_handle: U2F.urlsafe_encode64(device.key_handle_raw),
@@ -16,11 +18,27 @@ RSpec.describe U2fRegistration do
 
   describe 'callbacks' do
     describe '#create_webauthn_registration' do
-      it 'creates webauthn registration' do
-        u2f_registration.save!
+      shared_examples_for 'creates webauthn registration' do
+        it 'creates webauthn registration' do
+          u2f_registration.save!
+
+          webauthn_registration = WebauthnRegistration.where(u2f_registration_id: u2f_registration.id)
+          expect(webauthn_registration).to exist
+        end
+      end
+
+      it_behaves_like 'creates webauthn registration'
+
+      context 'when the u2f_registration has a blank name' do
+        let(:u2f_registration_name) { '' }
+
+        it_behaves_like 'creates webauthn registration'
+      end
+
+      context 'when the u2f_registration has the name as `nil`' do
+        let(:u2f_registration_name) { nil }
 
-        webauthn_registration = WebauthnRegistration.where(u2f_registration_id: u2f_registration.id)
-        expect(webauthn_registration).to exist
+        it_behaves_like 'creates webauthn registration'
       end
 
       it 'logs error' do

spec/models/webauthn_registration_spec.rb

+# frozen_string_literal: true
+
+require 'spec_helper'
+
+RSpec.describe WebauthnRegistration do
+  describe 'relations' do
+    it { is_expected.to belong_to(:user) }
+  end
+
+  describe 'validations' do
+    it { is_expected.to validate_presence_of(:credential_xid) }
+    it { is_expected.to validate_presence_of(:public_key) }
+    it { is_expected.to validate_presence_of(:counter) }
+    it { is_expected.to validate_length_of(:name).is_at_least(0) }
+    it { is_expected.not_to allow_value(nil).for(:name) }
+    it do
+      is_expected.to validate_numericality_of(:counter)
+          .only_integer
+          .is_greater_than_or_equal_to(0)
+          .is_less_than_or_equal_to(4294967295)
+    end
+  end
+end