Commit bf2fe35e authored by Douglas Barbosa Alexandre's avatar Douglas Barbosa Alexandre

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
parents c73bf13d 40bfa51e
...@@ -15,6 +15,9 @@ describe 'Projects > Settings > User changes default branch' do ...@@ -15,6 +15,9 @@ describe 'Projects > Settings > User changes default branch' do
let(:project) { create(:project, :repository, namespace: user.namespace) } let(:project) { create(:project, :repository, namespace: user.namespace) }
it 'allows to change the default branch', :js do 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') select2('fix', from: '#project_default_branch')
page.within '#default-branch-settings' do page.within '#default-branch-settings' do
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment