2 files changed, 12 insertions, 2 deletions
diff --git a/spec/models/ci/pipeline_spec.rb b/spec/models/ci/pipeline_spec.rb
index 60ba9e62be7..d3e0389cc72 100644
--- a/spec/models/ci/pipeline_spec.rb
+++ b/spec/models/ci/pipeline_spec.rb
@@ -41,6 +41,7 @@ describe Ci::Pipeline, :mailer do
       let(:instance) { build(:ci_pipeline) }
       let(:scope_attrs) { { project: instance.project } }
       let(:usage) { :ci_pipelines }
+      let(:validate_presence) { false }
     end
   end
 
diff --git a/spec/support/shared_examples/models/atomic_internal_id_spec.rb b/spec/support/shared_examples/models/atomic_internal_id_spec.rb
index 6a6e13418a9..1bccb578d79 100644
--- a/spec/support/shared_examples/models/atomic_internal_id_spec.rb
+++ b/spec/support/shared_examples/models/atomic_internal_id_spec.rb
@@ -1,6 +1,8 @@
 require 'spec_helper'
 
-shared_examples_for 'AtomicInternalId' do
+shared_examples_for 'AtomicInternalId' do 
+  let(:validate_presence) { true }
+
   describe '.has_internal_id' do
     describe 'Module inclusion' do
       subject { described_class }
@@ -15,7 +17,14 @@ shared_examples_for 'AtomicInternalId' do
         allow(InternalId).to receive(:generate_next).and_return(nil)
       end
 
-      it { is_expected.to validate_presence_of(internal_id_attribute) }
+      it 'checks presence' do
+        if validate_presence
+          is_expected.to validate_presence_of(internal_id_attribute)
+        else
+          is_expected.not_to validate_presence_of(internal_id_attribute)
+        end
+      end
+
       it { is_expected.to validate_numericality_of(internal_id_attribute) }
     end