Add latest changes from gitlab-org/gitlab@15-8-stable-eev15.8.0-rc42

1 files changed, 1 insertions, 12 deletions

diff --git a/spec/controllers/import/phabricator_controller_spec.rb b/spec/controllers/import/phabricator_controller_spec.rb
index 9827a6d077c..9be85a40d82 100644
--- a/spec/controllers/import/phabricator_controller_spec.rb
+++ b/spec/controllers/import/phabricator_controller_spec.rb
@@ -14,25 +14,14 @@ RSpec.describe Import::PhabricatorController do
 
     context 'when the import source is not available' do
       before do
-        stub_feature_flags(phabricator_import: true)
         stub_application_setting(import_sources: [])
       end
 
       it { is_expected.to have_gitlab_http_status(:not_found) }
     end
 
-    context 'when the feature is disabled' do
+    context 'when the import source is available' do
       before do
-        stub_feature_flags(phabricator_import: false)
-        stub_application_setting(import_sources: ['phabricator'])
-      end
-
-      it { is_expected.to have_gitlab_http_status(:not_found) }
-    end
-
-    context 'when the import is available' do
-      before do
-        stub_feature_flags(phabricator_import: true)
         stub_application_setting(import_sources: ['phabricator'])
       end