Imports controller errors (#1553)

* Add spec for settings/imports controller

* Add failing spec for settings/imports#create

* Fix broken imports

* Refactor ImportWorker
rebase/4.0.0rc2
Matt Jankowski 2017-04-11 15:40:14 -04:00 committed by Eugen
parent 9f7ea77d0c
commit 89e8e110c8
3 changed files with 70 additions and 19 deletions

View File

@ -4,32 +4,41 @@ require 'csv'
class ImportWorker
include Sidekiq::Worker
sidekiq_options queue: 'pull', retry: false
def perform(import_id)
import = Import.find(import_id)
attr_reader :import
case import.type
def perform(import_id)
@import = Import.find(import_id)
case @import.type
when 'blocking'
process_blocks(import)
process_blocks
when 'following'
process_follows(import)
process_follows
end
import.destroy
@import.destroy
end
private
def process_blocks(import)
from_account = import.account
def from_account
@import.account
end
CSV.new(open(import.data.url)).each do |row|
next if row.size != 1
def import_contents
Paperclip.io_adapters.for(@import.data).read
end
def import_rows
CSV.new(import_contents).reject(&:blank?)
end
def process_blocks
import_rows.each do |row|
begin
target_account = FollowRemoteAccountService.new.call(row[0])
target_account = FollowRemoteAccountService.new.call(row.first)
next if target_account.nil?
BlockService.new.call(from_account, target_account)
rescue Goldfinger::Error, HTTP::Error, OpenSSL::SSL::SSLError
@ -38,14 +47,10 @@ class ImportWorker
end
end
def process_follows(import)
from_account = import.account
CSV.new(open(import.data.url)).each do |row|
next if row.size != 1
def process_follows
import_rows.each do |row|
begin
FollowService.new.call(from_account, row[0])
FollowService.new.call(from_account, row.first)
rescue Mastodon::NotPermittedError, ActiveRecord::RecordNotFound, Goldfinger::Error, HTTP::Error, OpenSSL::SSL::SSLError
next
end

View File

@ -0,0 +1,43 @@
require 'rails_helper'
RSpec.describe Settings::ImportsController, type: :controller do
before do
sign_in Fabricate(:user), scope: :user
end
describe "GET #show" do
it "returns http success" do
get :show
expect(response).to have_http_status(:success)
end
end
describe 'POST #create' do
it 'redirects to settings path with successful following import' do
service = double(call: nil)
allow(FollowRemoteAccountService).to receive(:new).and_return(service)
post :create, params: {
import: {
type: 'following',
data: fixture_file_upload('files/imports.txt')
}
}
expect(response).to redirect_to(settings_import_path)
end
it 'redirects to settings path with successful blocking import' do
service = double(call: nil)
allow(FollowRemoteAccountService).to receive(:new).and_return(service)
post :create, params: {
import: {
type: 'blocking',
data: fixture_file_upload('files/imports.txt')
}
}
expect(response).to redirect_to(settings_import_path)
end
end
end

3
spec/fixtures/files/imports.txt vendored Normal file
View File

@ -0,0 +1,3 @@
user@example.com
user@test.com