diff options
Diffstat (limited to 'spec/features/merge_request/user_creates_mr_spec.rb')
-rw-r--r-- | spec/features/merge_request/user_creates_mr_spec.rb | 75 |
1 files changed, 16 insertions, 59 deletions
diff --git a/spec/features/merge_request/user_creates_mr_spec.rb b/spec/features/merge_request/user_creates_mr_spec.rb index f48315a1636..950b64bb395 100644 --- a/spec/features/merge_request/user_creates_mr_spec.rb +++ b/spec/features/merge_request/user_creates_mr_spec.rb @@ -89,77 +89,34 @@ RSpec.describe 'Merge request > User creates MR', feature_category: :code_review end end - context 'with the visible_label_selection_on_metadata feature flag enabled' do - before do - stub_feature_flags(visible_label_selection_on_metadata: true) - end - - context 'non-fork merge request' do - include_context 'merge request create context' - it_behaves_like 'a creatable merge request with visible selected labels' - end - - context 'from a forked project' do - let(:canonical_project) { create(:project, :public, :repository) } - - let(:source_project) do - fork_project(canonical_project, user, - repository: true, - namespace: user.namespace) - end - - context 'to canonical project' do - include_context 'merge request create context' - it_behaves_like 'a creatable merge request with visible selected labels' - end - - context 'to another forked project' do - let(:target_project) do - fork_project(canonical_project, user, - repository: true, - namespace: user.namespace) - end - - include_context 'merge request create context' - it_behaves_like 'a creatable merge request with visible selected labels' - end - end + context 'non-fork merge request' do + include_context 'merge request create context' + it_behaves_like 'a creatable merge request with visible selected labels' end - context 'with the visible_label_selection_on_metadata feature flag disabled' do - before do - stub_feature_flags(visible_label_selection_on_metadata: false) + context 'from a forked project' do + let(:canonical_project) { create(:project, :public, :repository) } + + let(:source_project) do + fork_project(canonical_project, user, + repository: true, + namespace: user.namespace) end - context 'non-fork merge request' do + context 'to canonical project' do include_context 'merge request create context' - it_behaves_like 'a creatable merge request' + it_behaves_like 'a creatable merge request with visible selected labels' end - context 'from a forked project' do - let(:canonical_project) { create(:project, :public, :repository) } - - let(:source_project) do + context 'to another forked project' do + let(:target_project) do fork_project(canonical_project, user, repository: true, namespace: user.namespace) end - context 'to canonical project' do - include_context 'merge request create context' - it_behaves_like 'a creatable merge request' - end - - context 'to another forked project' do - let(:target_project) do - fork_project(canonical_project, user, - repository: true, - namespace: user.namespace) - end - - include_context 'merge request create context' - it_behaves_like 'a creatable merge request' - end + include_context 'merge request create context' + it_behaves_like 'a creatable merge request with visible selected labels' end end |