Add latest changes from gitlab-org/gitlab@master

2 files changed, 0 insertions, 55 deletions

diff --git a/spec/lib/gitlab/ci/pipeline/seed/build/resource_group_spec.rb b/spec/lib/gitlab/ci/pipeline/seed/build/resource_group_spec.rb
deleted file mode 100644
index bf6985156d3..00000000000
--- a/spec/lib/gitlab/ci/pipeline/seed/build/resource_group_spec.rb
+++ /dev/null
@@ -1,46 +0,0 @@
-# frozen_string_literal: true
-
-require 'spec_helper'
-
-describe Gitlab::Ci::Pipeline::Seed::Build::ResourceGroup do
-  let_it_be(:project) { create(:project) }
-  let(:job) { build(:ci_build, project: project) }
-  let(:seed) { described_class.new(job, resource_group_key) }
-
-  describe '#to_resource' do
-    subject { seed.to_resource }
-
-    context 'when resource group key is specified' do
-      let(:resource_group_key) { 'iOS' }
-
-      it 'returns a resource group object' do
-        is_expected.to be_a(Ci::ResourceGroup)
-        expect(subject.key).to eq('iOS')
-      end
-
-      context 'when environment has an invalid URL' do
-        let(:resource_group_key) { ':::' }
-
-        it 'returns nothing' do
-          is_expected.to be_nil
-        end
-      end
-
-      context 'when there is a resource group already' do
-        let!(:resource_group) { create(:ci_resource_group, project: project, key: 'iOS') }
-
-        it 'does not create a new resource group' do
-          expect { subject }.not_to change { Ci::ResourceGroup.count }
-        end
-      end
-    end
-
-    context 'when resource group key is nil' do
-      let(:resource_group_key) { nil }
-
-      it 'returns nothing' do
-        is_expected.to be_nil
-      end
-    end
-  end
-end
diff --git a/spec/lib/gitlab/ci/pipeline/seed/build_spec.rb b/spec/lib/gitlab/ci/pipeline/seed/build_spec.rb
index 5526ec9e16f..2ae513aea1b 100644
--- a/spec/lib/gitlab/ci/pipeline/seed/build_spec.rb
+++ b/spec/lib/gitlab/ci/pipeline/seed/build_spec.rb
@@ -231,15 +231,6 @@ describe Gitlab::Ci::Pipeline::Seed::Build do
           end
         end
       end
-
-      context 'when job belongs to a resource group' do
-        let(:attributes) { { name: 'rspec', ref: 'master', resource_group_key: 'iOS' } }
-
-        it 'returns a job with resource group' do
-          expect(subject.resource_group).not_to be_nil
-          expect(subject.resource_group.key).to eq('iOS')
-        end
-      end
     end
 
     context 'when job is a bridge' do