diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2021-07-02 00:08:38 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2021-07-02 00:08:38 +0300 |
commit | f8975b16d11afde69e398a8c607a27e0c05b48f9 (patch) | |
tree | b55c272e69d7df57cd426a2e471b64c007980eff /spec/features/expand_collapse_diffs_spec.rb | |
parent | ed323a3c6fcc2927e217b72121875abd448c2785 (diff) |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'spec/features/expand_collapse_diffs_spec.rb')
-rw-r--r-- | spec/features/expand_collapse_diffs_spec.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/spec/features/expand_collapse_diffs_spec.rb b/spec/features/expand_collapse_diffs_spec.rb index cbd1ae628d1..add4af2bcdb 100644 --- a/spec/features/expand_collapse_diffs_spec.rb +++ b/spec/features/expand_collapse_diffs_spec.rb @@ -253,7 +253,7 @@ RSpec.describe 'Expand and collapse diffs', :js do click_link('Expand all') # Wait for elements to appear to ensure full page reload - expect(page).to have_content('This diff was suppressed by a .gitattributes entry') + expect(page).to have_content("File suppressed by a .gitattributes entry or the file's encoding is unsupported.") expect(page).to have_content('This source diff could not be displayed because it is too large.') expect(page).to have_content('too_large_image.jpg') find('.note-textarea') |