Commit d4e232ae authored by Lin Jen-Shin's avatar Lin Jen-Shin Committed by Clement Ho

Added 'clear' button to ci lint editor

parent d16802ff
...@@ -2,11 +2,18 @@ export default class CILintEditor { ...@@ -2,11 +2,18 @@ export default class CILintEditor {
constructor() { constructor() {
this.editor = window.ace.edit('ci-editor'); this.editor = window.ace.edit('ci-editor');
this.textarea = document.querySelector('#content'); this.textarea = document.querySelector('#content');
this.clearYml = document.querySelector('.clear-yml');
this.editor.getSession().setMode('ace/mode/yaml'); this.editor.getSession().setMode('ace/mode/yaml');
this.editor.on('input', () => { this.editor.on('input', () => {
const content = this.editor.getSession().getValue(); const content = this.editor.getSession().getValue();
this.textarea.value = content; this.textarea.value = content;
}); });
this.clearYml.addEventListener('click', this.clear.bind(this));
}
clear() {
this.editor.setValue('');
} }
} }
...@@ -18,6 +18,8 @@ ...@@ -18,6 +18,8 @@
.col-sm-12 .col-sm-12
.pull-left.prepend-top-10 .pull-left.prepend-top-10
= submit_tag('Validate', class: 'btn btn-success submit-yml') = submit_tag('Validate', class: 'btn btn-success submit-yml')
.pull-right.prepend-top-10
= button_tag('Clear', type: 'button', class: 'btn btn-default clear-yml')
.row.prepend-top-20 .row.prepend-top-20
.col-sm-12 .col-sm-12
......
---
title: Added clear button to ci lint editor
merge_request:
author: Michael Robinson
...@@ -3,16 +3,19 @@ require 'spec_helper' ...@@ -3,16 +3,19 @@ require 'spec_helper'
describe 'CI Lint', :js do describe 'CI Lint', :js do
before do before do
sign_in(create(:user)) sign_in(create(:user))
visit ci_lint_path
find('#ci-editor')
execute_script("ace.edit('ci-editor').setValue(#{yaml_content.to_json});")
# Ace editor updates a hidden textarea and it happens asynchronously
wait_for('YAML content') do
find('.ace_content').text.present?
end
end end
describe 'YAML parsing' do describe 'YAML parsing' do
before do before do
visit ci_lint_path
# Ace editor updates a hidden textarea and it happens asynchronously
# `sleep 0.1` is actually needed here because of this
find('#ci-editor')
execute_script("ace.edit('ci-editor').setValue(" + yaml_content.to_json + ");")
sleep 0.1
click_on 'Validate' click_on 'Validate'
end end
...@@ -32,11 +35,10 @@ describe 'CI Lint', :js do ...@@ -32,11 +35,10 @@ describe 'CI Lint', :js do
end end
context 'YAML is incorrect' do context 'YAML is incorrect' do
let(:yaml_content) { '' } let(:yaml_content) { 'value: cannot have :' }
it 'displays information about an error' do it 'displays information about an error' do
expect(page).to have_content('Status: syntax is incorrect') expect(page).to have_content('Status: syntax is incorrect')
expect(page).to have_content('Error: Please provide content of .gitlab-ci.yml')
end end
end end
...@@ -48,4 +50,20 @@ describe 'CI Lint', :js do ...@@ -48,4 +50,20 @@ describe 'CI Lint', :js do
end end
end end
end end
describe 'YAML clearing' do
before do
click_on 'Clear'
end
context 'YAML is present' do
let(:yaml_content) do
File.read(Rails.root.join('spec/support/gitlab_stubs/gitlab_ci.yml'))
end
it 'YAML content is cleared' do
expect(page).to have_field('content', with: '', visible: false, type: 'textarea')
end
end
end
end end
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment