From 89e8e110c80e2ba18cbf8a862db8bf71e1678543 Mon Sep 17 00:00:00 2001 From: Matt Jankowski Date: Tue, 11 Apr 2017 15:40:14 -0400 Subject: Imports controller errors (#1553) * Add spec for settings/imports controller * Add failing spec for settings/imports#create * Fix broken imports * Refactor ImportWorker --- .../settings/imports_controller_spec.rb | 43 ++++++++++++++++++++++ spec/fixtures/files/imports.txt | 3 ++ 2 files changed, 46 insertions(+) create mode 100644 spec/controllers/settings/imports_controller_spec.rb create mode 100644 spec/fixtures/files/imports.txt (limited to 'spec') diff --git a/spec/controllers/settings/imports_controller_spec.rb b/spec/controllers/settings/imports_controller_spec.rb new file mode 100644 index 000000000..d57350a14 --- /dev/null +++ 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 new file mode 100644 index 000000000..dac295c4d --- /dev/null +++ b/spec/fixtures/files/imports.txt @@ -0,0 +1,3 @@ +user@example.com + +user@test.com -- cgit