Commit 0bfa95de authored by Sanad Liaquat's avatar Sanad Liaquat

Merge branch 'unquarantine_vuln_mgmt_spec' into 'master'

Fix vulnerability_management_spec

See merge request gitlab-org/gitlab!37447
parents e0d17813 4405495a
...@@ -144,7 +144,7 @@ module QA ...@@ -144,7 +144,7 @@ module QA
expand_vulnerability_report expand_vulnerability_report
click_vulnerability(name) click_vulnerability(name)
click_element :dismiss_with_comment_button click_element :dismiss_with_comment_button
find_element(:dismiss_comment_field).fill_in with: reason find_element(:dismiss_comment_field).fill_in with: reason, fill_options: { automatic_label_click: true }
click_element :add_and_dismiss_button click_element :add_and_dismiss_button
wait_until(reload: false) do wait_until(reload: false) do
......
...@@ -3,7 +3,7 @@ ...@@ -3,7 +3,7 @@
require 'pathname' require 'pathname'
module QA module QA
RSpec.describe 'Secure', :docker, :runner, quarantine: { issue: 'https://gitlab.com/gitlab-org/gitlab/-/issues/219519', type: :investigating } do RSpec.describe 'Secure', :docker, :runner do
describe 'Security Reports in a Merge Request' do describe 'Security Reports in a Merge Request' do
let(:sast_vuln_count) { 5 } let(:sast_vuln_count) { 5 }
let(:dependency_scan_vuln_count) { 4 } let(:dependency_scan_vuln_count) { 4 }
...@@ -23,6 +23,8 @@ module QA ...@@ -23,6 +23,8 @@ module QA
@project = Resource::Project.fabricate_via_api! do |p| @project = Resource::Project.fabricate_via_api! do |p|
p.name = Runtime::Env.auto_devops_project_name || 'project-with-secure' p.name = Runtime::Env.auto_devops_project_name || 'project-with-secure'
p.description = 'Project with Secure' p.description = 'Project with Secure'
p.auto_devops_enabled = false
p.initialize_with_readme = true
end end
@runner = Resource::Runner.fabricate! do |runner| @runner = Resource::Runner.fabricate! do |runner|
...@@ -31,16 +33,14 @@ module QA ...@@ -31,16 +33,14 @@ module QA
runner.tags = %w[qa test] runner.tags = %w[qa test]
end end
commit_message = 'Add premade security reports' @source = Resource::Repository::ProjectPush.fabricate! do |push|
@commit = Resource::Repository::Commit.fabricate_via_api! do |commit| push.project = @project
commit.project = @project push.directory = Pathname
commit.commit_message = commit_message .new(__dir__)
commit.branch = 'secure-mr' .join('../../../../../ee/fixtures/secure_premade_reports')
commit.add_directory( push.commit_message = 'Create Secure compatible application to serve premade reports'
Pathname.new(__dir__).join('../../../../../ee/fixtures/secure_premade_reports') push.branch_name = 'secure-mr'
)
end end
@project.wait_for_push(commit_message)
@merge_request = Resource::MergeRequest.fabricate_via_api! do |mr| @merge_request = Resource::MergeRequest.fabricate_via_api! do |mr|
mr.project = @project mr.project = @project
......
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