Commit 8e0f0600 authored by Simon Knox's avatar Simon Knox

Merge branch '299102-fix-spelling' into 'master'

Fix "Add a to do" spelling on alerts and epics

See merge request gitlab-org/gitlab!52292
parents a3d3e048 a97f5067
...@@ -3,7 +3,7 @@ import { GlLoadingIcon, GlIcon, GlTooltipDirective } from '@gitlab/ui'; ...@@ -3,7 +3,7 @@ import { GlLoadingIcon, GlIcon, GlTooltipDirective } from '@gitlab/ui';
import { __ } from '~/locale'; import { __ } from '~/locale';
const MARK_TEXT = __('Mark as done'); const MARK_TEXT = __('Mark as done');
const TODO_TEXT = __('Add a To-Do'); const TODO_TEXT = __('Add a to do');
export default { export default {
components: { components: {
......
---
title: Fix Add a to do spelling on epics
merge_request: 52292
author: Yogi (@yo)
type: other
...@@ -196,9 +196,9 @@ add a to-do item: ...@@ -196,9 +196,9 @@ add a to-do item:
1. To display the list of current alerts, navigate to **Operations > Alerts**. 1. To display the list of current alerts, navigate to **Operations > Alerts**.
1. Select your desired alert to display its **Alert Management Details View**. 1. Select your desired alert to display its **Alert Management Details View**.
1. Select the **Add a To-Do** button in the right sidebar: 1. Select the **Add a to do** button in the right sidebar:
![Alert Details Add a To-Do](img/alert_detail_add_todo_v13_1.png) ![Alert Details Add a to do](img/alert_detail_add_todo_v13_9.png)
Select the **To-Do List** **{todo-done}** in the navigation bar to view your current to-do list. Select the **To-Do List** **{todo-done}** in the navigation bar to view your current to-do list.
......
...@@ -16,7 +16,7 @@ RSpec.describe 'Manually create a todo item from epic', :js do ...@@ -16,7 +16,7 @@ RSpec.describe 'Manually create a todo item from epic', :js do
it 'creates todo when clicking button' do it 'creates todo when clicking button' do
page.within '.issuable-sidebar' do page.within '.issuable-sidebar' do
click_button 'Add a To-Do' click_button 'Add a to do'
expect(page).to have_content 'Mark as done' expect(page).to have_content 'Mark as done'
end end
...@@ -28,7 +28,7 @@ RSpec.describe 'Manually create a todo item from epic', :js do ...@@ -28,7 +28,7 @@ RSpec.describe 'Manually create a todo item from epic', :js do
it 'marks a todo as done' do it 'marks a todo as done' do
page.within '.issuable-sidebar' do page.within '.issuable-sidebar' do
click_button 'Add a To-Do' click_button 'Add a to do'
end end
expect(page).to have_selector('.todos-count', visible: true) expect(page).to have_selector('.todos-count', visible: true)
......
...@@ -1624,9 +1624,6 @@ msgstr "" ...@@ -1624,9 +1624,6 @@ msgstr ""
msgid "Add a To Do" msgid "Add a To Do"
msgstr "" msgstr ""
msgid "Add a To-Do"
msgstr ""
msgid "Add a bullet list" msgid "Add a bullet list"
msgstr "" msgstr ""
......
...@@ -47,7 +47,7 @@ RSpec.describe 'Alert details', :js do ...@@ -47,7 +47,7 @@ RSpec.describe 'Alert details', :js do
expect(page).to have_selector('[data-testid="alert-todo-button"]') expect(page).to have_selector('[data-testid="alert-todo-button"]')
todo_button = find('[data-testid="alert-todo-button"]') todo_button = find('[data-testid="alert-todo-button"]')
expect(todo_button).to have_content('Add a To-Do') expect(todo_button).to have_content('Add a to do')
find('[data-testid="alert-todo-button"]').click find('[data-testid="alert-todo-button"]').click
wait_for_requests wait_for_requests
......
...@@ -59,7 +59,7 @@ describe('Alert Details Sidebar To Do', () => { ...@@ -59,7 +59,7 @@ describe('Alert Details Sidebar To Do', () => {
it('renders a button for adding a To-Do', async () => { it('renders a button for adding a To-Do', async () => {
await wrapper.vm.$nextTick(); await wrapper.vm.$nextTick();
expect(findToDoButton().text()).toBe('Add a To-Do'); expect(findToDoButton().text()).toBe('Add a to do');
}); });
it('calls `$apollo.mutate` with `createAlertTodoMutation` mutation and variables containing `iid`, `todoEvent`, & `projectPath`', async () => { it('calls `$apollo.mutate` with `createAlertTodoMutation` mutation and variables containing `iid`, `todoEvent`, & `projectPath`', async () => {
......
...@@ -35,7 +35,7 @@ describe('SidebarTodo', () => { ...@@ -35,7 +35,7 @@ describe('SidebarTodo', () => {
it.each` it.each`
isTodo | iconClass | label | icon isTodo | iconClass | label | icon
${false} | ${''} | ${'Add a To-Do'} | ${'todo-add'} ${false} | ${''} | ${'Add a to do'} | ${'todo-add'}
${true} | ${'todo-undone'} | ${'Mark as done'} | ${'todo-done'} ${true} | ${'todo-undone'} | ${'Mark as done'} | ${'todo-done'}
`( `(
'renders proper button when `isTodo` prop is `$isTodo`', 'renders proper button when `isTodo` prop is `$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