diff options
| -rw-r--r-- | app/models/import.rb | 1 | ||||
| -rw-r--r-- | test/fixtures/files/import_dates_ja.csv | 2 | ||||
| -rw-r--r-- | test/unit/issue_import_test.rb | 9 |
3 files changed, 12 insertions, 0 deletions
diff --git a/app/models/import.rb b/app/models/import.rb index b6336ae04..102bcde73 100644 --- a/app/models/import.rb +++ b/app/models/import.rb @@ -33,6 +33,7 @@ class Import < ActiveRecord::Base '%Y-%m-%d', '%d/%m/%Y', '%m/%d/%Y', + '%Y/%m/%d', '%d.%m.%Y', '%d-%m-%Y' ] diff --git a/test/fixtures/files/import_dates_ja.csv b/test/fixtures/files/import_dates_ja.csv new file mode 100644 index 000000000..154c94d0b --- /dev/null +++ b/test/fixtures/files/import_dates_ja.csv @@ -0,0 +1,2 @@ +subject;start +Date in %Y/%m/%d format;2019/05/28; diff --git a/test/unit/issue_import_test.rb b/test/unit/issue_import_test.rb index eb0cef006..7f66481fc 100644 --- a/test/unit/issue_import_test.rb +++ b/test/unit/issue_import_test.rb @@ -215,6 +215,15 @@ class IssueImportTest < ActiveSupport::TestCase assert_equal Date.parse('2015-07-10'), issue.start_date assert_equal Date.parse('2015-08-12'), issue.due_date assert_equal '2015-07-14', issue.custom_field_value(field) + + # Tests using other date formats + import = generate_import_with_mapping('import_dates_ja.csv') + import.settings.merge!('date_format' => Import::DATE_FORMATS[3]) + import.mapping.merge!('tracker' => 'value:1', 'subject' => '0', 'start_date' => '1') + import.save! + + issue = new_record(Issue) { import.run } + assert_equal Date.parse('2019-05-28'), issue.start_date end def test_date_format_should_default_to_user_language |