Add latest changes from gitlab-org/gitlab@master

4 files changed, 10 insertions, 2 deletions

diff --git a/spec/features/expand_collapse_diffs_spec.rb b/spec/features/expand_collapse_diffs_spec.rb
index e705f2916da..49343cc7a57 100644
--- a/spec/features/expand_collapse_diffs_spec.rb
+++ b/spec/features/expand_collapse_diffs_spec.rb
@@ -7,6 +7,7 @@ RSpec.describe 'Expand and collapse diffs', :js do
   let(:project) { create(:project, :repository) }
 
   before do
+    stub_feature_flags(increased_diff_limits: false)
     sign_in(create(:admin))
 
     # Ensure that undiffable.md is in .gitattributes
diff --git a/spec/features/merge_request/user_expands_diff_spec.rb b/spec/features/merge_request/user_expands_diff_spec.rb
index 0e39cce13a1..a857e6b0ddb 100644
--- a/spec/features/merge_request/user_expands_diff_spec.rb
+++ b/spec/features/merge_request/user_expands_diff_spec.rb
@@ -7,6 +7,7 @@ RSpec.describe 'User expands diff', :js do
   let(:merge_request) { create(:merge_request, source_branch: 'expand-collapse-files', source_project: project, target_project: project) }
 
   before do
+    stub_feature_flags(increased_diff_limits: false)
     visit(diffs_project_merge_request_path(project, merge_request))
 
     wait_for_requests
diff --git a/spec/features/merge_request/user_suggests_changes_on_diff_spec.rb b/spec/features/merge_request/user_suggests_changes_on_diff_spec.rb
index 39495832547..fe3307c0ceb 100644
--- a/spec/features/merge_request/user_suggests_changes_on_diff_spec.rb
+++ b/spec/features/merge_request/user_suggests_changes_on_diff_spec.rb
@@ -130,7 +130,9 @@ RSpec.describe 'User comments on a diff', :js do
             wait_for_requests
           end
         end
+      end
 
+      files.each_with_index do |file, index|
         page.within("[id='#{file[:hash]}']") do
           expect(page).not_to have_content('Applied')
 
diff --git a/spec/features/projects/show/user_manages_notifications_spec.rb b/spec/features/projects/show/user_manages_notifications_spec.rb
index 9d9a75c22be..d444ea27d35 100644
--- a/spec/features/projects/show/user_manages_notifications_spec.rb
+++ b/spec/features/projects/show/user_manages_notifications_spec.rb
@@ -18,7 +18,9 @@ RSpec.describe 'Projects > Show > User manages notifications', :js do
     click_notifications_button
     click_link 'On mention'
 
-    wait_for_requests
+    page.within('.notification-dropdown') do
+      expect(page).not_to have_css('.gl-spinner')
+    end
 
     click_notifications_button
     expect(find('.update-notification.is-active')).to have_content('On mention')
@@ -30,7 +32,9 @@ RSpec.describe 'Projects > Show > User manages notifications', :js do
     click_notifications_button
     click_link 'Disabled'
 
-    wait_for_requests
+    page.within('.notification-dropdown') do
+      expect(page).not_to have_css('.gl-spinner')
+    end
 
     expect(page).to have_css('.notifications-icon[data-testid="notifications-off-icon"]')
   end