diff options
author | Kamil Trzciński <ayufan@ayufan.eu> | 2019-06-24 17:29:54 +0000 |
---|---|---|
committer | Stan Hu <stanhu@gmail.com> | 2019-06-24 17:29:54 +0000 |
commit | e11feff929c3f91ed99b5cb312b07c30f8a92969 (patch) | |
tree | 12a8dafb98a9269621b8fe7b77c9b8d914d0834c | |
parent | 1f2387c4ffd710eb9ce0b006e59a76fcae2af437 (diff) | |
download | gitlab-ce-e11feff929c3f91ed99b5cb312b07c30f8a92969.tar.gz |
Revert "Merge branch..."
This reverts merge request !29832
-rw-r--r-- | lib/gitlab/ci/ansi2html.rb | 4 | ||||
-rw-r--r-- | spec/lib/gitlab/ci/ansi2html_spec.rb | 8 | ||||
-rw-r--r-- | spec/lib/gitlab/ci/trace/stream_spec.rb | 10 | ||||
-rw-r--r-- | spec/support/shared_examples/ci_trace_shared_examples.rb | 2 |
4 files changed, 11 insertions, 13 deletions
diff --git a/lib/gitlab/ci/ansi2html.rb b/lib/gitlab/ci/ansi2html.rb index 55411b5a8c4..fc3223e7442 100644 --- a/lib/gitlab/ci/ansi2html.rb +++ b/lib/gitlab/ci/ansi2html.rb @@ -200,9 +200,7 @@ module Gitlab css_classes = %w[section line] + sections.map { |section| "s_#{section}" } end - ensure_open_new_tag - write_raw %{<br/>} - close_open_tags + write_in_tag %{<br/>} write_raw %{<span class="#{css_classes.join(' ')}"></span>} if css_classes.any? @lineno_in_section += 1 open_new_tag diff --git a/spec/lib/gitlab/ci/ansi2html_spec.rb b/spec/lib/gitlab/ci/ansi2html_spec.rb index aa4e358b148..3d57ce431ab 100644 --- a/spec/lib/gitlab/ci/ansi2html_spec.rb +++ b/spec/lib/gitlab/ci/ansi2html_spec.rb @@ -141,11 +141,11 @@ describe Gitlab::Ci::Ansi2html do end it "replaces newlines with line break tags" do - expect(convert_html("\n")).to eq('<span class=""></span><br/><span class=""></span>') + expect(convert_html("\n")).to eq('<span class=""><br/><span class=""></span></span>') end it "groups carriage returns with newlines" do - expect(convert_html("\r\n")).to eq('<span class=""></span><br/><span class=""></span>') + expect(convert_html("\r\n")).to eq('<span class=""><br/><span class=""></span></span>') end describe "incremental update" do @@ -193,7 +193,7 @@ describe Gitlab::Ci::Ansi2html do let(:pre_text) { "Hello\r" } let(:pre_html) { "<span class=\"\">Hello\r</span>" } let(:text) { "\nWorld" } - let(:html) { "<span class=\"\"></span><br/><span class=\"\">World</span>" } + let(:html) { "<span class=\"\"><br/><span class=\"\">World</span></span>" } it_behaves_like 'stateable converter' end @@ -232,7 +232,7 @@ describe Gitlab::Ci::Ansi2html do it 'prints light red' do text = "#{section_start}\e[91mHello\e[0m\n#{section_end}" header = %{<span class="term-fg-l-red section js-section-header section-header js-s-#{class_name(section_name)}">Hello</span>} - line_break = %{<span class="section js-section-header section-header js-s-#{class_name(section_name)}"></span><br/>} + line_break = %{<span class="section js-section-header section-header js-s-#{class_name(section_name)}"><br/></span>} line = %{<span class="section line s_#{class_name(section_name)}"></span>} empty_line = %{<span class="section js-s-#{class_name(section_name)}"></span>} html = "#{section_start_html}#{header}#{line_break}#{line}#{empty_line}#{section_end_html}" diff --git a/spec/lib/gitlab/ci/trace/stream_spec.rb b/spec/lib/gitlab/ci/trace/stream_spec.rb index 0d03eef99c8..35250632e86 100644 --- a/spec/lib/gitlab/ci/trace/stream_spec.rb +++ b/spec/lib/gitlab/ci/trace/stream_spec.rb @@ -65,9 +65,9 @@ describe Gitlab::Ci::Trace::Stream, :clean_gitlab_redis_cache do result = stream.html expect(result).to eq( - "<span class=\"\">ヾ(´༎ຶД༎ຶ`)ノ</span><br/><span class=\"\"></span>"\ - "<span class=\"term-fg-green\">許功蓋</span><span class=\"\"></span><br/>"\ - "<span class=\"\"></span>") + "<span class=\"\">ヾ(´༎ຶД༎ຶ`)ノ<br/><span class=\"\"></span></span>"\ + "<span class=\"term-fg-green\">許功蓋</span><span class=\"\"><br/>"\ + "<span class=\"\"></span></span>") expect(result.encoding).to eq(Encoding.default_external) end end @@ -306,8 +306,8 @@ describe Gitlab::Ci::Trace::Stream, :clean_gitlab_redis_cache do shared_examples_for 'htmls' do it "returns html" do expect(stream.html).to eq( - "<span class=\"\">12</span><br/><span class=\"\">34</span><br/>"\ - "<span class=\"\">56</span>") + "<span class=\"\">12<br/><span class=\"\">34<br/>"\ + "<span class=\"\">56</span></span></span>") end it "returns html for last line only" do diff --git a/spec/support/shared_examples/ci_trace_shared_examples.rb b/spec/support/shared_examples/ci_trace_shared_examples.rb index 7993b2870e5..f985b2dcbba 100644 --- a/spec/support/shared_examples/ci_trace_shared_examples.rb +++ b/spec/support/shared_examples/ci_trace_shared_examples.rb @@ -5,7 +5,7 @@ shared_examples_for 'common trace features' do end it "returns formatted html" do - expect(trace.html).to eq("<span class=\"\">12</span><br/><span class=\"\">34</span>") + expect(trace.html).to eq("<span class=\"\">12<br/><span class=\"\">34</span></span>") end it "returns last line of formatted html" do |