From 422ad5d124be08f23be3929b0fd1952a42a15e3a Mon Sep 17 00:00:00 2001 From: Douglas Barbosa Alexandre Date: Fri, 25 Jan 2019 17:53:56 +0000 Subject: Merge branch '56860-fix-spec-race-condition-upside-the-head' into 'master' Fix a JS race in a spec Closes #56860 See merge request gitlab-org/gitlab-ce!24684 (cherry picked from commit b5e10cd3ac4e15e7421ebc9acc5d4f9ca9e8e3ea) --- spec/features/projects/settings/user_changes_default_branch_spec.rb | 3 +++ 1 file changed, 3 insertions(+) diff --git a/spec/features/projects/settings/user_changes_default_branch_spec.rb b/spec/features/projects/settings/user_changes_default_branch_spec.rb index fcf05e04a5c..7dc18601f50 100644 --- a/spec/features/projects/settings/user_changes_default_branch_spec.rb +++ b/spec/features/projects/settings/user_changes_default_branch_spec.rb @@ -15,6 +15,9 @@ 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 -- cgit v1.2.1