diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2019-11-26 09:08:36 +0000 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2019-11-26 09:08:36 +0000 |
commit | 23d237110e6a646dec08e1f5b4696d2d9c51cfef (patch) | |
tree | 3c568514c8e22203f50d38940cbb9865aad5bb02 /spec/features/merge_request | |
parent | 274dff4f027da636f62361c811285cbb5d5a7c0c (diff) | |
download | gitlab-ce-23d237110e6a646dec08e1f5b4696d2d9c51cfef.tar.gz |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'spec/features/merge_request')
6 files changed, 7 insertions, 1 deletions
diff --git a/spec/features/merge_request/user_expands_diff_spec.rb b/spec/features/merge_request/user_expands_diff_spec.rb index ba7abd3af2c..9b040271468 100644 --- a/spec/features/merge_request/user_expands_diff_spec.rb +++ b/spec/features/merge_request/user_expands_diff_spec.rb @@ -8,6 +8,7 @@ describe 'User expands diff', :js do before do stub_feature_flags(single_mr_diff_view: false) + stub_feature_flags(diffs_batch_load: false) allow(Gitlab::Git::Diff).to receive(:size_limit).and_return(100.kilobytes) allow(Gitlab::Git::Diff).to receive(:collapse_limit).and_return(10.kilobytes) @@ -20,7 +21,7 @@ describe 'User expands diff', :js do it_behaves_like 'rendering a single diff version' it 'allows user to expand diff' do - page.within find('[id="2f6fcd96b88b36ce98c38da085c795a27d92a3dd"]') do + page.within find('[id="6eb14e00385d2fb284765eb1cd8d420d33d63fc9"]') do click_link 'Click to expand it.' wait_for_requests diff --git a/spec/features/merge_request/user_resolves_diff_notes_and_discussions_resolve_spec.rb b/spec/features/merge_request/user_resolves_diff_notes_and_discussions_resolve_spec.rb index 7cb46d90092..9cbea8a8466 100644 --- a/spec/features/merge_request/user_resolves_diff_notes_and_discussions_resolve_spec.rb +++ b/spec/features/merge_request/user_resolves_diff_notes_and_discussions_resolve_spec.rb @@ -21,6 +21,7 @@ describe 'Merge request > User resolves diff notes and threads', :js do before do stub_feature_flags(single_mr_diff_view: false) + stub_feature_flags(diffs_batch_load: false) end it_behaves_like 'rendering a single diff version' diff --git a/spec/features/merge_request/user_sees_avatar_on_diff_notes_spec.rb b/spec/features/merge_request/user_sees_avatar_on_diff_notes_spec.rb index e882b401122..70afe056c64 100644 --- a/spec/features/merge_request/user_sees_avatar_on_diff_notes_spec.rb +++ b/spec/features/merge_request/user_sees_avatar_on_diff_notes_spec.rb @@ -22,6 +22,7 @@ describe 'Merge request > User sees avatars on diff notes', :js do before do stub_feature_flags(single_mr_diff_view: false) + stub_feature_flags(diffs_batch_load: false) project.add_maintainer(user) sign_in user diff --git a/spec/features/merge_request/user_sees_diff_spec.rb b/spec/features/merge_request/user_sees_diff_spec.rb index 82dd779577c..de142344c26 100644 --- a/spec/features/merge_request/user_sees_diff_spec.rb +++ b/spec/features/merge_request/user_sees_diff_spec.rb @@ -11,6 +11,7 @@ describe 'Merge request > User sees diff', :js do before do stub_feature_flags(single_mr_diff_view: false) + stub_feature_flags(diffs_batch_load: false) end it_behaves_like 'rendering a single diff version' diff --git a/spec/features/merge_request/user_sees_versions_spec.rb b/spec/features/merge_request/user_sees_versions_spec.rb index c3fce9761df..b3aef601c7b 100644 --- a/spec/features/merge_request/user_sees_versions_spec.rb +++ b/spec/features/merge_request/user_sees_versions_spec.rb @@ -17,6 +17,7 @@ describe 'Merge request > User sees versions', :js do before do stub_feature_flags(single_mr_diff_view: false) + stub_feature_flags(diffs_batch_load: false) project.add_maintainer(user) sign_in(user) diff --git a/spec/features/merge_request/user_views_diffs_spec.rb b/spec/features/merge_request/user_views_diffs_spec.rb index 5a29477e597..313f438e23b 100644 --- a/spec/features/merge_request/user_views_diffs_spec.rb +++ b/spec/features/merge_request/user_views_diffs_spec.rb @@ -10,6 +10,7 @@ describe 'User views diffs', :js do before do stub_feature_flags(single_mr_diff_view: false) + stub_feature_flags(diffs_batch_load: false) visit(diffs_project_merge_request_path(project, merge_request)) wait_for_requests |