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
Jérome Perrin
gitlab-ce
Commits
77d92405
Commit
77d92405
authored
Apr 28, 2017
by
Luke "Jared" Bennett
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
add issues and merge-requests classes and use to find in rspec
parent
61046e75
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
4 additions
and
5 deletions
+4
-5
app/views/shared/milestones/_sidebar.html.haml
app/views/shared/milestones/_sidebar.html.haml
+2
-2
spec/features/projects/milestones/milestone_spec.rb
spec/features/projects/milestones/milestone_spec.rb
+2
-3
No files found.
app/views/shared/milestones/_sidebar.html.haml
View file @
77d92405
...
@@ -64,7 +64,7 @@
...
@@ -64,7 +64,7 @@
%span
.remaining-days
=
remaining_days
%span
.remaining-days
=
remaining_days
-
if
!
project
||
can?
(
current_user
,
:read_issue
,
project
)
-
if
!
project
||
can?
(
current_user
,
:read_issue
,
project
)
.block
.block
.issues
.sidebar-collapsed-icon
.sidebar-collapsed-icon
%strong
%strong
=
icon
(
'hashtag'
,
'aria-hidden'
:
'true'
)
=
icon
(
'hashtag'
,
'aria-hidden'
:
'true'
)
...
@@ -85,7 +85,7 @@
...
@@ -85,7 +85,7 @@
Closed:
Closed:
=
milestone
.
issues_visible_to_user
(
current_user
).
closed
.
count
=
milestone
.
issues_visible_to_user
(
current_user
).
closed
.
count
.block
.block
.merge-requests
.sidebar-collapsed-icon
.sidebar-collapsed-icon
%strong
%strong
=
icon
(
'exclamation'
,
'aria-hidden'
:
'true'
)
=
icon
(
'exclamation'
,
'aria-hidden'
:
'true'
)
...
...
spec/features/projects/milestones/milestone_spec.rb
View file @
77d92405
...
@@ -78,11 +78,10 @@ feature 'Project milestone', :feature do
...
@@ -78,11 +78,10 @@ feature 'Project milestone', :feature do
it
'shows the total MR and issue counts'
do
it
'shows the total MR and issue counts'
do
find
(
'.milestone-sidebar .block'
,
match: :first
)
find
(
'.milestone-sidebar .block'
,
match: :first
)
blocks
=
all
(
'.milestone-sidebar .block'
)
aggregate_failures
'MR and issue blocks'
do
aggregate_failures
'MR and issue blocks'
do
expect
(
blocks
[
3
]
).
to
have_content
1
expect
(
find
(
'.milestone-sidebar .block.issues'
)
).
to
have_content
1
expect
(
blocks
[
4
]
).
to
have_content
0
expect
(
find
(
'.milestone-sidebar .block.merge-requests'
)
).
to
have_content
0
end
end
end
end
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