Add latest changes from gitlab-org/gitlab@master

6 files changed, 192 insertions, 43 deletions

diff --git a/spec/controllers/projects/web_ide_schemas_controller_spec.rb b/spec/controllers/projects/web_ide_schemas_controller_spec.rb
new file mode 100644
index 00000000000..fbec941aecc
--- /dev/null
+++ b/spec/controllers/projects/web_ide_schemas_controller_spec.rb
@@ -0,0 +1,66 @@
+# frozen_string_literal: true
+
+require 'spec_helper'
+
+RSpec.describe Projects::WebIdeSchemasController do
+  let_it_be(:developer) { create(:user) }
+  let_it_be(:project) { create(:project, :private, :repository, namespace: developer.namespace) }
+
+  before do
+    project.add_developer(developer)
+
+    sign_in(user)
+  end
+
+  describe 'GET show' do
+    let(:user) { developer }
+    let(:branch) { 'master' }
+
+    subject do
+      get :show, params: {
+        namespace_id: project.namespace.to_param,
+        project_id: project,
+        branch: branch,
+        filename: 'package.json'
+      }
+    end
+
+    before do
+      allow_next_instance_of(::Ide::SchemasConfigService) do |instance|
+        allow(instance).to receive(:execute).and_return(result)
+      end
+    end
+
+    context 'when branch is invalid' do
+      let(:branch) { 'non-existent' }
+
+      it 'returns 422' do
+        subject
+
+        expect(response).to have_gitlab_http_status(:unprocessable_entity)
+      end
+    end
+
+    context 'when a valid schema exists' do
+      let(:result) { { status: :success, schema: { schema: 'Sample Schema' } } }
+
+      it 'returns the schema' do
+        subject
+
+        expect(response).to have_gitlab_http_status(:ok)
+        expect(response.body).to eq('{"schema":"Sample Schema"}')
+      end
+    end
+
+    context 'when an error occurs parsing the schema' do
+      let(:result) { { status: :error, message: 'Some error occured' } }
+
+      it 'returns 422 with the error' do
+        subject
+
+        expect(response).to have_gitlab_http_status(:unprocessable_entity)
+        expect(response.body).to eq('{"status":"error","message":"Some error occured"}')
+      end
+    end
+  end
+end
diff --git a/spec/controllers/projects/web_ide_terminals_controller_spec.rb b/spec/controllers/projects/web_ide_terminals_controller_spec.rb
index 2ae5899c258..3eb3d5da351 100644
--- a/spec/controllers/projects/web_ide_terminals_controller_spec.rb
+++ b/spec/controllers/projects/web_ide_terminals_controller_spec.rb
@@ -113,7 +113,7 @@ RSpec.describe Projects::WebIdeTerminalsController do
     let(:result) { { status: :success } }
 
     before do
-      allow_next_instance_of(::Ci::WebIdeConfigService) do |instance|
+      allow_next_instance_of(::Ide::TerminalConfigService) do |instance|
         allow(instance).to receive(:execute).and_return(result)
       end
 
diff --git a/spec/lib/gitlab/web_ide/config/entry/global_spec.rb b/spec/lib/gitlab/web_ide/config/entry/global_spec.rb
index 3a50667163b..3e29bf89785 100644
--- a/spec/lib/gitlab/web_ide/config/entry/global_spec.rb
+++ b/spec/lib/gitlab/web_ide/config/entry/global_spec.rb
@@ -12,8 +12,7 @@ RSpec.describe Gitlab::WebIde::Config::Entry::Global do
 
     context 'when filtering all the entry/node names' do
       it 'contains the expected node names' do
-        expect(described_class.nodes.keys)
-          .to match_array(%i[terminal])
+        expect(described_class.nodes.keys).to match_array(described_class.allowed_keys)
       end
     end
   end
@@ -34,7 +33,7 @@ RSpec.describe Gitlab::WebIde::Config::Entry::Global do
         end
 
         it 'creates node object for each entry' do
-          expect(global.descendants.count).to eq 1
+          expect(global.descendants.count).to eq described_class.allowed_keys.length
         end
 
         it 'creates node object using valid class' do
diff --git a/spec/services/ci/web_ide_config_service_spec.rb b/spec/services/ide/base_config_service_spec.rb
index 437b468cec8..debdc6e5809 100644
--- a/spec/services/ci/web_ide_config_service_spec.rb
+++ b/spec/services/ide/base_config_service_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-RSpec.describe Ci::WebIdeConfigService do
+RSpec.describe Ide::BaseConfigService do
   let_it_be(:project) { create(:project, :repository) }
   let_it_be(:user) { create(:user) }
   let(:sha) { 'sha' }
