summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGrzegorz Bizon <grzesiek.bizon@gmail.com>2016-09-26 11:43:55 +0200
committerGrzegorz Bizon <grzesiek.bizon@gmail.com>2016-09-26 11:48:43 +0200
commit528b988aea44cc1016ee5a3c09ce0d383114e395 (patch)
tree83fe8450587dc108a794b71e600e728029791eeb
parentfca610e5cbf5382f3814120227a0ca11440c8a9f (diff)
downloadgitlab-ce-528b988aea44cc1016ee5a3c09ce0d383114e395.tar.gz
Escape HTML nodes in builds commands in ci linter
-rw-r--r--app/views/ci/lints/_create.html.haml3
-rw-r--r--spec/views/ci/lints/show.html.haml_spec.rb35
2 files changed, 36 insertions, 2 deletions
diff --git a/app/views/ci/lints/_create.html.haml b/app/views/ci/lints/_create.html.haml
index f7875e68b7e..1545c00af45 100644
--- a/app/views/ci/lints/_create.html.haml
+++ b/app/views/ci/lints/_create.html.haml
@@ -16,8 +16,7 @@
%tr
%td #{stage.capitalize} Job - #{build[:name]}
%td
- %pre
- = simple_format build[:commands]
+ %pre= build[:commands]
%br
%b Tag list:
diff --git a/spec/views/ci/lints/show.html.haml_spec.rb b/spec/views/ci/lints/show.html.haml_spec.rb
new file mode 100644
index 00000000000..3a65a86cd88
--- /dev/null
+++ b/spec/views/ci/lints/show.html.haml_spec.rb
@@ -0,0 +1,35 @@
+require 'spec_helper'
+
+describe 'ci/lints/show' do
+ include Devise::TestHelpers
+
+ before do
+ assign(:status, true)
+ assign(:stages, %w[test])
+ assign(:builds, builds)
+ end
+
+ context 'when builds attrbiutes contain HTML nodes' do
+ let(:builds) do
+ [ { name: 'rspec', stage: 'test', commands: '<h1>rspec</h1>' } ]
+ end
+
+ it 'does not render HTML elements' do
+ render
+
+ expect(rendered).not_to have_css('h1', text: 'rspec')
+ end
+ end
+
+ context 'when builds attributes do not contain HTML nodes' do
+ let(:builds) do
+ [ { name: 'rspec', stage: 'test', commands: 'rspec' } ]
+ end
+
+ it 'shows configuration in the table' do
+ render
+
+ expect(rendered).to have_css('td pre', text: 'rspec')
+ end
+ end
+end