Skip to content
代码片段 群组 项目
提交 a302eeb6 编辑于 作者: Harsha Muralidhar's avatar Harsha Muralidhar 提交者: Tiffany Rea
浏览文件

Added additional expectation for dismissed findings in MR

上级 8ee50712
No related branches found
No related tags found
无相关合并请求
......@@ -112,7 +112,7 @@ export default {
<template>
<div>
<gl-button :disabled="disabled" @click="$emit('cancel')">
<gl-button data-qa-selector="cancel_button" :disabled="disabled" @click="$emit('cancel')">
{{ __('Cancel') }}
</gl-button>
......
......@@ -57,6 +57,7 @@ def self.prepended(base)
view 'ee/app/assets/javascripts/vue_shared/security_reports/components/modal_footer.vue' do
element :resolve_split_button
element :create_issue_button
element :cancel_button
end
view 'ee/app/assets/javascripts/vue_shared/security_reports/components/dismiss_button.vue' do
......@@ -165,6 +166,10 @@ def create_vulnerability_issue(name)
end
end
def cancel_vulnerability_modal
click_element(:cancel_button)
end
def has_vulnerability_report?(timeout: 60)
wait_until(reload: true, max_duration: timeout, sleep_interval: 1) do
has_element?(:vulnerability_report_grouped, wait: 10)
......
......@@ -68,7 +68,32 @@ module QA
merge_request.click_vulnerability(vuln_name)
expect(merge_request).to have_opened_dismissed_vulnerability(dismiss_reason)
merge_request.cancel_vulnerability_modal
end
merge_request.merge_via_api!
expect { project.pipelines.size }.to eventually_eq(2).within(max_duration: 60),
"There are currently #{project.pipelines.size} pipelines in the project instead of 2"
Support::Waiter.wait_until(sleep_interval: 3) do
latest_pipeline_status == 'success'
end
Page::Project::Menu.perform(&:click_on_vulnerability_report)
EE::Page::Project::Secure::Show.perform do |security_dashboard|
security_dashboard.filter_by_status(['dismissed'])
expect(security_dashboard).to have_status('dismissed', vuln_name)
end
end
def latest_pipeline_status
Resource::Pipeline.fabricate_via_api! do |pipeline|
pipeline.project = project
pipeline.id = project.pipelines.first[:id]
end.status
end
it 'can create an issue from a vulnerability', testcase: 'https://gitlab.com/gitlab-org/gitlab/-/quality/test_cases/348007' do
......
0% 加载中 .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册