Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
G
gitlab-ce
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Boxiang Sun
gitlab-ce
Commits
55bd24ab
Commit
55bd24ab
authored
Nov 03, 2017
by
Victor Wu
Committed by
Annabel Dunstone Gray
Nov 03, 2017
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Resolve ""To do" should be "Todos" on Todos list page"
parent
4154fa28
Changes
3
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
11 additions
and
6 deletions
+11
-6
app/views/dashboard/todos/index.html.haml
app/views/dashboard/todos/index.html.haml
+1
-1
changelogs/unreleased/39417-todos-spelled-correctly-on-todos-list-page.yml
...ased/39417-todos-spelled-correctly-on-todos-list-page.yml
+5
-0
spec/features/dashboard/todos/todos_spec.rb
spec/features/dashboard/todos/todos_spec.rb
+5
-5
No files found.
app/views/dashboard/todos/index.html.haml
View file @
55bd24ab
...
@@ -8,7 +8,7 @@
...
@@ -8,7 +8,7 @@
%li
.todos-pending
{
class:
active_when
(
params
[
:state
].
blank?
||
params
[
:state
]
==
'pending'
)
}
>
%li
.todos-pending
{
class:
active_when
(
params
[
:state
].
blank?
||
params
[
:state
]
==
'pending'
)
}
>
=
link_to
todos_filter_path
(
state:
'pending'
)
do
=
link_to
todos_filter_path
(
state:
'pending'
)
do
%span
%span
To
do
To
dos
%span
.badge
%span
.badge
=
number_with_delimiter
(
todos_pending_count
)
=
number_with_delimiter
(
todos_pending_count
)
%li
.todos-done
{
class:
active_when
(
params
[
:state
]
==
'done'
)
}
>
%li
.todos-done
{
class:
active_when
(
params
[
:state
]
==
'done'
)
}
>
...
...
changelogs/unreleased/39417-todos-spelled-correctly-on-todos-list-page.yml
0 → 100644
View file @
55bd24ab
---
title
:
Todos spelled correctly on Todos list page
merge_request
:
15015
author
:
type
:
changed
spec/features/dashboard/todos/todos_spec.rb
View file @
55bd24ab
...
@@ -52,7 +52,7 @@ feature 'Dashboard Todos' do
...
@@ -52,7 +52,7 @@ feature 'Dashboard Todos' do
end
end
it
'updates todo count'
do
it
'updates todo count'
do
expect
(
page
).
to
have_content
'To
do
0'
expect
(
page
).
to
have_content
'To
dos
0'
expect
(
page
).
to
have_content
'Done 1'
expect
(
page
).
to
have_content
'Done 1'
end
end
...
@@ -81,7 +81,7 @@ feature 'Dashboard Todos' do
...
@@ -81,7 +81,7 @@ feature 'Dashboard Todos' do
end
end
it
'updates todo count'
do
it
'updates todo count'
do
expect
(
page
).
to
have_content
'To
do
1'
expect
(
page
).
to
have_content
'To
dos
1'
expect
(
page
).
to
have_content
'Done 0'
expect
(
page
).
to
have_content
'Done 0'
end
end
end
end
...
@@ -200,7 +200,7 @@ feature 'Dashboard Todos' do
...
@@ -200,7 +200,7 @@ feature 'Dashboard Todos' do
end
end
it
'updates todo count'
do
it
'updates todo count'
do
expect
(
page
).
to
have_content
'To
do
1'
expect
(
page
).
to
have_content
'To
dos
1'
expect
(
page
).
to
have_content
'Done 0'
expect
(
page
).
to
have_content
'Done 0'
end
end
end
end
...
@@ -256,7 +256,7 @@ feature 'Dashboard Todos' do
...
@@ -256,7 +256,7 @@ feature 'Dashboard Todos' do
end
end
it
'shows "All done" message!'
do
it
'shows "All done" message!'
do
expect
(
page
).
to
have_content
'To
do
0'
expect
(
page
).
to
have_content
'To
dos
0'
expect
(
page
).
to
have_content
"You're all done!"
expect
(
page
).
to
have_content
"You're all done!"
expect
(
page
).
not_to
have_selector
(
'.gl-pagination'
)
expect
(
page
).
not_to
have_selector
(
'.gl-pagination'
)
end
end
...
@@ -283,7 +283,7 @@ feature 'Dashboard Todos' do
...
@@ -283,7 +283,7 @@ feature 'Dashboard Todos' do
it
'updates todo count'
do
it
'updates todo count'
do
mark_all_and_undo
mark_all_and_undo
expect
(
page
).
to
have_content
'To
do
2'
expect
(
page
).
to
have_content
'To
dos
2'
expect
(
page
).
to
have_content
'Done 0'
expect
(
page
).
to
have_content
'Done 0'
end
end
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment