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 /spec/lib/gitlab/ci/ansi2html_spec.rb | |
parent | 1f2387c4ffd710eb9ce0b006e59a76fcae2af437 (diff) | |
download | gitlab-ce-e11feff929c3f91ed99b5cb312b07c30f8a92969.tar.gz |
Revert "Merge branch..."
This reverts merge request !29832
Diffstat (limited to 'spec/lib/gitlab/ci/ansi2html_spec.rb')
-rw-r--r-- | spec/lib/gitlab/ci/ansi2html_spec.rb | 8 |
1 files changed, 4 insertions, 4 deletions
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}" |