Skip to content
代码片段 群组 项目
未验证 提交 a0556e9b 编辑于 作者: Harsha Muralidhar's avatar Harsha Muralidhar 提交者: GitLab
浏览文件

Fix dismissal reason modal based on FF

上级 4625c72b
No related branches found
No related tags found
无相关合并请求
...@@ -59,6 +59,7 @@ export default { ...@@ -59,6 +59,7 @@ export default {
</template> </template>
<gl-collapsible-listbox <gl-collapsible-listbox
id="dismissal-reason" id="dismissal-reason"
data-testid="dismissal-reason"
:items="$options.items" :items="$options.items"
:selected="value" :selected="value"
:toggle-text="toggleText" :toggle-text="toggleText"
......
...@@ -594,6 +594,7 @@ export default { ...@@ -594,6 +594,7 @@ export default {
<gl-form-textarea <gl-form-textarea
id="dismissal-comment" id="dismissal-comment"
v-model="dismissalComment" v-model="dismissalComment"
data-testid="dismissal-comment"
:placeholder="$options.i18n.dismissCommentPlaceholder" :placeholder="$options.i18n.dismissCommentPlaceholder"
@keydown.meta.enter="updateDismissal" @keydown.meta.enter="updateDismissal"
@keydown.esc.stop.prevent="handleCommentEsc" @keydown.esc.stop.prevent="handleCommentEsc"
......
...@@ -49,6 +49,13 @@ def self.prepended(base) ...@@ -49,6 +49,13 @@ def self.prepended(base)
view 'ee/app/assets/javascripts/security_dashboard/components/pipeline/vulnerability_finding_modal.vue' do view 'ee/app/assets/javascripts/security_dashboard/components/pipeline/vulnerability_finding_modal.vue' do
element 'vulnerability-modal-content' element 'vulnerability-modal-content'
element 'dismiss-button'
element 'save-editing-dismissal'
element 'dismissal-comment'
end
view 'ee/app/assets/javascripts/security_dashboard/components/pipeline/vulnerability_dismissal_reason.vue' do
element 'dismissal-reason'
end end
view 'ee/app/assets/javascripts/vue_shared/security_reports/components/modal.vue' do view 'ee/app/assets/javascripts/vue_shared/security_reports/components/modal.vue' do
...@@ -142,15 +149,31 @@ def dismiss_vulnerability_with_reason(name, reason) ...@@ -142,15 +149,31 @@ def dismiss_vulnerability_with_reason(name, reason)
end end
def add_comment_and_dismiss(comment) def add_comment_and_dismiss(comment)
click_element :dismiss_with_comment_button if has_element?(:dismiss_with_comment_button)
find_element(:dismiss_comment_field).fill_in with: comment, fill_options: { automatic_label_click: true } click_element :dismiss_with_comment_button
click_element :add_and_dismiss_button find_element(:dismiss_comment_field).fill_in with: comment, fill_options: { automatic_label_click: true }
click_element :add_and_dismiss_button
else
click_element('dismiss-button')
find(dismissal_reason_selector, wait: 5).click
find(dismissal_reason_item_selector("not_applicable")).click
find_element('dismissal-comment').fill_in with: comment, fill_options: { automatic_label_click: true }
click_element('save-editing-dismissal')
end
wait_until(reload: false) do wait_until(reload: false) do
has_no_element?('vulnerability-modal-content') has_no_element?('vulnerability-modal-content')
end end
end end
def dismissal_reason_selector
"[data-testid='dismissal-reason'] > button"
end
def dismissal_reason_item_selector(reason)
"[data-testid='listbox-item-#{reason}']"
end
def resolve_vulnerability_with_mr(name) def resolve_vulnerability_with_mr(name)
expand_vulnerability_report expand_vulnerability_report
click_vulnerability(name) click_vulnerability(name)
......
0% 加载中 .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册