Merge branch 'move-abuse-report-spinach-test-to-rspec' into 'master'

Move abuse report spinach test to RSpec

https://gitlab.com/gitlab-org/gitlab-ce/issues/23036

See merge request !7659

4 files changed, 28 insertions, 49 deletions

diff --git a/changelogs/unreleased/move-abuse-report-spinach-test-to-rspec.yml b/changelogs/unreleased/move-abuse-report-spinach-test-to-rspec.yml
new file mode 100644
index 00000000000..9de7477c200
--- /dev/null
+++ b/changelogs/unreleased/move-abuse-report-spinach-test-to-rspec.yml
@@ -0,0 +1,4 @@
+---
+title: Move abuse report spinach test to rspec
+merge_request: 7659
+author: Semyon Pupkov
diff --git a/features/abuse_report.feature b/features/abuse_report.feature
deleted file mode 100644
index 212972a762a..00000000000
--- a/features/abuse_report.feature
+++ /dev/null
@@ -1,17 +0,0 @@
-Feature: Abuse reports
-  Background:
-    Given I sign in as a user
-    And user "Mike" exists
-
-  Scenario: Report abuse
-    Given I visit "Mike" user page
-    And I click "Report abuse" button
-    When I fill and submit abuse form
-    Then I should see success message
-
-  Scenario: Report abuse available only once
-    Given I visit "Mike" user page
-    And I click "Report abuse" button
-    When I fill and submit abuse form
-    And I visit "Mike" user page
-    Then I should see a red "Report abuse" button
diff --git a/features/steps/abuse_reports.rb b/features/steps/abuse_reports.rb
deleted file mode 100644
index 499accb0b08..00000000000
--- a/features/steps/abuse_reports.rb
+++ /dev/null
@@ -1,32 +0,0 @@
-class Spinach::Features::AbuseReports < Spinach::FeatureSteps
-  include SharedAuthentication
-
-  step 'I visit "Mike" user page' do
-    visit user_path(user_mike)
-  end
-
-  step 'I click "Report abuse" button' do
-    click_link 'Report abuse'
-  end
-
-  step 'I fill and submit abuse form' do
-    fill_in 'abuse_report_message', with: 'This user send spam'
-    click_button 'Send report'
-  end
-
-  step 'I should see success message' do
-    page.should have_content 'Thank you for your report'
-  end
-
-  step 'user "Mike" exists' do
-    user_mike
-  end
-
-  step 'I should see a red "Report abuse" button' do
-    expect(page).to have_button("Already reported for abuse")
-  end
-
-  def user_mike
-    @user_mike ||= create(:user, name: 'Mike')
-  end
-end
diff --git a/spec/features/abuse_report_spec.rb b/spec/features/abuse_report_spec.rb
new file mode 100644
index 00000000000..1e11fb756b2
--- /dev/null
+++ b/spec/features/abuse_report_spec.rb
@@ -0,0 +1,24 @@
+require 'spec_helper'
+
+feature 'Abuse reports', feature: true do
+  let(:another_user) { create(:user) }
+
+  before do
+    login_as :user
+  end
+
+  scenario 'Report abuse' do
+    visit user_path(another_user)
+
+    click_link 'Report abuse'
+
+    fill_in 'abuse_report_message', with: 'This user send spam'
+    click_button 'Send report'
+
+    expect(page).to have_content 'Thank you for your report'
+
+    visit user_path(another_user)
+
+    expect(page).to have_button("Already reported for abuse")
+  end
+end