Skip to content
This repository was archived by the owner on Jul 27, 2025. It is now read-only.
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion app/controllers/import/uploads_controller.rb
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ def csv_valid?(str)
require "csv"

begin
csv = CSV.parse(str || "", headers: true)
csv = CSV.parse(str || "", headers: true, col_sep: upload_params[:col_sep])
return false if csv.headers.empty?
return false if csv.count == 0
true
Expand Down
9 changes: 6 additions & 3 deletions test/controllers/import/uploads_controller_test.rb
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,8 @@ class Import::UploadsControllerTest < ActionDispatch::IntegrationTest
test "uploads valid csv by copy and pasting" do
patch import_upload_url(@import), params: {
import: {
raw_file_str: file_fixture("imports/valid.csv").read
raw_file_str: file_fixture("imports/valid.csv").read,
col_sep: ","
}
}

Expand All @@ -25,7 +26,8 @@ class Import::UploadsControllerTest < ActionDispatch::IntegrationTest
test "uploads valid csv by file" do
patch import_upload_url(@import), params: {
import: {
csv_file: file_fixture_upload("imports/valid.csv")
csv_file: file_fixture_upload("imports/valid.csv"),
col_sep: ","
}
}

Expand All @@ -36,7 +38,8 @@ class Import::UploadsControllerTest < ActionDispatch::IntegrationTest
test "invalid csv cannot be uploaded" do
patch import_upload_url(@import), params: {
import: {
csv_file: file_fixture_upload("imports/invalid.csv")
csv_file: file_fixture_upload("imports/invalid.csv"),
col_sep: ","
}
}

Expand Down