diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-05-14 09:07:53 +0000 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-05-14 09:07:53 +0000 |
commit | c7ad2610df033b370845995ac3bbe269a191d9bb (patch) | |
tree | eb82256802229e6ea2ee3648e04dd4b8125e3927 /spec/features | |
parent | 1c4773ed84d97c9577c0aa396a948b176a3c761b (diff) | |
download | gitlab-ce-c7ad2610df033b370845995ac3bbe269a191d9bb.tar.gz |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'spec/features')
-rw-r--r-- | spec/features/issues/user_creates_branch_and_merge_request_spec.rb | 12 |
1 files changed, 1 insertions, 11 deletions
diff --git a/spec/features/issues/user_creates_branch_and_merge_request_spec.rb b/spec/features/issues/user_creates_branch_and_merge_request_spec.rb index 7eecfd1ccf4..848dbbb85a6 100644 --- a/spec/features/issues/user_creates_branch_and_merge_request_spec.rb +++ b/spec/features/issues/user_creates_branch_and_merge_request_spec.rb @@ -164,17 +164,7 @@ describe 'User creates branch and merge request on issue page', :js do context 'when issue is confidential' do let(:issue) { create(:issue, :confidential, project: project) } - it 'disables the create branch button' do - stub_feature_flags(create_confidential_merge_request: false) - - visit project_issue_path(project, issue) - - expect(page).not_to have_css('.create-mr-dropdown-wrap') - end - - it 'enables the create branch button when feature flag is enabled' do - stub_feature_flags(create_confidential_merge_request: true) - + it 'enables the create branch button' do visit project_issue_path(project, issue) expect(page).to have_css('.create-mr-dropdown-wrap') |