Merge branch 'fix-sidebar-block-ref-test' into 'master'
add issues and merge-requests classes and use to find in rspec See merge request !10980
This commit is contained in:
commit
e57545351b
2 changed files with 4 additions and 5 deletions
|
@ -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 @@
|
||||||
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')
|
||||||
|
|
|
@ -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
|
||||||
|
|
Loading…
Reference in a new issue