Streamline the "Report button"rymai/gitlab-ce-disable-report-button-if-already-reported

This simplifies the "Report button" to not use open a dropdown and
adds a tooltip on this button.
This also removes an extra spec and adds missing specs.

2 files changed, 3 insertions, 4 deletions

diff --git a/features/abuse_report.feature b/features/abuse_report.feature
index fc80f0aa399..212972a762a 100644
--- a/features/abuse_report.feature
+++ b/features/abuse_report.feature
@@ -14,4 +14,4 @@ Feature: Abuse reports
     And I click "Report abuse" button
     When I fill and submit abuse form
     And I visit "Mike" user page
-    Then I should not see the "Remove abuse" dropdown / button
+    Then I should see a red "Report abuse" button
diff --git a/features/steps/abuse_reports.rb b/features/steps/abuse_reports.rb
index 623807dac82..56652ff6f05 100644
--- a/features/steps/abuse_reports.rb
+++ b/features/steps/abuse_reports.rb
@@ -22,9 +22,8 @@ class Spinach::Features::AbuseReports < Spinach::FeatureSteps
     user_mike
   end
 
-  step 'I should not see the "Remove abuse" dropdown / button' do
-    expect(find(:css, '#report_abuse')).not_to have_selector(:css, 'ul.dropdown-menu')
-    expect(find(:css, '#report_abuse')).to have_selector(:css, '.btn-close')
+  step 'I should see a red "Report abuse" button' do
+    expect(find(:css, '.report_abuse')).to have_selector(:css, 'span.btn-close')
   end
 
   def user_mike