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
This commit is contained in:
Douglas Barbosa Alexandre 2019-01-25 17:53:56 +00:00 committed by Yorick Peterse
parent d4c7214799
commit 5af2ea9564
No known key found for this signature in database
GPG Key ID: EDD30D2BEB691AC9
1 changed files with 3 additions and 0 deletions

View File

@ -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