diff options
author | Douwe Maan <douwe@gitlab.com> | 2017-09-14 08:28:04 +0000 |
---|---|---|
committer | Douwe Maan <douwe@gitlab.com> | 2017-09-14 08:28:04 +0000 |
commit | d3b89a407c1fbfc0011acb8724cef08fd755580b (patch) | |
tree | a5d1bddd3dcd61592d562693f028d249b1c48f61 /spec/features | |
parent | d3fb1da12011b1fcaa3e2fc5c38b6cc87f3d38ab (diff) | |
parent | 46e4e8f4dc968b7173aa37bb3e3bb944e5d63e10 (diff) | |
download | gitlab-ce-d3b89a407c1fbfc0011acb8724cef08fd755580b.tar.gz |
Merge branch '37576-renamed-files-have-escaped-html-for-the-inline-diff-in-the-header' into 'master'
Resolve "Renamed files have escaped HTML for the inline diff in the header"
Closes #37576
See merge request gitlab-org/gitlab-ce!14121
Diffstat (limited to 'spec/features')
-rw-r--r-- | spec/features/projects/diffs/diff_show_spec.rb | 13 |
1 files changed, 13 insertions, 0 deletions
diff --git a/spec/features/projects/diffs/diff_show_spec.rb b/spec/features/projects/diffs/diff_show_spec.rb index bc102895aaf..a6f52c9ef58 100644 --- a/spec/features/projects/diffs/diff_show_spec.rb +++ b/spec/features/projects/diffs/diff_show_spec.rb @@ -108,6 +108,19 @@ feature 'Diff file viewer', :js do end end + context 'renamed file' do + before do + visit_commit('6907208d755b60ebeacb2e9dfea74c92c3449a1f') + end + + it 'shows the filename with diff highlight' do + within('.file-header-content') do + expect(page).to have_css('.idiff.left.right.deletion') + expect(page).to have_content('files/js/commit.coffee') + end + end + end + context 'binary file that appears to be text in the first 1024 bytes' do before do # The file we're visiting is smaller than 10 KB and we want it collapsed |