Commit 2c68de83 authored by Natalia Tepluhina's avatar Natalia Tepluhina

Merge branch '255952-remove-hyphen-in-to-do-in-design-management' into 'master'

Resolve "Remove hyphen in To-Do in Design Management"

Closes #255952

See merge request gitlab-org/gitlab!43435
parents 46a152ff d688f6fe
...@@ -126,7 +126,7 @@ export default { ...@@ -126,7 +126,7 @@ export default {
v-if="showTodoButton" v-if="showTodoButton"
class="gl-py-4 gl-mb-4 gl-display-flex gl-justify-content-space-between gl-align-items-center gl-border-b-1 gl-border-b-solid gl-border-b-gray-100" class="gl-py-4 gl-mb-4 gl-display-flex gl-justify-content-space-between gl-align-items-center gl-border-b-1 gl-border-b-solid gl-border-b-gray-100"
> >
<span>{{ __('To-Do') }}</span> <span>{{ __('To Do') }}</span>
<design-todo-button :design="design" @error="$emit('todoError', $event)" /> <design-todo-button :design="design" @error="$emit('todoError', $event)" />
</div> </div>
<h2 class="gl-font-weight-bold gl-mt-0"> <h2 class="gl-font-weight-bold gl-mt-0">
......
...@@ -15,7 +15,7 @@ export default { ...@@ -15,7 +15,7 @@ export default {
}, },
computed: { computed: {
buttonLabel() { buttonLabel() {
return this.isTodo ? __('Mark as done') : __('Add a To-Do'); return this.isTodo ? __('Mark as done') : __('Add a To Do');
}, },
}, },
}; };
......
...@@ -111,7 +111,7 @@ describe('Design management design todo button', () => { ...@@ -111,7 +111,7 @@ describe('Design management design todo button', () => {
}); });
it('renders correct button text', () => { it('renders correct button text', () => {
expect(wrapper.text()).toBe('Add a To-Do'); expect(wrapper.text()).toBe('Add a To Do');
}); });
describe('when clicked', () => { describe('when clicked', () => {
......
...@@ -33,7 +33,7 @@ describe('Todo Button', () => { ...@@ -33,7 +33,7 @@ describe('Todo Button', () => {
it.each` it.each`
label | isTodo label | isTodo
${'Mark as done'} | ${true} ${'Mark as done'} | ${true}
${'Add a To-Do'} | ${false} ${'Add a To Do'} | ${false}
`('sets correct label when isTodo is $isTodo', ({ label, isTodo }) => { `('sets correct label when isTodo is $isTodo', ({ label, isTodo }) => {
createComponent({ isTodo }); createComponent({ isTodo });
......
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