diff options
Diffstat (limited to 'spec/features/merge_request/user_edits_mr_spec.rb')
-rw-r--r-- | spec/features/merge_request/user_edits_mr_spec.rb | 38 |
1 files changed, 7 insertions, 31 deletions
diff --git a/spec/features/merge_request/user_edits_mr_spec.rb b/spec/features/merge_request/user_edits_mr_spec.rb index bf237e07ac8..fca3a76949a 100644 --- a/spec/features/merge_request/user_edits_mr_spec.rb +++ b/spec/features/merge_request/user_edits_mr_spec.rb @@ -198,39 +198,15 @@ RSpec.describe 'Merge request > User edits MR', feature_category: :code_review_w stub_licensed_features(multiple_merge_request_assignees: false) 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 edit context' - it_behaves_like 'an editable merge request with visible selected labels' - end - - context 'for a forked project' do - let(:source_project) { fork_project(target_project, nil, repository: true) } - - include_context 'merge request edit context' - it_behaves_like 'an editable merge request with visible selected labels' - end + context 'non-fork merge request' do + include_context 'merge request edit context' + it_behaves_like 'an editable 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) - end - - context 'non-fork merge request' do - include_context 'merge request edit context' - it_behaves_like 'an editable merge request' - end + context 'for a forked project' do + let(:source_project) { fork_project(target_project, nil, repository: true) } - context 'for a forked project' do - let(:source_project) { fork_project(target_project, nil, repository: true) } - - include_context 'merge request edit context' - it_behaves_like 'an editable merge request' - end + include_context 'merge request edit context' + it_behaves_like 'an editable merge request with visible selected labels' end end |