summaryrefslogtreecommitdiff
path: root/features
diff options
context:
space:
mode:
authorRémy Coutable <remy@rymai.me>2016-11-24 13:26:33 +0000
committerRémy Coutable <remy@rymai.me>2016-11-24 13:26:33 +0000
commitc66502a2fbe4f55589af693fa3522ce8fee0fe3f (patch)
tree17caa7d7968c9ea50905bdf965c03c309c2007c9 /features
parentd5740d3bb6ad23c74e8968f62ec479929c63fb44 (diff)
parentc18f96cfe950b11e2784479cbc7e518667273143 (diff)
downloadgitlab-ce-c66502a2fbe4f55589af693fa3522ce8fee0fe3f.tar.gz
Merge branch 'move-admin-spam-spinach-test-to-rspec' into 'master'
Move admin spam spinach test to RSpec See merge request !7708
Diffstat (limited to 'features')
-rw-r--r--features/admin/spam_logs.feature8
-rw-r--r--features/steps/admin/spam_logs.rb28
2 files changed, 0 insertions, 36 deletions
diff --git a/features/admin/spam_logs.feature b/features/admin/spam_logs.feature
deleted file mode 100644
index 92a5389e3a4..00000000000
--- a/features/admin/spam_logs.feature
+++ /dev/null
@@ -1,8 +0,0 @@
-Feature: Admin spam logs
- Background:
- Given I sign in as an admin
- And spam logs exist
-
- Scenario: Browse spam logs
- When I visit spam logs page
- Then I should see list of spam logs
diff --git a/features/steps/admin/spam_logs.rb b/features/steps/admin/spam_logs.rb
deleted file mode 100644
index ad825fd414c..00000000000
--- a/features/steps/admin/spam_logs.rb
+++ /dev/null
@@ -1,28 +0,0 @@
-class Spinach::Features::AdminSpamLogs < Spinach::FeatureSteps
- include SharedAuthentication
- include SharedPaths
- include SharedAdmin
-
- step 'I should see list of spam logs' do
- expect(page).to have_content('Spam Logs')
- expect(page).to have_content spam_log.source_ip
- expect(page).to have_content spam_log.noteable_type
- expect(page).to have_content 'N'
- expect(page).to have_content spam_log.title
- expect(page).to have_content truncate(spam_log.description)
- expect(page).to have_link('Remove user')
- expect(page).to have_link('Block user')
- end
-
- step 'spam logs exist' do
- create(:spam_log)
- end
-
- def spam_log
- @spam_log ||= SpamLog.first
- end
-
- def truncate(description)
- "#{spam_log.description[0...97]}..."
- end
-end