Add latest changes from gitlab-org/gitlab@master

1 files changed, 16 insertions, 6 deletions

diff --git a/spec/models/users/phone_number_validation_spec.rb b/spec/models/users/phone_number_validation_spec.rb
index 890109e99e5..e41719d8ca3 100644
--- a/spec/models/users/phone_number_validation_spec.rb
+++ b/spec/models/users/phone_number_validation_spec.rb
@@ -95,12 +95,6 @@ RSpec.describe Users::PhoneNumberValidation, feature_category: :instance_resilie
         end
       end
     end
-
-    describe '#by_reference_id' do
-      it 'returns the correct phone number record for the given reference_id' do
-        expect(described_class.by_reference_id('target')).to eq phone_number_record_1
-      end
-    end
   end
 
   describe '#validated?' do
@@ -122,4 +116,20 @@ RSpec.describe Users::PhoneNumberValidation, feature_category: :instance_resilie
       end
     end
   end
+
+  describe '.by_reference_id' do
+    let_it_be(:phone_number_record) { create(:phone_number_validation) }
+
+    let(:ref_id) { phone_number_record.telesign_reference_xid }
+
+    subject { described_class.by_reference_id(ref_id) }
+
+    it { is_expected.to eq phone_number_record }
+
+    context 'when there is no matching record' do
+      let(:ref_id) { 'does-not-exist' }
+
+      it { is_expected.to be_nil }
+    end
+  end
 end