diff options
| author | ZJ van de Weg <zegerjan@gitlab.com> | 2016-05-25 14:41:25 +0200 |
|---|---|---|
| committer | ZJ van de Weg <zegerjan@gitlab.com> | 2016-05-25 14:41:25 +0200 |
| commit | 7ae536002ac981b3d18aae8851d8d70731db29dc (patch) | |
| tree | 5d0c660df87be8d8d7ac4c50bab9ce1c27cbd876 /spec/helpers | |
| parent | 20e6e0dbe609f7b0fdd480281223a1a98d645f34 (diff) | |
| parent | 318b22459bfff1cecfb1f38e381faaca3bc29bbb (diff) | |
| download | gitlab-ce-7ae536002ac981b3d18aae8851d8d70731db29dc.tar.gz | |
Merge branch 'master' into awardables
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 b7810185d16..52764f41e0d 100644 --- a/spec/helpers/diff_helper_spec.rb +++ b/spec/helpers/diff_helper_spec.rb @@ -93,9 +93,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'>'def'</span>") + expect(marked_old_line).to eq("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'>"def"</span>") + expect(marked_new_line).to eq("abc <span class='idiff left right addition'>"def"</span>") expect(marked_new_line).to be_html_safe end end |