Открыть боковую панель
Захаров Дмитрий Сергеевич
Gitlab
Коммиты
c9f2d4b9
Коммит
c9f2d4b9
создал
Май 29, 2023
по автору
hmuralidhar
Просмотр файлов
Adding new selectors to change state to dismissed
владелец
5ee99888
Изменения
3
Скрыть пробелы
Построчно
Рядом
ee/app/assets/javascripts/security_dashboard/components/shared/vulnerability_report/selection_summary.vue
Просмотр файла @
c9f2d4b9
...
...
@@ -253,6 +253,7 @@ export default {
:items=
"dismissalReasonItems"
:toggle-text=
"dismissalReasonToggleText"
:disabled=
"isSubmitting"
data-qa-selector=
"dismissal_reason_listbox"
data-testid=
"dismissal-reason-listbox"
/>
...
...
@@ -261,6 +262,7 @@ export default {
v-model=
"comment"
:placeholder=
"commentPlaceholder"
:disabled=
"isSubmitting"
data-qa-selector=
"change_status_comment_textbox"
class=
"gl-flex-grow-1 gl-flex-basis-0 gl-min-w-20"
/>
...
...
qa/qa/ee/page/project/secure/security_dashboard.rb
Просмотр файла @
c9f2d4b9
...
...
@@ -18,6 +18,8 @@ class SecurityDashboard < QA::Page::Base
view
'ee/app/assets/javascripts/security_dashboard/components/shared/vulnerability_report/selection_summary.vue'
do
element
:vulnerability_card_status_dropdown
element
:change_status_button
element
:dismissal_reason_listbox
element
:change_status_comment_textbox
end
view
'ee/app/assets/javascripts/security_dashboard/components/shared/vulnerability_report/vulnerability_report_header.vue'
do
...
...
@@ -49,10 +51,24 @@ def select_single_vulnerability(vulnerability_name)
def
change_state
(
status
)
click_element
(
:vulnerability_card_status_dropdown
)
click_element
(
"item_status_
#{
status
.
downcase
}
"
)
find
(
change_status_item_selector
(
status
)).
click
select_dismissal_reason
(
"not_applicable"
)
fill_element
(
:change_status_comment_textbox
,
"Test"
)
click_element
(
:change_status_button
)
end
def
select_dismissal_reason
(
reason
)
find
(
dismissal_reason_item_selector
(
reason
)).
click
end
def
change_status_item_selector
(
status
)
"[data-testid='listbox-item-
#{
status
}
']"
end
def
dismissal_reason_item_selector
(
reason
)
"[data-testid='listbox-item-
#{
reason
}
']"
end
def
has_remediated_badge?
(
vulnerability_name
)
has_element?
(
:vulnerability_remediated_badge_content
,
activity_description:
vulnerability_name
)
end
...
...
qa/qa/specs/features/ee/browser_ui/10_govern/dismissed_vulnerabilities_in_security_widget.rb
Просмотр файла @
c9f2d4b9
...
...
@@ -22,9 +22,11 @@ module QA
let!
(
:artefact_files
)
do
files_to_add
=
[]
artefacts_directory
.
each_child
do
|
child
|
if
child
.
ftype
==
"file"
&&
child
.
basename
.
to_s
.
exclude?
(
".gitlab-ci.yml"
)
Runtime
::
Logger
.
info
(
"Grey:
#{
child
.
basename
}
"
)
files_to_add
.
push
({
file_path:
child
.
basename
,
content:
child
.
read
})
next
unless
child
.
ftype
==
"file"
unless
child
.
basename
.
to_s
.
include?
(
".gitlab-ci.yml"
)
files_to_add
.
push
({
file_path:
child
.
basename
,
content:
child
.
read
})
end
end
files_to_add
...
...
@@ -67,6 +69,11 @@ module QA
it
'checks that dismissed vulnerabilities do not show up in MR security widget'
,
testcase:
'https://gitlab.com/gitlab-org/gitlab/-/quality/test_cases/362599'
do
Page
::
Project
::
Menu
.
perform
(
&
:go_to_vulnerability_report
)
EE
::
Page
::
Project
::
Secure
::
SecurityDashboard
.
perform
do
|
security_dashboard
|
security_dashboard
.
select_all_vulnerabilities
security_dashboard
.
change_state
(
'Dismissed'
)
end
end
private
...
...
Редактирование
Предварительный просмотр
Поддерживает Markdown
0%
Попробовать снова
или
прикрепить новый файл
.
Отмена
You are about to add
0
people
to the discussion. Proceed with caution.
Сначала завершите редактирование этого сообщения!
Отмена
Пожалуйста,
зарегистрируйтесь
или
войдите
чтобы прокомментировать