diff options
| author | Nick Thomas <nick@gitlab.com> | 2019-01-25 16:43:24 +0000 |
|---|---|---|
| committer | Nick Thomas <nick@gitlab.com> | 2019-01-25 16:43:24 +0000 |
| commit | 40bfa51e303377dd856c024f6e543937d2038a6b (patch) | |
| tree | 1816410155b1d8c04f40d9e0e20400b4ddeb2a1e | |
| parent | 51441b97abdec1c37c96173b08c7b527f342b80f (diff) | |
| download | gitlab-ce-40bfa51e303377dd856c024f6e543937d2038a6b.tar.gz | |
Fix a JS race in a 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 |