Commit 4b505405 authored by Dan Davison's avatar Dan Davison

Merge branch 'ml-qa-fix-secure-test' into 'master'

Fix security reports test and update pipeline test

Closes #33993

See merge request gitlab-org/gitlab!18503
parents 965fd391 44047113
...@@ -5,10 +5,6 @@ module QA::EE::Page ...@@ -5,10 +5,6 @@ module QA::EE::Page
module Show module Show
def self.prepended(page) def self.prepended(page)
page.module_eval do page.module_eval do
view 'ee/app/assets/javascripts/pipelines/components/graph/linked_pipeline.vue' do
element :linked_pipeline_button
end
view 'ee/app/assets/javascripts/security_dashboard/components/filter.vue' do view 'ee/app/assets/javascripts/security_dashboard/components/filter.vue' do
element :filter_dropdown, ':data-qa-selector="qaSelector"' # rubocop:disable QA/ElementWithPattern element :filter_dropdown, ':data-qa-selector="qaSelector"' # rubocop:disable QA/ElementWithPattern
element :filter_dropdown_content element :filter_dropdown_content
......
...@@ -18,6 +18,10 @@ module QA::Page ...@@ -18,6 +18,10 @@ module QA::Page
element :job_link element :job_link
end end
view 'app/assets/javascripts/pipelines/components/graph/linked_pipeline.vue' do
element :linked_pipeline_button
end
view 'app/assets/javascripts/vue_shared/components/ci_icon.vue' do view 'app/assets/javascripts/vue_shared/components/ci_icon.vue' do
element :status_icon, 'ci-status-icon-${status}' # rubocop:disable QA/ElementWithPattern element :status_icon, 'ci-status-icon-${status}' # rubocop:disable QA/ElementWithPattern
end end
...@@ -74,3 +78,5 @@ module QA::Page ...@@ -74,3 +78,5 @@ module QA::Page
end end
end end
end end
QA::Page::Project::Pipeline::Show.prepend_if_ee('QA::EE::Page::Project::Pipeline::Show')
...@@ -74,7 +74,7 @@ module QA ...@@ -74,7 +74,7 @@ module QA
it 'creates a multi-project pipeline' do it 'creates a multi-project pipeline' do
Page::MergeRequest::Show.perform do |show| Page::MergeRequest::Show.perform do |show|
pipeline_passed = Support::Retrier.retry_until do pipeline_passed = show.retry_until(reload: true) do
show.has_content?(/Pipeline #\d+ passed/) show.has_content?(/Pipeline #\d+ passed/)
end end
......
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