Commit bf5f38c1 authored by Mark Lapierre's avatar Mark Lapierre

Merge branch 'qa-shl-quarantine-on-main-instead-of-master' into 'master'

Update quarantine branch to main

See merge request gitlab-org/gitlab!62910
parents 0907686e eff9f3c2
......@@ -20,7 +20,7 @@ module QA
end
end
it 'shows results for the original request and AJAX requests', testcase: 'https://gitlab.com/gitlab-org/quality/testcases/-/issues/478', quarantine: { only: { pipeline: :master }, issue: 'https://gitlab.com/gitlab-org/gitlab/-/issues/323051', type: :bug } do
it 'shows results for the original request and AJAX requests', testcase: 'https://gitlab.com/gitlab-org/quality/testcases/-/issues/478', quarantine: { only: { pipeline: :main }, issue: 'https://gitlab.com/gitlab-org/gitlab/-/issues/323051', type: :bug } do
# Issue pages always make AJAX requests
Resource::Issue.fabricate_via_browser_ui! do |issue|
issue.title = 'Performance bar test'
......
......@@ -63,7 +63,7 @@ module QA
@runner&.remove_via_api! if @runner
end
it 'displays security reports in the pipeline', testcase: 'https://gitlab.com/gitlab-org/quality/testcases/-/issues/1777', quarantine: { only: { pipeline: [:master, :nightly] }, issue: 'https://gitlab.com/gitlab-org/gitlab/-/issues/325612', type: :bug } do
it 'displays security reports in the pipeline', testcase: 'https://gitlab.com/gitlab-org/quality/testcases/-/issues/1777', quarantine: { only: { pipeline: [:main, :nightly] }, issue: 'https://gitlab.com/gitlab-org/gitlab/-/issues/325612', type: :bug } do
Flow::Pipeline.visit_latest_pipeline
Page::Project::Pipeline::Show.perform do |pipeline|
pipeline.click_on_security
......@@ -143,7 +143,7 @@ module QA
end
end
it 'displays the Dependency List', testcase: 'https://gitlab.com/gitlab-org/quality/testcases/-/issues/564', quarantine: { only: { pipeline: [:master, :nightly] }, issue: 'https://gitlab.com/gitlab-org/gitlab/-/issues/328059', type: :bug } do
it 'displays the Dependency List', testcase: 'https://gitlab.com/gitlab-org/quality/testcases/-/issues/564', quarantine: { only: { pipeline: [:main, :nightly] }, issue: 'https://gitlab.com/gitlab-org/gitlab/-/issues/328059', type: :bug } do
Page::Project::Menu.perform(&:click_on_dependency_list)
EE::Page::Project::Secure::DependencyList.perform do |dependency_list|
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment