Skip to content
Snippets Groups Projects
Commit edc55c66 authored by Sascha Eggenberger's avatar Sascha Eggenberger :speech_balloon:
Browse files

MR commit message: Fix existing message dropdown selection

Changelog: fixed
parent 3f9610f5
No related branches found
No related tags found
2 merge requests!162233Draft: Script to update Topology Service Gem,!153408MR commit message: Fix existing message dropdown selection
......@@ -5,6 +5,10 @@ export default {
components: {
GlFormTextarea,
},
model: {
prop: 'value',
event: 'input',
},
props: {
value: {
type: String,
......@@ -19,11 +23,6 @@ export default {
required: true,
},
},
data() {
return {
messageText: this.value,
};
},
};
</script>
......@@ -40,13 +39,13 @@ export default {
</div>
<gl-form-textarea
:id="inputId"
v-model="messageText"
:value="value"
class="form-control js-gfm-input gl-mb-3 commit-message-edit !gl-font-monospace"
dir="auto"
required="required"
rows="7"
max-rows="32"
@input="$emit('input', messageText)"
@input="(val) => $emit('input', val)"
/>
</div>
</li>
......
......@@ -605,7 +605,7 @@ export default {
<ul class="border-top commits-list flex-list gl-list-none gl-p-0 gl-pt-4">
<commit-edit
v-if="shouldShowSquashEdit"
:value="squashCommitMessage"
v-model="squashCommitMessage"
:label="__('Squash commit message')"
input-id="squash-message-edit"
class="gl-m-0! gl-p-0!"
......@@ -617,7 +617,7 @@ export default {
</commit-edit>
<commit-edit
v-if="shouldShowMergeEdit"
:value="commitMessage"
v-model="commitMessage"
:label="__('Merge commit message')"
input-id="merge-message-edit"
class="gl-m-0! gl-p-0!"
......
......@@ -50,10 +50,11 @@ describe('Commits edit component', () => {
it('emits an input event and receives changed value', async () => {
const changedCommitMessage = 'Changed commit message';
wrapper.setProps({ value: changedCommitMessage });
findTextarea().vm.$emit('input', changedCommitMessage);
await nextTick();
expect(wrapper.emitted().input[0]).toEqual([changedCommitMessage]);
expect(wrapper.emitted('input')).toEqual([[changedCommitMessage]]);
expect(findTextarea().props('value')).toBe(changedCommitMessage);
});
});
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment