Merge branch 'fix/ci-linter-sequence-validations' into 'master'

Allow subsequent validations in CI Linter

Closes #5851

See merge request !2368

CHANGELOG

@@ -33,6 +33,7 @@ v 8.4.0 (unreleased)
   - Add file finder feature in tree view (Kyungchul Shin)
   - Ajax filter by message for commits page
   - API: Add support for deleting a tag via the API (Robert Schilling)
+  - Allow subsequent validations in CI Linter
 v 8.3.3 (unreleased)
   - Preserve CE behavior with JIRA integration by only calling API if URL is set

app/controllers/ci/lints_controller.rb

@@ -6,11 +6,13 @@ module Ci
     end
     def create
-      if params[:content].blank?
+      @content = params[:content]
+
+      if @content.blank?
         @status = false
         @error = "Please provide content of .gitlab-ci.yml"
       else
-        @config_processor = Ci::GitlabCiYamlProcessor.new params[:content]
+        @config_processor = Ci::GitlabCiYamlProcessor.new(@content)
         @stages = @config_processor.stages
         @builds = @config_processor.builds
         @status = true

app/views/ci/lints/show.html.haml

@@ -4,12 +4,12 @@
 .row
   = form_tag ci_lint_path, method: :post do
     .form-group
-      = label_tag :content, 'Content of .gitlab-ci.yml', class: 'control-label text-nowrap'
+      = label_tag(:content, 'Content of .gitlab-ci.yml', class: 'control-label text-nowrap')
       .col-sm-12
-        = text_area_tag :content, nil, class: 'form-control span1', rows: 7, require: true
+        = text_area_tag(:content, @content, class: 'form-control span1', rows: 7, require: true)
     .col-sm-12
       .pull-left.prepend-top-10
-        = submit_tag 'Validate', class: 'btn btn-success submit-yml'
+        = submit_tag('Validate', class: 'btn btn-success submit-yml')
 .row.prepend-top-20
   .col-sm-12

spec/features/ci_lint_spec.rb

@@ -35,5 +35,13 @@ describe 'CI Lint' do
         expect(page).to have_content('Error: Please provide content of .gitlab-ci.yml')
       end
     end
+
+    describe 'YAML revalidate' do
+      let(:yaml_content) { 'my yaml content' }
+
+      it 'loads previous YAML content after validation' do
+        expect(page).to have_field('content', with: 'my yaml content', type: 'textarea')
+      end
+    end
   end
 end