diff options
| author | Sean McGivern <sean@gitlab.com> | 2018-08-28 16:39:17 +0300 |
|---|---|---|
| committer | Sean McGivern <sean@gitlab.com> | 2018-08-28 17:28:47 +0300 |
| commit | 0d01ac51419cd429bd0ca02e42085e73db9ba713 (patch) | |
| tree | d0ffe9eeecd3e4b45354171579423f2b0d95f8a1 /spec/lib/gitlab/conflict | |
| parent | 81a403f05f05f4ee8d65db6185cbd0856f7c5189 (diff) | |
Include rich_text in diff cache keys
Previously, this wasn't needed: text was normally set to the highlighted
contents anyway. Now, it is: we store different things in text and rich_text.
This caused https://gitlab.com/gitlab-com/production/issues/439.
Diffstat (limited to 'spec/lib/gitlab/conflict')
| -rw-r--r-- | spec/lib/gitlab/conflict/file_spec.rb | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/spec/lib/gitlab/conflict/file_spec.rb b/spec/lib/gitlab/conflict/file_spec.rb index 5b343920429..9095ffbfd52 100644 --- a/spec/lib/gitlab/conflict/file_spec.rb +++ b/spec/lib/gitlab/conflict/file_spec.rb @@ -69,10 +69,6 @@ describe Gitlab::Conflict::File do CGI.unescapeHTML(ActionView::Base.full_sanitizer.sanitize(html)).delete("\n") end - it 'modifies the existing lines' do - expect { conflict_file.highlight_lines! }.to change { conflict_file.lines.map(&:instance_variables) } - end - it 'is called implicitly when rich_text is accessed on a line' do expect(conflict_file).to receive(:highlight_lines!).once.and_call_original |