1 files changed, 9 insertions, 1 deletions
diff --git a/qa/qa/specs/features/browser_ui/3_create/web_ide/server_hooks_custom_error_message_spec.rb b/qa/qa/specs/features/browser_ui/3_create/web_ide/server_hooks_custom_error_message_spec.rb
index 0972e4f3e3d..3cd14ecd799 100644
--- a/qa/qa/specs/features/browser_ui/3_create/web_ide/server_hooks_custom_error_message_spec.rb
+++ b/qa/qa/specs/features/browser_ui/3_create/web_ide/server_hooks_custom_error_message_spec.rb
@@ -1,7 +1,9 @@
 # frozen_string_literal: true
 
 module QA
-  RSpec.describe 'Create', :skip_live_env, except: { job: 'review-qa-*' }, product_group: :editor do
+  RSpec.describe 'Create', :skip_live_env, except: { job: 'review-qa-*' },
+                                           feature_flag: { name: 'vscode_web_ide', scope: :project },
+                                           product_group: :editor do
     describe 'Git Server Hooks' do
       let(:file_path) { File.absolute_path(File.join('qa', 'fixtures', 'web_ide', 'README.md')) }
 
@@ -14,15 +16,21 @@ module QA
       end
 
       before do
+        Runtime::Feature.disable(:vscode_web_ide, project: project)
         Flow::Login.sign_in
         project.visit!
       end
 
+      after do
+        Runtime::Feature.enable(:vscode_web_ide, project: project)
+      end
+
       context 'Custom error messages' do
         it 'renders preconfigured error message when user hook failed on commit in WebIDE',
            testcase: 'https://gitlab.com/gitlab-org/gitlab/-/quality/test_cases/364751' do
           Page::Project::Show.perform(&:open_web_ide_via_shortcut)
           Page::Project::WebIDE::Edit.perform do |ide|
+            ide.wait_until_ide_loads
             ide.upload_file(file_path)
             ide.commit_changes(wait_for_success: false)
             expect(ide).to have_text('Custom error message rejecting prereceive hook for projects with GL_PROJECT_PATH')