Automatic merge of gitlab-org/gitlab-ce master

spec/features/projects/settings/user_changes_default_branch_spec.rb

@@ -15,9 +15,6 @@ describe 'Projects > Settings > User changes default branch' do
     let(:project) { create(:project, :repository, namespace: user.namespace) }
 
     it 'allows to change the default branch', :js do
-      # Otherwise, running JS may overwrite our change to project_default_branch
-      wait_for_requests
-
       select2('fix', from: '#project_default_branch')
 
       page.within '#default-branch-settings' do

spec/support/helpers/select2_helper.rb

@@ -11,9 +11,13 @@
 #
 
 module Select2Helper
+  include WaitForRequests
+
   def select2(value, options = {})
     raise ArgumentError, 'options must be a Hash' unless options.is_a?(Hash)
 
+    wait_for_requests unless options[:async]
+
     selector = options.fetch(:from)
 
     first(selector, visible: false)