Commit db4f38e1 authored by Ezekiel Kigbo's avatar Ezekiel Kigbo

Merge branch 'gl-modal-action-update' into 'master'

Update gl-modal action buttons in user status modal

See merge request gitlab-org/gitlab!59460
parents 96a9c5a9 3ca36aec
......@@ -236,6 +236,8 @@ export default {
},
statusTimeRanges,
safeHtmlConfig: { ADD_TAGS: ['gl-emoji'] },
actionPrimary: { text: s__('SetStatusModal|Set status') },
actionSecondary: { text: s__('SetStatusModal|Remove status') },
};
</script>
......@@ -243,14 +245,13 @@ export default {
<gl-modal
:title="s__('SetStatusModal|Set a status')"
:modal-id="modalId"
:ok-title="s__('SetStatusModal|Set status')"
:cancel-title="s__('SetStatusModal|Remove status')"
ok-variant="success"
:action-primary="$options.actionPrimary"
:action-secondary="$options.actionSecondary"
modal-class="set-user-status-modal"
@shown="setupEmojiListAndAutocomplete"
@hide="hideEmojiMenu"
@ok="setStatus"
@cancel="removeStatus"
@primary="setStatus"
@secondary="removeStatus"
>
<div>
<input
......
......@@ -198,7 +198,7 @@ describe('SetStatusModalWrapper', () => {
});
it('clicking "removeStatus" clears the emoji and message fields', async () => {
findModal().vm.$emit('cancel');
findModal().vm.$emit('secondary');
await wrapper.vm.$nextTick();
expect(findFormField('message').element.value).toBe('');
......@@ -206,7 +206,7 @@ describe('SetStatusModalWrapper', () => {
});
it('clicking "setStatus" submits the user status', async () => {
findModal().vm.$emit('ok');
findModal().vm.$emit('primary');
await wrapper.vm.$nextTick();
// set the availability status
......@@ -215,7 +215,7 @@ describe('SetStatusModalWrapper', () => {
// set the currentClearStatusAfter to 30 minutes
wrapper.find('[data-testid="thirtyMinutes"]').vm.$emit('click');
findModal().vm.$emit('ok');
findModal().vm.$emit('primary');
await wrapper.vm.$nextTick();
const commonParams = {
......@@ -237,7 +237,7 @@ describe('SetStatusModalWrapper', () => {
});
it('calls the "onUpdateSuccess" handler', async () => {
findModal().vm.$emit('ok');
findModal().vm.$emit('primary');
await wrapper.vm.$nextTick();
expect(wrapper.vm.onUpdateSuccess).toHaveBeenCalled();
......@@ -253,7 +253,7 @@ describe('SetStatusModalWrapper', () => {
});
it('displays a toast success message', async () => {
findModal().vm.$emit('ok');
findModal().vm.$emit('primary');
await wrapper.vm.$nextTick();
expect($toast.show).toHaveBeenCalledWith('Status updated');
......@@ -270,7 +270,7 @@ describe('SetStatusModalWrapper', () => {
});
it('calls the "onUpdateFail" handler', async () => {
findModal().vm.$emit('ok');
findModal().vm.$emit('primary');
await wrapper.vm.$nextTick();
expect(wrapper.vm.onUpdateFail).toHaveBeenCalled();
......@@ -286,7 +286,7 @@ describe('SetStatusModalWrapper', () => {
});
it('flashes an error message', async () => {
findModal().vm.$emit('ok');
findModal().vm.$emit('primary');
await wrapper.vm.$nextTick();
expect(createFlash).toHaveBeenCalledWith({
......
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