The personal finance app for everyone
Allow custom column separator for CSV parsing in uploads controller (#1470)
Alex9cc9f42bdc03
diff --git a/app/controllers/import/uploads_controller.rb b/app/controllers/import/uploads_controller.rbindex e89988ac..f3c65d6e 100644--- a/app/controllers/import/uploads_controller.rb+++ b/app/controllers/import/uploads_controller.rb@@ -32,7 +32,7 @@ class Import::UploadsController < ApplicationControllerrequire "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 == 0truediff --git a/test/controllers/import/uploads_controller_test.rb b/test/controllers/import/uploads_controller_test.rbindex 75db3c4a..eb7f418b 100644--- a/test/controllers/import/uploads_controller_test.rb+++ b/test/controllers/import/uploads_controller_test.rb@@ -14,7 +14,8 @@ class Import::UploadsControllerTest < ActionDispatch::IntegrationTesttest "uploads valid csv by copy and pasting" dopatch 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: ","}}@@ -25,7 +26,8 @@ class Import::UploadsControllerTest < ActionDispatch::IntegrationTesttest "uploads valid csv by file" dopatch import_upload_url(@import), params: {import: {- csv_file: file_fixture_upload("imports/valid.csv")+ csv_file: file_fixture_upload("imports/valid.csv"),+ col_sep: ","}}@@ -36,7 +38,8 @@ class Import::UploadsControllerTest < ActionDispatch::IntegrationTesttest "invalid csv cannot be uploaded" dopatch import_upload_url(@import), params: {import: {- csv_file: file_fixture_upload("imports/invalid.csv")+ csv_file: file_fixture_upload("imports/invalid.csv"),+ col_sep: ","}}