Add tests for API CI Lint

2 files changed, 24 insertions, 16 deletions

diff --git a/lib/ci/api/entities.rb b/lib/ci/api/entities.rb
index 8052908e78a..3f5bdaba3f5 100644
--- a/lib/ci/api/entities.rb
+++ b/lib/ci/api/entities.rb
@@ -59,13 +59,6 @@ module Ci
         expose :id, :variables
         expose :pipeline, using: Commit, as: :commit
       end
-
-      class Lint < Grape::Entity
-        expose :content
-        expose :status
-        expose :builds
-        expose :stages
-      end
     end
   end
 end
diff --git a/lib/ci/api/lint.rb b/lib/ci/api/lint.rb
index d781441d2b7..53a80318195 100644
--- a/lib/ci/api/lint.rb
+++ b/lib/ci/api/lint.rb
@@ -4,19 +4,34 @@ module Ci
       before { authenticate! }
 
       resources :lint do
+
         post do
-          content = params[:content]
+          begin
+            response = {}
+            @content = params[:content]
 
-          if content
-            config_processor = Ci::GitlabCiYamlProcessor.new(content)
-            stages = config_processor.stages
-            builds = config_processor.builds
-            status = true
+            if @content
+              @config_processor = Ci::GitlabCiYamlProcessor.new(@content)
+              @stages = @config_processor.stages
+              @builds = @config_processor.builds
 
-            response = { status: status, stages: stages, builds: builds }
-          end
+              response = {
+                content: @content,
+                status: "syntax is correct"
+              }
+
+              stage_builds = @stages.each do |stage|
+                response["#{stage}"] = @builds.select { |build| build[:stage] == stage }
+              end
+            else
+              render_api_error!("Please provide content of .gitlab-ci.yml", 400)
+            end
 
-          response
+            response
+
+          rescue Ci::GitlabCiYamlProcessor::ValidationError, Psych::SyntaxError => e
+            error!({ content: @content, status: "syntax is incorrect", message: e.message })
+          end
         end
       end
     end