diff options
| author | Grzegorz Bizon <grzegorz@gitlab.com> | 2018-09-01 11:33:17 +0300 |
|---|---|---|
| committer | Grzegorz Bizon <grzegorz@gitlab.com> | 2018-09-01 11:33:17 +0300 |
| commit | ba99dfcde262c91e33b5bf7f86ba7c0e3b6f7e52 (patch) | |
| tree | 7907aa6bb9bc94db9f864a06d0e0afc35838b80a | |
| parent | 21b7e203b3d0b3048cd5f860e602d8a18655f118 (diff) | |
| parent | 8d400982fe249c03725fbf8c82e96f7e9da449e9 (diff) | |
Merge branch 'assert-that-mr-diff-is-highlighted' into 'master'
Add spec to ensure MR diffs are highlighted
Closes #50793
See merge request gitlab-org/gitlab-ce!21410
| -rw-r--r-- | spec/features/merge_request/user_sees_diff_spec.rb | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/spec/features/merge_request/user_sees_diff_spec.rb b/spec/features/merge_request/user_sees_diff_spec.rb index 0c15febe8df..0df9e4bbc1a 100644 --- a/spec/features/merge_request/user_sees_diff_spec.rb +++ b/spec/features/merge_request/user_sees_diff_spec.rb @@ -122,7 +122,7 @@ describe 'Merge request > User sees diff', :js do } CONTENT - file_name = 'xss_file.txt' + file_name = 'xss_file.rs' create_file('master', file_name, file_content) merge_request = create(:merge_request, source_project: project) @@ -133,6 +133,7 @@ describe 'Merge request > User sees diff', :js do visit diffs_project_merge_request_path(project, merge_request) expect(page).to have_text("function foo<input> {") + expect(page).to have_css(".line[lang='rust'] .k") end end end |