Commit 37a4add4 authored by David O'Regan's avatar David O'Regan

Merge branch 'djadmin-scanner-profile-defaults' into 'master'

Add defaults for DAST Scanner Profile timeout fields

See merge request gitlab-org/gitlab!59999
parents b2e96410 80b5897c
...@@ -60,8 +60,8 @@ export default { ...@@ -60,8 +60,8 @@ export default {
data() { data() {
const { const {
profileName = '', profileName = '',
spiderTimeout = '', spiderTimeout = 1,
targetTimeout = '', targetTimeout = 60,
scanType = SCAN_TYPE.PASSIVE, scanType = SCAN_TYPE.PASSIVE,
useAjaxSpider = false, useAjaxSpider = false,
showDebugMessages = false, showDebugMessages = false,
......
---
title: Add defaults for DAST Scanner Profile timeout fields
merge_request: 59999
author:
type: changed
...@@ -167,6 +167,8 @@ describe('DAST Scanner Profile', () => { ...@@ -167,6 +167,8 @@ describe('DAST Scanner Profile', () => {
it('populates the fields with the data passed in via the profile prop or default values', () => { it('populates the fields with the data passed in via the profile prop or default values', () => {
expect(findProfileNameInput().element.value).toBe(profile?.profileName ?? ''); expect(findProfileNameInput().element.value).toBe(profile?.profileName ?? '');
expect(findScanType().vm.$attrs.checked).toBe(profile?.scanType ?? SCAN_TYPE.PASSIVE); expect(findScanType().vm.$attrs.checked).toBe(profile?.scanType ?? SCAN_TYPE.PASSIVE);
expect(findSpiderTimeoutInput().props('value')).toBe(profile?.spiderTimeout ?? 1);
expect(findTargetTimeoutInput().props('value')).toBe(profile?.targetTimeout ?? 60);
}); });
describe('submission', () => { describe('submission', () => {
......
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