IntenseWebs/discourse
3
0
Fork 0
mirror of https://github.com/discourse/discourse.git synced 2026-08-11 13:35:20 -05:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #4587 from techAPJ/invite-upload

Browse Source 
FIX: simplify CSV file upload
This commit is contained in:
Arpit Jalan
2016-12-05 14:30:13 +05:30
committed by GitHub
parent ce9f24dec9 ce974da9e5
commit 431aa79bb3
14 changed files with 67 additions and 131 deletions
Download Patch File Download Diff File Expand all files Collapse all files
spec/controllers/invites_controller_spec.rb
+6 -37
View File
@@ -367,33 +367,10 @@ describe InvitesController do
end
context '.check_csv_chunk' do
context '.upload_csv' do
it 'requires you to be logged in' do
expect {
post :check_csv_chunk
}.to raise_error(Discourse::NotLoggedIn)
end
context 'while logged in' do
let(:resumableChunkNumber) { 1 }
let(:resumableCurrentChunkSize) { 46 }
let(:resumableIdentifier) { '46-discoursecsv' }
let(:resumableFilename) { 'discourse.csv' }
it "fails if you can't bulk invite to the forum" do
log_in
post :check_csv_chunk, resumableChunkNumber: resumableChunkNumber, resumableCurrentChunkSize: resumableCurrentChunkSize.to_i, resumableIdentifier: resumableIdentifier, resumableFilename: resumableFilename
expect(response).not_to be_success
end
end
end
context '.upload_csv_chunk' do
it 'requires you to be logged in' do
expect {
post :upload_csv_chunk
xhr :post, :upload_csv
}.to raise_error(Discourse::NotLoggedIn)
end
@@ -402,27 +379,19 @@ describe InvitesController do
let(:file) do
ActionDispatch::Http::UploadedFile.new({ filename: 'discourse.csv', tempfile: csv_file })
end
let(:resumableChunkNumber) { 1 }
let(:resumableChunkSize) { 1048576 }
let(:resumableCurrentChunkSize) { 46 }
let(:resumableTotalSize) { 46 }
let(:resumableType) { 'text/csv' }
let(:resumableIdentifier) { '46-discoursecsv' }
let(:resumableFilename) { 'discourse.csv' }
let(:resumableRelativePath) { 'discourse.csv' }
let(:filename) { 'discourse.csv' }
it "fails if you can't bulk invite to the forum" do
log_in
post :upload_csv_chunk, file: file, resumableChunkNumber: resumableChunkNumber.to_i, resumableChunkSize: resumableChunkSize.to_i, resumableCurrentChunkSize: resumableCurrentChunkSize.to_i, resumableTotalSize: resumableTotalSize.to_i, resumableType: resumableType, resumableIdentifier: resumableIdentifier, resumableFilename: resumableFilename
xhr :post, :upload_csv, file: file, name: filename
expect(response).not_to be_success
end
it "allows admins to bulk invite" do
it "allows admin to bulk invite" do
log_in(:admin)
post :upload_csv_chunk, file: file, resumableChunkNumber: resumableChunkNumber.to_i, resumableChunkSize: resumableChunkSize.to_i, resumableCurrentChunkSize: resumableCurrentChunkSize.to_i, resumableTotalSize: resumableTotalSize.to_i, resumableType: resumableType, resumableIdentifier: resumableIdentifier, resumableFilename: resumableFilename
xhr :post, :upload_csv, file: file, name: filename
expect(response).to be_success
end
end
end
spec/jobs/bulk_invite_spec.rb
+2 -9
View File
@@ -5,15 +5,8 @@ describe Jobs::BulkInvite do
context '.execute' do
it 'raises an error when the filename is missing' do
expect { Jobs::BulkInvite.new.execute(identifier: '46-discoursecsv', chunks: '1') }.to raise_error(Discourse::InvalidParameters)
end
it 'raises an error when the identifier is missing' do
expect { Jobs::BulkInvite.new.execute(filename: 'discourse.csv', chunks: '1') }.to raise_error(Discourse::InvalidParameters)
end
it 'raises an error when the chunks is missing' do
expect { Jobs::BulkInvite.new.execute(filename: 'discourse.csv', identifier: '46-discoursecsv') }.to raise_error(Discourse::InvalidParameters)
user = Fabricate(:user)
expect { Jobs::BulkInvite.new.execute(current_user_id: user.id) }.to raise_error(Discourse::InvalidParameters)
end
context '.read_csv_file' do