Commit 63046e8b authored by Dmytro Zaporozhets's avatar Dmytro Zaporozhets

Merge branch 'kerrizor/cleanup-highlight_cache_specs' into 'master'

Small refactor to DRY spec actions

See merge request gitlab-org/gitlab!27284
parents 501e790b 679a9464
...@@ -53,26 +53,22 @@ describe Gitlab::Diff::HighlightCache, :clean_gitlab_redis_cache do ...@@ -53,26 +53,22 @@ describe Gitlab::Diff::HighlightCache, :clean_gitlab_redis_cache do
fallback_diff_refs: diffs.fallback_diff_refs) fallback_diff_refs: diffs.fallback_diff_refs)
end end
it 'does not calculate highlighting when reading from cache' do before do
cache.write_if_empty cache.write_if_empty
cache.decorate(diff_file) cache.decorate(diff_file)
end
it 'does not calculate highlighting when reading from cache' do
expect_any_instance_of(Gitlab::Diff::Highlight).not_to receive(:highlight) expect_any_instance_of(Gitlab::Diff::Highlight).not_to receive(:highlight)
diff_file.highlighted_diff_lines diff_file.highlighted_diff_lines
end end
it 'assigns highlighted diff lines to the DiffFile' do it 'assigns highlighted diff lines to the DiffFile' do
cache.write_if_empty
cache.decorate(diff_file)
expect(diff_file.highlighted_diff_lines.size).to be > 5 expect(diff_file.highlighted_diff_lines.size).to be > 5
end end
it 'assigns highlighted diff lines which rich_text are HTML-safe' do it 'assigns highlighted diff lines which rich_text are HTML-safe' do
cache.write_if_empty
cache.decorate(diff_file)
rich_texts = diff_file.highlighted_diff_lines.map(&:rich_text) rich_texts = diff_file.highlighted_diff_lines.map(&:rich_text)
expect(rich_texts).to all(be_html_safe) expect(rich_texts).to all(be_html_safe)
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment