Commit 1f2f456c authored by Natalia Tepluhina's avatar Natalia Tepluhina

Merge branch...

Merge branch 'update-slot-syntax-of-ee/app/assets/javascripts/vue_shared/security_reports/components/modal.vue' into 'master'

Update deprecated slot syntax in` ee/app/assets/javascripts/vue_shared/security_reports/components/modal.vue`

See merge request gitlab-org/gitlab!31966
parents 86955423 8ff3cd32
...@@ -253,7 +253,7 @@ export default { ...@@ -253,7 +253,7 @@ export default {
<div v-if="modal.error" class="alert alert-danger">{{ modal.error }}</div> <div v-if="modal.error" class="alert alert-danger">{{ modal.error }}</div>
</slot> </slot>
<div slot="footer"> <template #footer>
<dismissal-comment-modal-footer <dismissal-comment-modal-footer
v-if="modal.isCommentingOnDismissal" v-if="modal.isCommentingOnDismissal"
:is-dismissed="vulnerability.isDismissed" :is-dismissed="vulnerability.isDismissed"
...@@ -284,6 +284,6 @@ export default { ...@@ -284,6 +284,6 @@ export default {
@revertDismissVulnerability="$emit('revertDismissVulnerability')" @revertDismissVulnerability="$emit('revertDismissVulnerability')"
@downloadPatch="$emit('downloadPatch')" @downloadPatch="$emit('downloadPatch')"
/> />
</div> </template>
</modal> </modal>
</template> </template>
---
title: Update deprecated Vue 3 slot syntax in ee/app/assets/javascripts/vue_shared/security_reports/components/modal.vue
merge_request: 31966
author: Gilang Gumilar
type: other
...@@ -158,7 +158,7 @@ describe('Security Reports modal', () => { ...@@ -158,7 +158,7 @@ describe('Security Reports modal', () => {
}; };
propsData.modal.vulnerability.remediations = [{ diff: '123' }]; propsData.modal.vulnerability.remediations = [{ diff: '123' }];
propsData.modal.isResolved = true; propsData.modal.isResolved = true;
mountComponent(propsData); mountComponent(propsData, mount);
}); });
it('disallows any actions in the footer', () => { it('disallows any actions in the footer', () => {
...@@ -177,7 +177,7 @@ describe('Security Reports modal', () => { ...@@ -177,7 +177,7 @@ describe('Security Reports modal', () => {
const propsData = { const propsData = {
modal: createState().modal, modal: createState().modal,
}; };
mountComponent(propsData); mountComponent(propsData, mount);
}); });
it('disallows any actions in the footer', () => { it('disallows any actions in the footer', () => {
...@@ -270,7 +270,7 @@ describe('Security Reports modal', () => { ...@@ -270,7 +270,7 @@ describe('Security Reports modal', () => {
modal: createState().modal, modal: createState().modal,
}; };
propsData.modal.isResolved = true; propsData.modal.isResolved = true;
mountComponent(propsData); mountComponent(propsData, mount);
}); });
it('disallows any actions in the footer', () => { it('disallows any actions in the footer', () => {
......
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