1 files changed, 24 insertions, 135 deletions
diff --git a/spec/models/ci/processable_spec.rb b/spec/models/ci/processable_spec.rb
index 4490371bde5..e67f740279b 100644
--- a/spec/models/ci/processable_spec.rb
+++ b/spec/models/ci/processable_spec.rb
@@ -6,16 +6,12 @@ describe Ci::Processable do
   let_it_be(:project) { create(:project) }
   let_it_be(:pipeline) { create(:ci_pipeline, project: project) }
 
-  let_it_be(:detached_merge_request_pipeline) do
-    create(:ci_pipeline, :detached_merge_request_pipeline, :with_job, project: project)
-  end
-
-  let_it_be(:legacy_detached_merge_request_pipeline) do
-    create(:ci_pipeline, :legacy_detached_merge_request_pipeline, :with_job, project: project)
-  end
+  describe 'delegations' do
+    subject { Ci::Processable.new }
 
-  let_it_be(:merged_result_pipeline) do
-    create(:ci_pipeline, :merged_result_pipeline, :with_job, project: project)
+    it { is_expected.to delegate_method(:merge_request?).to(:pipeline) }
+    it { is_expected.to delegate_method(:merge_request_ref?).to(:pipeline) }
+    it { is_expected.to delegate_method(:legacy_detached_merge_request_pipeline?).to(:pipeline) }
   end
 
   describe '#aggregated_needs_names' do
@@ -52,69 +48,28 @@ describe Ci::Processable do
   end
 
   describe 'validate presence of scheduling_type' do
-    context 'on create' do
-      let(:processable) do
-        build(
-          :ci_build, :created, project: project, pipeline: pipeline,
-          importing: importing, scheduling_type: nil
-        )
-      end
-
-      context 'when importing' do
-        let(:importing) { true }
-
-        context 'when validate_scheduling_type_of_processables is true' do
-          before do
-            stub_feature_flags(validate_scheduling_type_of_processables: true)
-          end
+    using RSpec::Parameterized::TableSyntax
 
-          it 'does not validate' do
-            expect(processable).to be_valid
-          end
-        end
-
-        context 'when validate_scheduling_type_of_processables is false' do
-          before do
-            stub_feature_flags(validate_scheduling_type_of_processables: false)
-          end
-
-          it 'does not validate' do
-            expect(processable).to be_valid
-          end
-        end
-      end
+    subject { build(:ci_build, project: project, pipeline: pipeline, importing: importing) }
 
-      context 'when not importing' do
-        let(:importing) { false }
-
-        context 'when validate_scheduling_type_of_processables is true' do
-          before do
-            stub_feature_flags(validate_scheduling_type_of_processables: true)
-          end
-
-          it 'validates' do
-            expect(processable).not_to be_valid
-          end
-        end
-
-        context 'when validate_scheduling_type_of_processables is false' do
-          before do
-            stub_feature_flags(validate_scheduling_type_of_processables: false)
-          end
+    where(:importing, :should_validate) do
+      false | true
+      true  | false
+    end
 
-          it 'does not validate' do
-            expect(processable).to be_valid
+    with_them do
+      context 'on create' do
+        it 'validates presence' do
+          if should_validate
+            is_expected.to validate_presence_of(:scheduling_type).on(:create)
+          else
+            is_expected.not_to validate_presence_of(:scheduling_type).on(:create)
           end
         end
       end
-    end
-
-    context 'on update' do
-      let(:processable) { create(:ci_build, :created, project: project, pipeline: pipeline) }
 
-      it 'does not validate' do
-        processable.scheduling_type = nil
-        expect(processable).to be_valid
+      context 'on update' do
+        it { is_expected.not_to validate_presence_of(:scheduling_type).on(:update) }
       end
     end
   end
@@ -147,6 +102,8 @@ describe Ci::Processable do
   describe '#needs_attributes' do
     let(:build) { create(:ci_build, :created, project: project, pipeline: pipeline) }
 
+    subject { build.needs_attributes }
+
     context 'with needs' do
       before do
         create(:ci_build_need, build: build, name: 'test1')
@@ -154,7 +111,7 @@ describe Ci::Processable do
       end
 
       it 'returns all needs attributes' do
-        expect(build.needs_attributes).to contain_exactly(
+        is_expected.to contain_exactly(
           { 'artifacts' => true, 'name' => 'test1' },
           { 'artifacts' => true, 'name' => 'test2' }
         )
@@ -162,75 +119,7 @@ describe Ci::Processable do
     end
 
     context 'without needs' do
-      it 'returns all needs attributes' do
-        expect(build.needs_attributes).to be_empty
-      end
-    end
-  end
-
-  describe '#merge_request?' do
-    subject { pipeline.processables.first.merge_request? }
-
-    context 'in a detached merge request pipeline' do
-      let(:pipeline) { detached_merge_request_pipeline }
-
-      it { is_expected.to eq(pipeline.merge_request?) }
-    end
-
-    context 'in a legacy detached merge_request_pipeline' do
-      let(:pipeline) { legacy_detached_merge_request_pipeline }
-
-      it { is_expected.to eq(pipeline.merge_request?) }
-    end
-
-    context 'in a pipeline for merged results' do
-      let(:pipeline) { merged_result_pipeline }
-
-      it { is_expected.to eq(pipeline.merge_request?) }
-    end
-  end
-
-  describe '#merge_request_ref?' do
-    subject { pipeline.processables.first.merge_request_ref? }
-
-    context 'in a detached merge request pipeline' do
-      let(:pipeline) { detached_merge_request_pipeline }
-
-      it { is_expected.to eq(pipeline.merge_request_ref?) }
-    end
-
-    context 'in a legacy detached merge_request_pipeline' do
-      let(:pipeline) { legacy_detached_merge_request_pipeline }
-
-      it { is_expected.to eq(pipeline.merge_request_ref?) }
-    end
-
-    context 'in a pipeline for merged results' do
-      let(:pipeline) { merged_result_pipeline }
-
-      it { is_expected.to eq(pipeline.merge_request_ref?) }
-    end
-  end
-
-  describe '#legacy_detached_merge_request_pipeline?' do
-    subject { pipeline.processables.first.legacy_detached_merge_request_pipeline? }
-
-    context 'in a detached merge request pipeline' do
-      let(:pipeline) { detached_merge_request_pipeline }
-
-      it { is_expected.to eq(pipeline.legacy_detached_merge_request_pipeline?) }
-    end
-
-    context 'in a legacy detached merge_request_pipeline' do
-      let(:pipeline) { legacy_detached_merge_request_pipeline }
-
-      it { is_expected.to eq(pipeline.legacy_detached_merge_request_pipeline?) }
-    end
-
-    context 'in a pipeline for merged results' do
-      let(:pipeline) { merged_result_pipeline }
-
-      it { is_expected.to eq(pipeline.legacy_detached_merge_request_pipeline?) }
+      it { is_expected.to be_empty }
     end
   end
 end