FIX: use hijack for processing bulk invites (#7679)

FIX: do not store bulk invite CSV file on server
This commit is contained in:
Arpit Jalan
2019-06-04 20:19:46 +05:30
committed by GitHub
parent ecc9c76692
commit e7fe7010b8
6 changed files with 52 additions and 75 deletions

View File

@@ -1,2 +0,0 @@
test2@discourse.org
test@discourse.org,GROUP1;group2,999
1 test2 discourse.org
2 test discourse.org,GROUP1;group2,999

View File

@@ -10,30 +10,22 @@ describe Jobs::BulkInvite do
fab!(:group2) { Fabricate(:group, name: 'group2') }
fab!(:topic) { Fabricate(:topic, id: 999) }
let(:email) { "test@discourse.org" }
let(:basename) { "bulk_invite.csv" }
let(:filename) { "#{Invite.base_directory}/#{basename}" }
let(:invites) { [{ email: 'test2@discourse.org' }, { email: 'test@discourse.org', groups: 'GROUP1;group2', topic_id: 999 }] }
before do
Invite.create_csv(
fixture_file_upload("#{Rails.root}/spec/fixtures/csv/#{basename}"),
"bulk_invite"
)
end
it 'raises an error when the filename is missing' do
it 'raises an error when the invites array is missing' do
expect { Jobs::BulkInvite.new.execute(current_user_id: user.id) }
.to raise_error(Discourse::InvalidParameters, /filename/)
.to raise_error(Discourse::InvalidParameters, /invites/)
end
it 'raises an error when current_user_id is not valid' do
expect { Jobs::BulkInvite.new.execute(filename: filename) }
expect { Jobs::BulkInvite.new.execute(invites: invites) }
.to raise_error(Discourse::InvalidParameters, /current_user_id/)
end
it 'creates the right invites' do
described_class.new.execute(
current_user_id: admin.id,
filename: basename,
invites: invites
)
invite = Invite.last
@@ -53,7 +45,7 @@ describe Jobs::BulkInvite do
described_class.new.execute(
current_user_id: admin.id,
filename: basename,
invites: invites
)
invite = Invite.last
@@ -70,7 +62,7 @@ describe Jobs::BulkInvite do
described_class.new.execute(
current_user_id: user.id,
filename: basename
invites: invites
)
invite = Invite.last
@@ -90,7 +82,7 @@ describe Jobs::BulkInvite do
expect do
described_class.new.execute(
current_user_id: admin.id,
filename: basename
invites: invites
)
end.to change { Invite.count }.by(1)