Fixed failing issues tests
Removed up/down vote icons from merge requests. Was missed from d8069bd858
This commit is contained in:
parent
1d9863c141
commit
51c17329a4
|
@ -25,23 +25,15 @@
|
||||||
= link_to_member(merge_request.source_project, merge_request.assignee, name: false, title: "Assigned to :name")
|
= link_to_member(merge_request.source_project, merge_request.assignee, name: false, title: "Assigned to :name")
|
||||||
|
|
||||||
- upvotes, downvotes = merge_request.upvotes, merge_request.downvotes
|
- upvotes, downvotes = merge_request.upvotes, merge_request.downvotes
|
||||||
- if upvotes > 0 || downvotes > 0
|
- if upvotes > 0
|
||||||
%li
|
%li
|
||||||
= icon('thumbs-up')
|
= icon('thumbs-up')
|
||||||
= upvotes
|
= upvotes
|
||||||
- else
|
|
||||||
%li{ class: 'merge-request-no-votes' }
|
|
||||||
= icon('thumbs-up')
|
|
||||||
= upvotes
|
|
||||||
|
|
||||||
- if upvotes > 0 || downvotes > 0
|
- if downvotes > 0
|
||||||
%li
|
%li
|
||||||
= icon('thumbs-down')
|
= icon('thumbs-down')
|
||||||
= downvotes
|
= downvotes
|
||||||
- else
|
|
||||||
%li{ class: 'merge-request-no-votes' }
|
|
||||||
= icon('thumbs-down')
|
|
||||||
= downvotes
|
|
||||||
|
|
||||||
- note_count = merge_request.mr_and_commit_notes.user.count
|
- note_count = merge_request.mr_and_commit_notes.user.count
|
||||||
- if note_count > 0
|
- if note_count > 0
|
||||||
|
|
|
@ -214,7 +214,7 @@ class Spinach::Features::ProjectIssues < Spinach::FeatureSteps
|
||||||
|
|
||||||
page.within 'li.issue:nth-child(3)' do
|
page.within 'li.issue:nth-child(3)' do
|
||||||
expect(page).to have_content 'Bugfix'
|
expect(page).to have_content 'Bugfix'
|
||||||
expect(page).to have_content '0 0'
|
expect(page).to_not have_content '0 0'
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
@ -233,7 +233,7 @@ class Spinach::Features::ProjectIssues < Spinach::FeatureSteps
|
||||||
|
|
||||||
page.within 'li.issue:nth-child(3)' do
|
page.within 'li.issue:nth-child(3)' do
|
||||||
expect(page).to have_content 'Bugfix'
|
expect(page).to have_content 'Bugfix'
|
||||||
expect(page).to have_content '0 0'
|
expect(page).to_not have_content '0 0'
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
|
@ -164,7 +164,7 @@ class Spinach::Features::ProjectMergeRequests < Spinach::FeatureSteps
|
||||||
|
|
||||||
page.within 'li.merge-request:nth-child(3)' do
|
page.within 'li.merge-request:nth-child(3)' do
|
||||||
expect(page).to have_content 'Bug NS-05'
|
expect(page).to have_content 'Bug NS-05'
|
||||||
expect(page).to have_content '0 0'
|
expect(page).to_not have_content '0 0'
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
@ -183,7 +183,7 @@ class Spinach::Features::ProjectMergeRequests < Spinach::FeatureSteps
|
||||||
|
|
||||||
page.within 'li.merge-request:nth-child(3)' do
|
page.within 'li.merge-request:nth-child(3)' do
|
||||||
expect(page).to have_content 'Bug NS-05'
|
expect(page).to have_content 'Bug NS-05'
|
||||||
expect(page).to have_content '0 0'
|
expect(page).to_not have_content '0 0'
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
Loading…
Reference in New Issue