Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
G
gitlab-ce
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
1
Merge Requests
1
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
nexedi
gitlab-ce
Commits
4b89bd7c
Commit
4b89bd7c
authored
Nov 10, 2020
by
Philip Cunningham
Committed by
Kushal Pandya
Nov 10, 2020
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Align dast site validation frontend with backend
Fix incorrect value and remove redundant prefix.
parent
7b3f3de2
Changes
3
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
6 additions
and
6 deletions
+6
-6
ee/app/assets/javascripts/security_configuration/dast_site_profiles_form/components/dast_site_validation.vue
...st_site_profiles_form/components/dast_site_validation.vue
+2
-2
ee/app/assets/javascripts/security_configuration/dast_site_profiles_form/constants.js
...curity_configuration/dast_site_profiles_form/constants.js
+1
-1
ee/spec/frontend/security_configuration/dast_site_profiles_form/components/dast_site_validation_spec.js
...ite_profiles_form/components/dast_site_validation_spec.js
+3
-3
No files found.
ee/app/assets/javascripts/security_configuration/dast_site_profiles_form/components/dast_site_validation.vue
View file @
4b89bd7c
...
@@ -146,7 +146,7 @@ export default {
...
@@ -146,7 +146,7 @@ export default {
return
DAST_SITE_VALIDATION_METHODS
[
this
.
validationMethod
].
i18n
.
locationStepLabel
;
return
DAST_SITE_VALIDATION_METHODS
[
this
.
validationMethod
].
i18n
.
locationStepLabel
;
},
},
httpHeader
()
{
httpHeader
()
{
return
`
${
DAST_SITE_VALIDATION_HTTP_HEADER_KEY
}
:
uuid-code-
${
this
.
token
}
`
;
return
`
${
DAST_SITE_VALIDATION_HTTP_HEADER_KEY
}
:
${
this
.
token
}
`
;
},
},
},
},
watch
:
{
watch
:
{
...
@@ -193,7 +193,7 @@ export default {
...
@@ -193,7 +193,7 @@ export default {
projectFullPath
:
this
.
fullPath
,
projectFullPath
:
this
.
fullPath
,
dastSiteTokenId
:
this
.
tokenId
,
dastSiteTokenId
:
this
.
tokenId
,
validationPath
:
this
.
validationPath
,
validationPath
:
this
.
validationPath
,
s
trategy
:
this
.
validationMethod
,
validationS
trategy
:
this
.
validationMethod
,
},
},
});
});
if
(
errors
?.
length
)
{
if
(
errors
?.
length
)
{
...
...
ee/app/assets/javascripts/security_configuration/dast_site_profiles_form/constants.js
View file @
4b89bd7c
import
{
s__
}
from
'
~/locale
'
;
import
{
s__
}
from
'
~/locale
'
;
export
const
DAST_SITE_VALIDATION_METHOD_TEXT_FILE
=
'
TEXT_FILE
'
;
export
const
DAST_SITE_VALIDATION_METHOD_TEXT_FILE
=
'
TEXT_FILE
'
;
export
const
DAST_SITE_VALIDATION_METHOD_HTTP_HEADER
=
'
H
TTP_H
EADER
'
;
export
const
DAST_SITE_VALIDATION_METHOD_HTTP_HEADER
=
'
HEADER
'
;
export
const
DAST_SITE_VALIDATION_METHODS
=
{
export
const
DAST_SITE_VALIDATION_METHODS
=
{
[
DAST_SITE_VALIDATION_METHOD_TEXT_FILE
]:
{
[
DAST_SITE_VALIDATION_METHOD_TEXT_FILE
]:
{
...
...
ee/spec/frontend/security_configuration/dast_site_profiles_form/components/dast_site_validation_spec.js
View file @
4b89bd7c
...
@@ -222,7 +222,7 @@ describe('DastSiteValidation', () => {
...
@@ -222,7 +222,7 @@ describe('DastSiteValidation', () => {
it
(
'
shows a code block containing the http-header key with the given token
'
,
()
=>
{
it
(
'
shows a code block containing the http-header key with the given token
'
,
()
=>
{
expect
(
expect
(
withinComponent
().
getByText
(
`Gitlab-On-Demand-DAST:
uuid-code-
${
token
}
`
,
{
withinComponent
().
getByText
(
`Gitlab-On-Demand-DAST:
${
token
}
`
,
{
selector
:
'
code
'
,
selector
:
'
code
'
,
}),
}),
).
not
.
toBe
(
null
);
).
not
.
toBe
(
null
);
...
@@ -233,7 +233,7 @@ describe('DastSiteValidation', () => {
...
@@ -233,7 +233,7 @@ describe('DastSiteValidation', () => {
expect
(
clipboardButton
.
exists
()).
toBe
(
true
);
expect
(
clipboardButton
.
exists
()).
toBe
(
true
);
expect
(
clipboardButton
.
props
()).
toMatchObject
({
expect
(
clipboardButton
.
props
()).
toMatchObject
({
text
:
`Gitlab-On-Demand-DAST:
uuid-code-
${
token
}
`
,
text
:
`Gitlab-On-Demand-DAST:
${
token
}
`
,
title
:
'
Copy HTTP header to clipboard
'
,
title
:
'
Copy HTTP header to clipboard
'
,
});
});
});
});
...
@@ -282,7 +282,7 @@ describe('DastSiteValidation', () => {
...
@@ -282,7 +282,7 @@ describe('DastSiteValidation', () => {
projectFullPath
:
fullPath
,
projectFullPath
:
fullPath
,
dastSiteTokenId
:
tokenId
,
dastSiteTokenId
:
tokenId
,
validationPath
:
wrapper
.
vm
.
validationPath
,
validationPath
:
wrapper
.
vm
.
validationPath
,
s
trategy
:
wrapper
.
vm
.
validationMethod
,
validationS
trategy
:
wrapper
.
vm
.
validationMethod
,
});
});
});
});
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment