diff options
Diffstat (limited to 'qa/qa/specs/features/browser_ui/2_plan')
5 files changed, 6 insertions, 21 deletions
diff --git a/qa/qa/specs/features/browser_ui/2_plan/email/trigger_email_notification_spec.rb b/qa/qa/specs/features/browser_ui/2_plan/email/trigger_email_notification_spec.rb index 4350b8f0d3e..0d706aef6ab 100644 --- a/qa/qa/specs/features/browser_ui/2_plan/email/trigger_email_notification_spec.rb +++ b/qa/qa/specs/features/browser_ui/2_plan/email/trigger_email_notification_spec.rb @@ -1,7 +1,7 @@ # frozen_string_literal: true module QA - RSpec.describe 'Plan', :orchestrated, :smtp, :requires_admin do + RSpec.describe 'Plan', :orchestrated, :smtp do describe 'Email Notification' do include Support::API @@ -16,7 +16,6 @@ module QA end before do - Runtime::Feature.enable(:invite_members_group_modal) Flow::Login.sign_in end diff --git a/qa/qa/specs/features/browser_ui/2_plan/issue/check_mentions_for_xss_spec.rb b/qa/qa/specs/features/browser_ui/2_plan/issue/check_mentions_for_xss_spec.rb index c2b42de6701..1ba110a9602 100644 --- a/qa/qa/specs/features/browser_ui/2_plan/issue/check_mentions_for_xss_spec.rb +++ b/qa/qa/specs/features/browser_ui/2_plan/issue/check_mentions_for_xss_spec.rb @@ -4,7 +4,7 @@ module QA RSpec.describe 'Plan', :reliable do let!(:user) do Resource::User.fabricate_via_api! do |user| - user.name = "eve <img src=x onerror=alert(2)<img src=x onerror=alert(1)>" + user.name = "QA User <img src=x onerror=alert(2)<img src=x onerror=alert(1)>" user.password = "test1234" user.api_client = Runtime::API::Client.as_admin end @@ -18,8 +18,6 @@ module QA describe 'check xss occurence in @mentions in issues', :requires_admin do before do - Runtime::Feature.enable(:invite_members_group_modal) - Flow::Login.sign_in project.add_member(user) diff --git a/qa/qa/specs/features/browser_ui/2_plan/issue/mentions_spec.rb b/qa/qa/specs/features/browser_ui/2_plan/issue/mentions_spec.rb index 7d6718073f9..e7025920def 100644 --- a/qa/qa/specs/features/browser_ui/2_plan/issue/mentions_spec.rb +++ b/qa/qa/specs/features/browser_ui/2_plan/issue/mentions_spec.rb @@ -1,8 +1,7 @@ # frozen_string_literal: true module QA - # TODO: Remove :requires_admin meta when the `Runtime::Feature.enable` method call is removed - RSpec.describe 'Plan', :smoke, :reliable, :requires_admin do + RSpec.describe 'Plan', :smoke, :reliable do describe 'mention' do let(:user) { Resource::User.fabricate_or_use(Runtime::Env.gitlab_qa_username_1, Runtime::Env.gitlab_qa_password_1) } let(:project) do @@ -14,7 +13,6 @@ module QA before do Flow::Login.sign_in - Runtime::Feature.enable(:invite_members_group_modal, project: project) project.add_member(user) diff --git a/qa/qa/specs/features/browser_ui/2_plan/issue/real_time_assignee_spec.rb b/qa/qa/specs/features/browser_ui/2_plan/issue/real_time_assignee_spec.rb index 45d466903de..ac0f16b50cc 100644 --- a/qa/qa/specs/features/browser_ui/2_plan/issue/real_time_assignee_spec.rb +++ b/qa/qa/specs/features/browser_ui/2_plan/issue/real_time_assignee_spec.rb @@ -1,7 +1,7 @@ # frozen_string_literal: true module QA - RSpec.describe 'Plan', :requires_admin, :actioncable, :orchestrated do + RSpec.describe 'Plan', :requires_admin, :actioncable, :orchestrated, quarantine: { issue: 'https://gitlab.com/gitlab-org/gitlab/-/issues/293699', type: :bug } do describe 'Assignees' do let(:user1) { Resource::User.fabricate_or_use(Runtime::Env.gitlab_qa_username_1, Runtime::Env.gitlab_qa_password_1) } let(:user2) { Resource::User.fabricate_or_use(Runtime::Env.gitlab_qa_username_2, Runtime::Env.gitlab_qa_password_2) } @@ -12,22 +12,12 @@ module QA end before do - Runtime::Feature.enable('real_time_issue_sidebar', project: project) - Runtime::Feature.enable('broadcast_issue_updates', project: project) - Runtime::Feature.enable(:invite_members_group_modal, project: project) - Flow::Login.sign_in project.add_member(user1) project.add_member(user2) end - after do - Runtime::Feature.disable('real_time_issue_sidebar', project: project) - Runtime::Feature.disable('broadcast_issue_updates', project: project) - Runtime::Feature.disable(:invite_members_group_modal, project: project) - end - it 'update without refresh', testcase: 'https://gitlab.com/gitlab-org/gitlab/-/quality/test_cases/347941' do issue = Resource::Issue.fabricate_via_api! do |issue| issue.project = project diff --git a/qa/qa/specs/features/browser_ui/2_plan/milestone/assign_milestone_spec.rb b/qa/qa/specs/features/browser_ui/2_plan/milestone/assign_milestone_spec.rb index d3662884952..d6eab3c8dd0 100644 --- a/qa/qa/specs/features/browser_ui/2_plan/milestone/assign_milestone_spec.rb +++ b/qa/qa/specs/features/browser_ui/2_plan/milestone/assign_milestone_spec.rb @@ -10,13 +10,13 @@ module QA let(:group) do Resource::Group.fabricate_via_api! do |group| - group.name = 'group-to-test-milestones' + group.name = "group-to-test-milestones-#{SecureRandom.hex(4)}" end end let(:project) do Resource::Project.fabricate_via_api! do |project| - project.name = 'project-to-test-milestones' + project.name = "project-to-test-milestones-#{SecureRandom.hex(4)}" project.group = group end end |