1 files changed, 19 insertions, 8 deletions

diff --git a/qa/qa/specs/features/browser_ui/2_plan/issue/create_issue_spec.rb b/qa/qa/specs/features/browser_ui/2_plan/issue/create_issue_spec.rb
index 81ae8b82ef6..eb4eb1d3e71 100644
--- a/qa/qa/specs/features/browser_ui/2_plan/issue/create_issue_spec.rb
+++ b/qa/qa/specs/features/browser_ui/2_plan/issue/create_issue_spec.rb
@@ -1,25 +1,32 @@
 # frozen_string_literal: true
 
 module QA
-  RSpec.describe 'Plan', :smoke do
+  # TODO: Remove :requires_admin when the `Runtime::Feature.enable` method call is removed
+  RSpec.describe 'Plan', :smoke, :requires_admin do
     describe 'Issue creation' do
-      let(:closed_issue) { Resource::Issue.fabricate_via_api! }
+      let(:project) { Resource::Project.fabricate_via_api! }
+      let(:closed_issue) { Resource::Issue.fabricate_via_api! { |issue| issue.project = project } }
 
       before do
+        Runtime::Feature.enable(:vue_issues_list, group: project.group)
+
         Flow::Login.sign_in
       end
 
-      it 'creates an issue', :mobile, testcase: 'https://gitlab.com/gitlab-org/quality/testcases/-/quality/test_cases/1185' do
-        issue = Resource::Issue.fabricate_via_browser_ui!
+      it 'creates an issue', :mobile, testcase: 'https://gitlab.com/gitlab-org/gitlab/-/quality/test_cases/347989' do
+        issue = Resource::Issue.fabricate_via_browser_ui! { |issue| issue.project = project }
 
         Page::Project::Menu.perform(&:click_issues)
 
+        # TODO: Remove this method when the `Runtime::Feature.enable` method call is removed
+        Page::Project::Issue::Index.perform(&:wait_for_vue_issues_list_ff)
+
         Page::Project::Issue::Index.perform do |index|
           expect(index).to have_issue(issue)
         end
       end
 
-      it 'closes an issue', :mobile, testcase: 'https://gitlab.com/gitlab-org/quality/testcases/-/quality/test_cases/1222' do
+      it 'closes an issue', :mobile, testcase: 'https://gitlab.com/gitlab-org/gitlab/-/quality/test_cases/347967' do
         closed_issue.visit!
 
         Page::Project::Issue::Show.perform do |issue_page|
@@ -29,10 +36,14 @@ module QA
         end
 
         Page::Project::Menu.perform(&:click_issues)
+
+        # TODO: Remove this method when the `Runtime::Feature.enable` method call is removed
+        Page::Project::Issue::Index.perform(&:wait_for_vue_issues_list_ff)
+
         Page::Project::Issue::Index.perform do |index|
           expect(index).not_to have_issue(closed_issue)
 
-          index.click_closed_issues_link
+          index.click_closed_issues_tab
 
           expect(index).to have_issue(closed_issue)
         end
@@ -45,13 +56,13 @@ module QA
         end
 
         before do
-          Resource::Issue.fabricate_via_api!.visit!
+          Resource::Issue.fabricate_via_api! { |issue| issue.project = project }.visit!
         end
 
         # The following example is excluded from running in `review-qa-smoke` job
         # as it proved to be flaky when running against Review App
         # See https://gitlab.com/gitlab-com/www-gitlab-com/-/issues/11568#note_621999351
-        it 'comments on an issue with an attachment', testcase: 'https://gitlab.com/gitlab-org/quality/testcases/-/quality/test_cases/1599', except: { job: 'review-qa-smoke' } do
+        it 'comments on an issue with an attachment', testcase: 'https://gitlab.com/gitlab-org/gitlab/-/quality/test_cases/347946', except: { job: 'review-qa-smoke' } do
           Page::Project::Issue::Show.perform do |show|
             show.comment('See attached image for scale', attachment: file_to_attach)