Add latest changes from gitlab-org/gitlab@15-8-stable-eev15.8.0-rc42

1 files changed, 10 insertions, 24 deletions

diff --git a/spec/services/ide/schemas_config_service_spec.rb b/spec/services/ide/schemas_config_service_spec.rb
index 69ad9b5cbea..f277b8e9954 100644
--- a/spec/services/ide/schemas_config_service_spec.rb
+++ b/spec/services/ide/schemas_config_service_spec.rb
@@ -20,35 +20,21 @@ RSpec.describe Ide::SchemasConfigService do
 
     subject { described_class.new(project, user, filename: filename).execute }
 
-    context 'feature flag schema_linting is enabled', unless: Gitlab.ee? do
-      before do
-        stub_feature_flags(schema_linting: true)
-      end
-
-      context 'when no predefined schema exists for the given filename' do
-        it 'returns an empty object' do
-          is_expected.to include(
-            status: :success,
-            schema: {})
-        end
-      end
-
-      context 'when a predefined schema exists for the given filename' do
-        let(:filename) { '.gitlab-ci.yml' }
-
-        it 'uses predefined schema matches' do
-          expect(Gitlab::HTTP).to receive(:get).with('https://json.schemastore.org/gitlab-ci')
-          expect(subject[:schema]['title']).to eq "Sample schema"
-        end
-      end
-    end
-
-    context 'feature flag schema_linting is disabled', unless: Gitlab.ee? do
+    context 'when no predefined schema exists for the given filename', unless: Gitlab.ee? do
       it 'returns an empty object' do
         is_expected.to include(
           status: :success,
           schema: {})
       end
     end
+
+    context 'when a predefined schema exists for the given filename' do
+      let(:filename) { '.gitlab-ci.yml' }
+
+      it 'uses predefined schema matches' do
+        expect(Gitlab::HTTP).to receive(:get).with('https://json.schemastore.org/gitlab-ci')
+        expect(subject[:schema]['title']).to eq "Sample schema"
+      end
+    end
   end
 end