diff options
author | micael.bergeron <micael.bergeron@solutionstlm.com> | 2017-09-11 11:17:59 -0400 |
---|---|---|
committer | GitLab Development <gitlab@local.local> | 2017-09-11 15:20:31 +0000 |
commit | a91101d0ac19e33b0f26acaa4c2f1207789641fb (patch) | |
tree | f10355cb20461bb48b8b618a5bdcf81e49de36c7 /spec/features/projects/diffs | |
parent | d70c3bbc149177037490c404a42896d8b486fbe8 (diff) | |
download | gitlab-ce-a91101d0ac19e33b0f26acaa4c2f1207789641fb.tar.gz |
rework the html_safe not to use haml's auto escaping
add feature test for inline diff in file header
Diffstat (limited to 'spec/features/projects/diffs')
-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 |