Commit 2558ae8a authored by maeda's avatar maeda

Fix: ImportsControllerTest fails with csv gem 1.0.2 (#28689).

Patch by Go MAEDA.


git-svn-id: https://svn.redmine.org/redmine/trunk@17326 e93f8b46-1217-0410-a6f0-8f06a7374b81
parent 698b8a0b
......@@ -13,7 +13,7 @@ gem "roadie-rails", "~> 1.2.1"
gem "roadie", "~> 3.2.1"
gem "mimemagic"
gem "mail", "~> 2.6.4"
gem "csv", "~> 1.0.1" if RUBY_VERSION >= "2.5"
gem "csv", "~> 1.0.2" if RUBY_VERSION >= "2.3"
gem "nokogiri", "~> 1.8.0"
gem "i18n", "~> 0.7.0"
......
......@@ -50,10 +50,13 @@ class ImportsController < ApplicationController
redirect_to import_mapping_path(@import)
end
rescue CSV::MalformedCSVError => e
flash.now[:error] = l(:error_invalid_csv_file_or_settings)
rescue ArgumentError, EncodingError => e
flash.now[:error] = l(:error_invalid_file_encoding, :encoding => ERB::Util.h(@import.settings['encoding']))
# TODO: Remove ArgumentError when support for Ruby 2.2 is dropped (#28689)
rescue CSV::MalformedCSVError, ArgumentError, EncodingError => e
if e.is_a?(CSV::MalformedCSVError) && e.message !~ /Invalid byte sequence/
flash.now[:error] = l(:error_invalid_csv_file_or_settings)
else
flash.now[:error] = l(:error_invalid_file_encoding, :encoding => ERB::Util.h(@import.settings['encoding']))
end
rescue SystemCallError => e
flash.now[:error] = l(:error_can_not_read_import_file)
end
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment