diff options
| author | Douglas Barbosa Alexandre <dbalexandre@gmail.com> | 2019-01-25 17:53:56 +0000 |
|---|---|---|
| committer | Yorick Peterse <yorickpeterse@gmail.com> | 2019-01-28 15:28:21 +0100 |
| commit | b5e10cd3ac4e15e7421ebc9acc5d4f9ca9e8e3ea (patch) | |
| tree | 1b9f5e2a5bb0e72e0c7d103e74bea2b1cc506305 | |
| parent | cfd9f688e7051c125a71136baaf84ef6352c76a7 (diff) | |
| download | gitlab-ce-b5e10cd3ac4e15e7421ebc9acc5d4f9ca9e8e3ea.tar.gz | |
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
| -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 |