OpenCloud
/
mastodon
mirror of https://github.com/tootsuite/mastodon
1
1
Fork 0
Code Issues Releases Wiki Activity

Small rubocop offences removed

pull/69/head
Eugen Rochko 2016-09-18 13:42:24 +02:00
parent af375b5bac
commit 9863196f7b
2 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
app/services/process_mentions_service.rb
View File

@ -14,6 +14,7 @@ class ProcessMentionsService < BaseService
begin begin
mentioned_account = follow_remote_account_service.("#{match.first}") mentioned_account = follow_remote_account_service.("#{match.first}")
rescue Goldfinger::Error, HTTP::Error rescue Goldfinger::Error, HTTP::Error
mentioned_account = nil
end end
end end

4
spec/controllers/accounts_controller_spec.rb
View File

@ -8,10 +8,10 @@ RSpec.describe AccountsController, type: :controller do
describe 'GET #show' do describe 'GET #show' do
before do before do
status1 = Status.create!(account: alice, text: 'Hello world') 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 = Status.create!(account: alice, text: 'Picture!')
status3.media_attachments.create!(account: alice, file: fixture_file_upload('files/attachment.jpg', 'image/jpeg')) 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 end
context 'atom' do context 'atom' do