@@ -47,44 +47,6 @@ RSpec.describe Ci::WebIdeConfigService do
               message: "Invalid configuration format")
           end
         end
-
-        context 'content is valid, but terminal not defined' do
-          let(:config_content) { '{}' }
-
-          it 'returns success' do
-            is_expected.to include(
-              status: :success,
-              terminal: nil)
-          end
-        end
-
-        context 'content is valid, with enabled terminal' do
-          let(:config_content) { 'terminal: {}' }
-
-          it 'returns success' do
-            is_expected.to include(
-              status: :success,
-              terminal: {
-                tag_list: [],
-                yaml_variables: [],
-                options: { script: ["sleep 60"] }
-              })
-          end
-        end
-
-        context 'content is valid, with custom terminal' do
-          let(:config_content) { 'terminal: { before_script: [ls] }' }
-
-          it 'returns success' do
-            is_expected.to include(
-              status: :success,
-              terminal: {
-                tag_list: [],
-                yaml_variables: [],
-                options: { before_script: ["ls"], script: ["sleep 60"] }
-              })
-          end
-        end
       end
     end
   end
diff --git a/spec/services/ide/schemas_config_service_spec.rb b/spec/services/ide/schemas_config_service_spec.rb
new file mode 100644
index 00000000000..19e5ca9e87d
--- /dev/null
+++ b/spec/services/ide/schemas_config_service_spec.rb
@@ -0,0 +1,53 @@
+# frozen_string_literal: true
+
+require 'spec_helper'
+
+RSpec.describe Ide::SchemasConfigService do
+  let_it_be(:project) { create(:project, :repository) }
+  let_it_be(:user) { create(:user) }
+  let(:filename) { 'sample.yml' }
+  let(:schema_content) { double(body: '{"title":"Sample schema"}') }
+
+  describe '#execute' do
+    before do
+      project.add_developer(user)
+
+      allow(Gitlab::HTTP).to receive(:get).with(anything) do
+        schema_content
+      end
+    end
+
+    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
+      it 'returns an empty object' do
+        is_expected.to include(
+          status: :success,
+          schema: {})
+      end
+    end
+  end
+end
diff --git a/spec/services/ide/terminal_config_service_spec.rb b/spec/services/ide/terminal_config_service_spec.rb
new file mode 100644
index 00000000000..d6c4f7a2a69
--- /dev/null
+++ b/spec/services/ide/terminal_config_service_spec.rb
@@ -0,0 +1,69 @@
+# frozen_string_literal: true
+
+require 'spec_helper'
+
+RSpec.describe Ide::TerminalConfigService do
+  let_it_be(:project) { create(:project, :repository) }
+  let_it_be(:user) { create(:user) }
+  let(:sha) { 'sha' }
+
+  describe '#execute' do
+    subject { described_class.new(project, user, sha: sha).execute }
+
+    before do
+      project.add_developer(user)
+
+      allow(project.repository).to receive(:blob_data_at).with('sha', anything) do
+        config_content
+      end
+    end
+
+    context 'content is not valid' do
+      let(:config_content) { 'invalid content' }
+
+      it 'returns an error' do
+        is_expected.to include(
+          status: :error,
+          message: "Invalid configuration format")
+      end
+    end
+
+    context 'terminal not defined' do
+      let(:config_content) { '{}' }
+
+      it 'returns success' do
+        is_expected.to include(
+          status: :success,
+          terminal: nil)
+      end
+    end
+
+    context 'terminal enabled' do
+      let(:config_content) { 'terminal: {}' }
+
+      it 'returns success' do
+        is_expected.to include(
+          status: :success,
+          terminal: {
+            tag_list: [],
+            yaml_variables: [],
+            options: { script: ["sleep 60"] }
+          })
+      end
+    end
+
+    context 'custom terminal enabled' do
+      let(:config_content) { 'terminal: { before_script: [ls] }' }
+
+      it 'returns success' do
+        is_expected.to include(
+          status: :success,
+          terminal: {
+            tag_list: [],
+            yaml_variables: [],
+            options: { before_script: ["ls"], script: ["sleep 60"] }
+          })
+      end
+    end
+  end
+end