1 files changed, 14 insertions, 51 deletions
diff --git a/spec/views/projects/merge_requests/edit.html.haml_spec.rb b/spec/views/projects/merge_requests/edit.html.haml_spec.rb
index bb8a4455775..5affe2dd9b4 100644
--- a/spec/views/projects/merge_requests/edit.html.haml_spec.rb
+++ b/spec/views/projects/merge_requests/edit.html.haml_spec.rb
@@ -46,65 +46,28 @@ RSpec.describe 'projects/merge_requests/edit.html.haml' do
     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 'when a merge request without fork' do
-      it_behaves_like 'merge request shows editable fields'
-
-      it "shows editable fields" do
-        unlink_project.execute
-        closed_merge_request.reload
-
-        render
+  context 'when a merge request without fork' do
+    it_behaves_like 'merge request shows editable fields'
 
-        expect(rendered).not_to have_selector('#merge_request_target_branch', visible: false)
-        expect(rendered).to have_selector('.js-issuable-form-label-selector')
-      end
-    end
-
-    context 'when a merge request with an existing source project is closed' do
-      it_behaves_like 'merge request shows editable fields'
+    it "shows editable fields" do
+      unlink_project.execute
+      closed_merge_request.reload
 
-      it "shows editable fields" do
-        render
+      render
 
-        expect(rendered).to have_selector('#merge_request_target_branch', visible: false)
-        expect(rendered).to have_selector('.js-issuable-form-label-selector')
-      end
+      expect(rendered).not_to have_selector('#merge_request_target_branch', visible: false)
+      expect(rendered).to have_selector('.js-issuable-form-label-selector')
     end
   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 'when a merge request without fork' do
-      it_behaves_like 'merge request shows editable fields'
-
-      it "shows editable fields" do
-        unlink_project.execute
-        closed_merge_request.reload
-
-        render
-
-        expect(rendered).not_to have_selector('#merge_request_target_branch', visible: false)
-        expect(rendered).not_to have_selector('.js-issuable-form-label-selector')
-      end
-    end
-
-    context 'when a merge request with an existing source project is closed' do
-      it_behaves_like 'merge request shows editable fields'
+  context 'when a merge request with an existing source project is closed' do
+    it_behaves_like 'merge request shows editable fields'
 
-      it "shows editable fields" do
-        render
+    it "shows editable fields" do
+      render
 
-        expect(rendered).to have_selector('#merge_request_target_branch', visible: false)
-        expect(rendered).not_to have_selector('.js-issuable-form-label-selector')
-      end
+      expect(rendered).to have_selector('#merge_request_target_branch', visible: false)
+      expect(rendered).to have_selector('.js-issuable-form-label-selector')
     end
   end
 end