Skip to content

G
gitlab-ce
Commit d1133061 authored by GitLab Bot's avatar GitLab Bot
Browse files
Options

Automatic merge of gitlab-org/gitlab-ce master

parents b588b6a3 bf2fe35e
Show whitespace changes
Inline Side-by-side
Showing with 3 additions and 0 deletions
spec/features/projects/settings/user_changes_default_branch_spec.rb
View file @ d1133061
...@@ -15,6 +15,9 @@ describe 'Projects > Settings > User changes default branch' do ...@@ -15,6 +15,9 @@ describe 'Projects > Settings > User changes default branch' do
let(:project) { create(:project, :repository, namespace: user.namespace) } let(:project) { create(:project, :repository, namespace: user.namespace) }
it 'allows to change the default branch', :js do 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') select2('fix', from: '#project_default_branch')
page.within '#default-branch-settings' do page.within '#default-branch-settings' do
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7