1 files changed, 18 insertions, 46 deletions
diff --git a/spec/lib/gitlab/ci/config/external/mapper/matcher_spec.rb b/spec/lib/gitlab/ci/config/external/mapper/matcher_spec.rb
index 719c75dca80..cea65faccd7 100644
--- a/spec/lib/gitlab/ci/config/external/mapper/matcher_spec.rb
+++ b/spec/lib/gitlab/ci/config/external/mapper/matcher_spec.rb
@@ -18,54 +18,26 @@ RSpec.describe Gitlab::Ci::Config::External::Mapper::Matcher, feature_category:
   describe '#process' do
     subject(:process) { matcher.process(locations) }
 
-    context 'with ci_include_components FF disabled' do
-      before do
-        stub_feature_flags(ci_include_components: false)
-      end
-
-      let(:locations) do
-        [
-          { local: 'file.yml' },
-          { file: 'file.yml', project: 'namespace/project' },
-          { remote: 'https://example.com/.gitlab-ci.yml' },
-          { template: 'file.yml' },
-          { artifact: 'generated.yml', job: 'test' }
-        ]
-      end
-
-      it 'returns an array of file objects' do
-        is_expected.to contain_exactly(
-          an_instance_of(Gitlab::Ci::Config::External::File::Local),
-          an_instance_of(Gitlab::Ci::Config::External::File::Project),
-          an_instance_of(Gitlab::Ci::Config::External::File::Remote),
-          an_instance_of(Gitlab::Ci::Config::External::File::Template),
-          an_instance_of(Gitlab::Ci::Config::External::File::Artifact)
-        )
-      end
+    let(:locations) do
+      [
+        { local: 'file.yml' },
+        { file: 'file.yml', project: 'namespace/project' },
+        { component: 'gitlab.com/org/component@1.0' },
+        { remote: 'https://example.com/.gitlab-ci.yml' },
+        { template: 'file.yml' },
+        { artifact: 'generated.yml', job: 'test' }
+      ]
     end
 
-    context 'with ci_include_components FF enabled' do
-      let(:locations) do
-        [
-          { local: 'file.yml' },
-          { file: 'file.yml', project: 'namespace/project' },
-          { component: 'gitlab.com/org/component@1.0' },
-          { remote: 'https://example.com/.gitlab-ci.yml' },
-          { template: 'file.yml' },
-          { artifact: 'generated.yml', job: 'test' }
-        ]
-      end
-
-      it 'returns an array of file objects' do
-        is_expected.to contain_exactly(
-          an_instance_of(Gitlab::Ci::Config::External::File::Local),
-          an_instance_of(Gitlab::Ci::Config::External::File::Project),
-          an_instance_of(Gitlab::Ci::Config::External::File::Component),
-          an_instance_of(Gitlab::Ci::Config::External::File::Remote),
-          an_instance_of(Gitlab::Ci::Config::External::File::Template),
-          an_instance_of(Gitlab::Ci::Config::External::File::Artifact)
-        )
-      end
+    it 'returns an array of file objects' do
+      is_expected.to contain_exactly(
+        an_instance_of(Gitlab::Ci::Config::External::File::Local),
+        an_instance_of(Gitlab::Ci::Config::External::File::Project),
+        an_instance_of(Gitlab::Ci::Config::External::File::Component),
+        an_instance_of(Gitlab::Ci::Config::External::File::Remote),
+        an_instance_of(Gitlab::Ci::Config::External::File::Template),
+        an_instance_of(Gitlab::Ci::Config::External::File::Artifact)
+      )
     end
 
     context 'when a location is not valid' do