Commit 4c3c67a7 authored by Rémy Coutable's avatar Rémy Coutable

Merge branch 'fix-failing-issue-tests' into 'master'

Fixed failing issues tests

Also removed up/down vote icons from merge requests. Was missed from d8069bd8

See merge request !2911
parents a612ac1c 7bdddb48
...@@ -163,7 +163,7 @@ ...@@ -163,7 +163,7 @@
display: inline-block; display: inline-block;
} }
.merge-request-no-comments, .merge-request-no-votes { .merge-request-no-comments {
opacity: 0.5; opacity: 0.5;
} }
} }
...@@ -237,5 +237,3 @@ ...@@ -237,5 +237,3 @@
} }
} }
} }
...@@ -25,23 +25,15 @@ ...@@ -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 ...@@ -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 ...@@ -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 ...@@ -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 ...@@ -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
......
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