Commit e04a76b2 authored by Stan Hu's avatar Stan Hu

Merge branch 'philipcunningham-update-dast-profile-ivar' into 'master'

Extend dast profile instance variable with branch

See merge request gitlab-org/gitlab!56433
parents 195d5f87 9c59a1e8
...@@ -31,6 +31,7 @@ module Projects ...@@ -31,6 +31,7 @@ module Projects
id: dast_profile.to_global_id.to_s, id: dast_profile.to_global_id.to_s,
name: dast_profile.name, name: dast_profile.name,
description: dast_profile.description, description: dast_profile.description,
branch: { name: dast_profile.branch_name },
site_profile_id: DastSiteProfile.new(id: dast_profile.dast_site_profile_id).to_global_id.to_s, site_profile_id: DastSiteProfile.new(id: dast_profile.dast_site_profile_id).to_global_id.to_s,
scanner_profile_id: DastScannerProfile.new(id: dast_profile.dast_scanner_profile_id).to_global_id.to_s scanner_profile_id: DastScannerProfile.new(id: dast_profile.dast_scanner_profile_id).to_global_id.to_s
} }
......
...@@ -107,6 +107,7 @@ RSpec.describe Projects::OnDemandScansController, type: :request do ...@@ -107,6 +107,7 @@ RSpec.describe Projects::OnDemandScansController, type: :request do
id: global_id_of(dast_profile), id: global_id_of(dast_profile),
name: dast_profile.name, name: dast_profile.name,
description: dast_profile.description, description: dast_profile.description,
branch: { name: dast_profile.branch_name },
site_profile_id: global_id_of(DastSiteProfile.new(id: dast_profile.dast_site_profile_id)), site_profile_id: global_id_of(DastSiteProfile.new(id: dast_profile.dast_site_profile_id)),
scanner_profile_id: global_id_of(DastScannerProfile.new(id: dast_profile.dast_scanner_profile_id)) scanner_profile_id: global_id_of(DastScannerProfile.new(id: dast_profile.dast_scanner_profile_id))
}.to_json }.to_json
......
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