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 14:29:19 +0000 |
| commit | 9612f505e87d5435a027786323398568250a0bec (patch) | |
| tree | 9ad4693f2d60060b507bad890c8ead2c5cd8e3ba | |
| parent | 361949abacbfbefe18ee625e502f37f4dd20d02b (diff) | |
| download | gitlab-ce-9612f505e87d5435a027786323398568250a0bec.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
(cherry picked from commit b5e10cd3ac4e15e7421ebc9acc5d4f9ca9e8e3ea)
| -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 |