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

app/assets/stylesheets/pages/merge_requests.scss

@@ -163,7 +163,7 @@
     display: inline-block;
   }
 
-  .merge-request-no-comments, .merge-request-no-votes {
+  .merge-request-no-comments {
     opacity: 0.5;
   }
 }
@@ -237,5 +237,3 @@
     }
   }
 }
-
-

app/views/projects/merge_requests/_merge_request.html.haml

@@ -25,23 +25,15 @@
           = link_to_member(merge_request.source_project, merge_request.assignee, name: false, title: "Assigned to :name")
 
       - upvotes, downvotes = merge_request.upvotes, merge_request.downvotes
-      - if upvotes > 0 || downvotes > 0
+      - if upvotes > 0
         %li
           = icon('thumbs-up')
           = upvotes
-      - else
-        %li{ class: 'merge-request-no-votes' }
-          = icon('thumbs-up')
-          = upvotes
 
-      - if upvotes > 0 || downvotes > 0
+      - if downvotes > 0
         %li
           = icon('thumbs-down')
           = downvotes
-      - else
-        %li{ class: 'merge-request-no-votes' }
-          = icon('thumbs-down')
-          = downvotes
 
       - note_count = merge_request.mr_and_commit_notes.user.count
       - if note_count > 0

features/steps/project/issues/issues.rb

@@ -214,7 +214,7 @@ class Spinach::Features::ProjectIssues < Spinach::FeatureSteps
 
       page.within 'li.issue:nth-child(3)' do
         expect(page).to have_content 'Bugfix'
-        expect(page).to have_content '0 0'
+        expect(page).to_not have_content '0 0'
       end
     end
   end
@@ -233,7 +233,7 @@ class Spinach::Features::ProjectIssues < Spinach::FeatureSteps
 
       page.within 'li.issue:nth-child(3)' do
         expect(page).to have_content 'Bugfix'
-        expect(page).to have_content '0 0'
+        expect(page).to_not have_content '0 0'
       end
     end
   end

features/steps/project/merge_requests.rb

@@ -164,7 +164,7 @@ class Spinach::Features::ProjectMergeRequests < Spinach::FeatureSteps
 
       page.within 'li.merge-request:nth-child(3)' do
         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
@@ -183,7 +183,7 @@ class Spinach::Features::ProjectMergeRequests < Spinach::FeatureSteps
 
       page.within 'li.merge-request:nth-child(3)' do
         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