GitLab steht aufgrund wichtiger Wartungsarbeiten am Montag, den 8. März, zwischen 17:00 und 19:00 Uhr nicht zur Verfügung.

Use truncate helper on spam logs list

parent d20e75a8
...@@ -2,12 +2,4 @@ class SpamLog < ActiveRecord::Base ...@@ -2,12 +2,4 @@ class SpamLog < ActiveRecord::Base
belongs_to :user belongs_to :user
validates :user, presence: true validates :user, presence: true
def truncated_description
if description.present? && description.length > 100
return description[0..100] + "..."
end
description
end
end end
...@@ -16,7 +16,7 @@ ...@@ -16,7 +16,7 @@
%td %td
= spam_log.title = spam_log.title
%td %td
= spam_log.truncated_description = truncate(spam_log.description, length: 100)
%td %td
- if user - if user
= link_to 'Remove user', admin_spam_log_path(spam_log, remove_user: true), = link_to 'Remove user', admin_spam_log_path(spam_log, remove_user: true),
......
...@@ -4,15 +4,25 @@ class Spinach::Features::AdminSpamLogs < Spinach::FeatureSteps ...@@ -4,15 +4,25 @@ class Spinach::Features::AdminSpamLogs < Spinach::FeatureSteps
include SharedAdmin include SharedAdmin
step 'I should see list of spam logs' do step 'I should see list of spam logs' do
page.should have_content("Spam Logs") expect(page).to have_content('Spam Logs')
spam_log = SpamLog.first expect(page).to have_content spam_log.source_ip
page.should have_content spam_log.title expect(page).to have_content spam_log.noteable_type
page.should have_content spam_log.description expect(page).to have_content 'N'
page.should have_link("Remove user") expect(page).to have_content spam_log.title
page.should have_link("Block user") expect(page).to have_content truncate(spam_log.description)
expect(page).to have_link('Remove user')
expect(page).to have_link('Block user')
end end
step 'spam logs exist' do step 'spam logs exist' do
create(:spam_log) create(:spam_log)
end end
def spam_log
@spam_log ||= SpamLog.first
end
def truncate(description)
"#{spam_log.description[0...97]}..."
end
end end
...@@ -3,5 +3,9 @@ ...@@ -3,5 +3,9 @@
FactoryGirl.define do FactoryGirl.define do
factory :spam_log do factory :spam_log do
user user
source_ip { FFaker::Internet.ip_v4_address }
noteable_type 'Issue'
title { FFaker::Lorem.sentence }
description { FFaker::Lorem.paragraph(5) }
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