commit: 89e8e110c80e2ba18cbf8a862db8bf71e1678543
parent: 9f7ea77d0c2841fc911afe0485c27750b71e68c3
Author: Matt Jankowski <mjankowski@thoughtbot.com>
Date: Tue, 11 Apr 2017 15:40:14 -0400
Imports controller errors (#1553)
* Add spec for settings/imports controller
* Add failing spec for settings/imports#create
* Fix broken imports
* Refactor ImportWorker
Diffstat:
3 files changed, 69 insertions(+), 18 deletions(-)
diff --git a/app/workers/import_worker.rb b/app/workers/import_worker.rb
@@ -4,32 +4,41 @@ require 'csv'
class ImportWorker
include Sidekiq::Worker
-
sidekiq_options queue: 'pull', retry: false
+ attr_reader :import
+
def perform(import_id)
- import = Import.find(import_id)
+ @import = Import.find(import_id)
- case import.type
+ 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
+
+ def import_contents
+ Paperclip.io_adapters.for(@import.data).read
+ end
- CSV.new(open(import.data.url)).each do |row|
- next if row.size != 1
+ 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
diff --git a/spec/controllers/settings/imports_controller_spec.rb b/spec/controllers/settings/imports_controller_spec.rb
@@ -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
diff --git a/spec/fixtures/files/imports.txt b/spec/fixtures/files/imports.txt
@@ -0,0 +1,3 @@
+user@example.com
+
+user@test.com