diff options
| author | Douglas Barbosa Alexandre <dbalexandre@gmail.com> | 2019-01-25 20:53:56 +0300 |
|---|---|---|
| committer | Yorick Peterse <yorickpeterse@gmail.com> | 2019-01-31 18:52:50 +0300 |
| commit | 5af2ea9564dec9b50860325f5705aac1d803682a (patch) | |
| tree | de767516966f2e6f686b762527579b1474ad0884 /spec/features/projects/settings/user_changes_default_branch_spec.rb | |
| parent | d4c7214799586a9b5063b0ea5b4327bbffe1170f (diff) | |
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
Diffstat (limited to 'spec/features/projects/settings/user_changes_default_branch_spec.rb')
| -rw-r--r-- | spec/features/projects/settings/user_changes_default_branch_spec.rb | 3 |
1 files changed, 3 insertions, 0 deletions
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 |