diff options
| author | Sean McGivern <sean@mcgivern.me.uk> | 2017-05-12 17:27:42 +0000 |
|---|---|---|
| committer | Sean McGivern <sean@mcgivern.me.uk> | 2017-05-12 17:27:42 +0000 |
| commit | ec1a3c093f7a8d2fe29e46ec06e6b35e3f1d97ff (patch) | |
| tree | 0e3b3584e41de2ff3f6d9efed11bd0835fd10964 /spec/helpers | |
| parent | 5c7f63f590100deafb8b04bec9daf9006ed1105e (diff) | |
| parent | b6ad80501577dcb09190d56333c035d59984b2a4 (diff) | |
| download | gitlab-ce-ec1a3c093f7a8d2fe29e46ec06e6b35e3f1d97ff.tar.gz | |
Merge branch 'dm-dependency-linker-gemfile' into 'master'
Autolink package names in Gemfile
See merge request !11224
Diffstat (limited to 'spec/helpers')
| -rw-r--r-- | spec/helpers/diff_helper_spec.rb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/spec/helpers/diff_helper_spec.rb b/spec/helpers/diff_helper_spec.rb index eae097126ce..dd6566d25bb 100644 --- a/spec/helpers/diff_helper_spec.rb +++ b/spec/helpers/diff_helper_spec.rb @@ -122,9 +122,9 @@ describe DiffHelper do it "returns strings with marked inline diffs" do marked_old_line, marked_new_line = mark_inline_diffs(old_line, new_line) - expect(marked_old_line).to eq("abc <span class='idiff left right deletion'>'def'</span>") + expect(marked_old_line).to eq(%q{abc <span class="idiff left right deletion">'def'</span>}) expect(marked_old_line).to be_html_safe - expect(marked_new_line).to eq("abc <span class='idiff left right addition'>"def"</span>") + expect(marked_new_line).to eq(%q{abc <span class="idiff left right addition">"def"</span>}) expect(marked_new_line).to be_html_safe end end |