From 9863196f7bf007aedf5f832a20dcd6f519dbf383 Mon Sep 17 00:00:00 2001
From: Eugen Rochko <eugen@zeonfederated.com>
Date: Sun, 18 Sep 2016 13:42:24 +0200
Subject: [PATCH] Small rubocop offences removed
---
app/services/process_mentions_service.rb | 1 +
spec/controllers/accounts_controller_spec.rb | 4 ++--
2 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/app/services/process_mentions_service.rb b/app/services/process_mentions_service.rb
index 04171cecb..5ea184252 100644
--- a/app/services/process_mentions_service.rb
+++ b/app/services/process_mentions_service.rb
@@ -14,6 +14,7 @@ class ProcessMentionsService < BaseService
begin
mentioned_account = follow_remote_account_service.("#{match.first}")
rescue Goldfinger::Error, HTTP::Error
+ mentioned_account = nil
end
end
diff --git a/spec/controllers/accounts_controller_spec.rb b/spec/controllers/accounts_controller_spec.rb
index 322b26f0b..34f17a943 100644
--- a/spec/controllers/accounts_controller_spec.rb
+++ b/spec/controllers/accounts_controller_spec.rb
@@ -8,10 +8,10 @@ RSpec.describe AccountsController, type: :controller do
describe 'GET #show' do
before do
status1 = Status.create!(account: alice, text: 'Hello world')
- status2 = Status.create!(account: alice, text: 'Boop', thread: status1)
+ Status.create!(account: alice, text: 'Boop', thread: status1)
status3 = Status.create!(account: alice, text: 'Picture!')
status3.media_attachments.create!(account: alice, file: fixture_file_upload('files/attachment.jpg', 'image/jpeg'))
- status4 = Status.create!(account: alice, text: 'Mentioning @alice')
+ Status.create!(account: alice, text: 'Mentioning @alice')
end
context 'atom' do