scinote-eln/scinote-web
1
1
Fork 0
mirror of https://github.com/scinote-eln/scinote-web.git synced 2025-12-10 14:16:28 +08:00
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #2466 from mlorb/ml-sci-4450

Browse source 
Fix bug with date format when importing to inventory [SCI-4450]
This commit is contained in:
mlorb 2020-03-13 15:18:11 +01:00 • committed by GitHub
commit 41ef35d378
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 43 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
app/utilities/repository_import_parser/importer.rb
View file

@ -133,11 +133,10 @@ module RepositoryImportParser
repository_cell_attributes: { repository_row: row[:repository_row],
repository_column: column,
importing: true } }
cell_value = column.data_type.constantize.import_from_text(
value,
cell_value_attributes,
user: @user.as_json
@user.as_json(root: true, only: :settings).deep_symbolize_keys
)
next if cell_value.nil?

42
spec/models/repository_date_time_value_base_spec.rb
View file

@ -39,4 +39,46 @@ describe RepositoryDateTimeValueBase, type: :model do
end
end
end
describe 'self.import_from_text' do
let(:user) { create :user }
let(:date_string1) { '2020-01-22' }
let(:date_string2) { '01-22-2020' }
let(:date_string3) { '01/22/2020' }
let(:test_date) { Date.parse('2020-01-22') }
let(:attributes) { {} }
it 'takes date format from user settings 1' do
user.settings[:date_format] = '%Y-%m-%d'
user.save
result = RepositoryDateTimeValueBase
.import_from_text(date_string1,
attributes,
user.as_json(root: true, only: :settings).deep_symbolize_keys)
expect(result).to respond_to(:data)
expect(result.data).to eq(test_date)
end
it 'takes date format from user settings 2' do
user.settings[:date_format] = '%m-%d-%Y'
user.save
result = RepositoryDateTimeValueBase
.import_from_text(date_string2,
attributes,
user.as_json(root: true, only: :settings).deep_symbolize_keys)
expect(result).to respond_to(:data)
expect(result.data).to eq(test_date)
end
it 'takes default date format when there is no user settings' do
user.settings[:date_format] = nil
user.save
result = RepositoryDateTimeValueBase
.import_from_text(date_string3,
attributes,
user.as_json(root: true, only: :settings).deep_symbolize_keys)
expect(result).to respond_to(:data)
expect(result.data).to eq(test_date)
end
end
end