diff options
| author | Douglas Barbosa Alexandre <dbalexandre@gmail.com> | 2019-01-25 20:53:56 +0300 |
|---|---|---|
| committer | Yorick Peterse <yorickpeterse@gmail.com> | 2019-01-28 17:29:04 +0300 |
| commit | 3c2ecc9237197d80d75e6cee7d178120ae9f3164 (patch) | |
| tree | 2b1c28fda399916e75c29ba1f0945a829b2c6965 /spec | |
| parent | 9a9889ec596fe9bd9e1f455961916b6ed29f8e8d (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
(cherry picked from commit b5e10cd3ac4e15e7421ebc9acc5d4f9ca9e8e3ea)
Diffstat (limited to 'spec')
| -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 |