diff options
author | Sean McGivern <sean@mcgivern.me.uk> | 2017-04-28 17:56:31 +0000 |
---|---|---|
committer | Sean McGivern <sean@mcgivern.me.uk> | 2017-04-28 17:56:31 +0000 |
commit | 3d2b663e0c3c5b40b9db8a27141efd43e2eb1961 (patch) | |
tree | c46fad7b8057dadaa2df25a390474f9baa8d0ec3 /spec | |
parent | bb3870ea0952654eea6693f7f422b88ca4deda05 (diff) | |
parent | 0be3187a56603e26b677d31880be0dc21072f687 (diff) | |
download | gitlab-ce-3d2b663e0c3c5b40b9db8a27141efd43e2eb1961.tar.gz |
Merge branch 'dm-pull-preserve-into-render-helpers' into 'master'
Pull preserve into render helpers
See merge request !10986
Diffstat (limited to 'spec')
-rw-r--r-- | spec/features/atom/users_spec.rb | 2 | ||||
-rw-r--r-- | spec/helpers/events_helper_spec.rb | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/spec/features/atom/users_spec.rb b/spec/features/atom/users_spec.rb index 55e10a1a89b..7a2987e815d 100644 --- a/spec/features/atom/users_spec.rb +++ b/spec/features/atom/users_spec.rb @@ -53,7 +53,7 @@ describe "User Feed", feature: true do end it 'has XHTML summaries in issue descriptions' do - expect(body).to match /we have a bug!<\/p>\n\n<hr ?\/>\n\n<p dir="auto">I guess/ + expect(body).to match /<hr ?\/>/ end it 'has XHTML summaries in notes' do diff --git a/spec/helpers/events_helper_spec.rb b/spec/helpers/events_helper_spec.rb index a7c3c281083..c3bd0cb3542 100644 --- a/spec/helpers/events_helper_spec.rb +++ b/spec/helpers/events_helper_spec.rb @@ -56,7 +56,7 @@ describe EventsHelper do it 'preserves code color scheme' do input = "```ruby\ndef test\n 'hello world'\nend\n```" - expected = '<pre class="code highlight js-syntax-highlight ruby">' \ + expected = "\n<pre class=\"code highlight js-syntax-highlight ruby\">" \ "<code><span class=\"line\"><span class=\"k\">def</span> <span class=\"nf\">test</span>...</span>\n" \ "</code></pre>" expect(helper.event_note(input)).to eq(expected) |