diff --git a/app/services/import/jira_wiki_markup/renderer.rb b/app/services/import/jira_wiki_markup/renderer.rb index 1b64b5a797c..ec366877f43 100644 --- a/app/services/import/jira_wiki_markup/renderer.rb +++ b/app/services/import/jira_wiki_markup/renderer.rb @@ -108,7 +108,7 @@ module Import end def render_horizontal_rule - "
" + "
\n" end def render_heading(node) diff --git a/spec/services/import/jira_wiki_markup_converter_spec.rb b/spec/services/import/jira_wiki_markup_converter_spec.rb index a05cfbecf3d..2044e4fbf0e 100644 --- a/spec/services/import/jira_wiki_markup_converter_spec.rb +++ b/spec/services/import/jira_wiki_markup_converter_spec.rb @@ -83,6 +83,20 @@ RSpec.describe Import::JiraWikiMarkupConverter do expect(described_class.new(input).convert).to eq("**bold?text**") end end + + context "with in between horizontal lines" do + let(:input) do + "start\n----\nGot it? Now click *Resolve this issue* " \ + "and add a comment to complete this request.\n----\nend" + end + + it do + expect(subject).to eq( + "start\n
\n\nGot it? Now click **Resolve this issue** " \ + "and add a comment to complete this request.\n
\n\nend" + ) + end + end end describe "line ending normalization" do @@ -470,7 +484,7 @@ RSpec.describe Import::JiraWikiMarkupConverter do describe "horizontal rule" do let(:input) { "Above\n----\nBelow" } - it { is_expected.to eq("Above\n
\nBelow") } + it { is_expected.to eq("Above\n
\n\nBelow") } end describe "dashes" do @@ -489,7 +503,7 @@ RSpec.describe Import::JiraWikiMarkupConverter do context "with dashes and line breaks" do let(:input) { "HR:\n----\nEm-Dash\n---\nEn-Dash\n--\n" } - it { is_expected.to eq("HR:\n
\nEm-Dash\n\n\u2014\n\nEn-Dash\n\n\u2013\n\n") } + it { is_expected.to eq("HR:\n
\n\nEm-Dash\n\n\u2014\n\nEn-Dash\n\n\u2013\n\n") } end end