diff options
| author | Phil Hughes <me@iamphill.com> | 2019-01-10 12:54:39 +0300 |
|---|---|---|
| committer | GitLab Release Tools Bot <robert+release-tools@gitlab.com> | 2019-01-16 21:12:56 +0300 |
| commit | 25af96e46c2ae67a1dac37e399246792050b9223 (patch) | |
| tree | 62c791c4a5302a31b220f43492f122e698d1abee /spec | |
| parent | fc2432592b33c70d21a4e7f91c359da4b668a706 (diff) | |
Merge branch '55945-suggested-change-highlight' into 'master'
Add syntax highlighting to suggestion diff
Closes #55945
See merge request gitlab-org/gitlab-ce!24156
(cherry picked from commit da3b20f7a4cbcbf1698b995f6dc69fa388bc5b2f)
2635f2c6 Add syntax highlighting to suggestion diff
e3919efd Add unit test for syntax highlighting
95f2d284 Add changelog entry
Diffstat (limited to 'spec')
| -rw-r--r-- | spec/javascripts/vue_shared/components/markdown/suggestion_diff_spec.js | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/spec/javascripts/vue_shared/components/markdown/suggestion_diff_spec.js b/spec/javascripts/vue_shared/components/markdown/suggestion_diff_spec.js index d4ed8f2f7a4..f87c2a92f47 100644 --- a/spec/javascripts/vue_shared/components/markdown/suggestion_diff_spec.js +++ b/spec/javascripts/vue_shared/components/markdown/suggestion_diff_spec.js @@ -34,8 +34,8 @@ describe('Suggestion Diff component', () => { expect(vm.$el.querySelector('.qa-suggestion-diff-header')).not.toBeNull(); }); - it('renders a diff table', () => { - expect(vm.$el.querySelector('table.md-suggestion-diff')).not.toBeNull(); + it('renders a diff table with syntax highlighting', () => { + expect(vm.$el.querySelector('.md-suggestion-diff.js-syntax-highlight.code')).not.toBeNull(); }); it('renders the oldLineNumber', () => { |