diff --git a/Gemfile.lock b/Gemfile.lock index 1fa396d3..ffd8bb99 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -181,7 +181,7 @@ GEM matrix (0.4.2) method_source (1.0.0) mini_mime (1.1.5) - minitest (5.19.0) + minitest (5.20.0) msgpack (1.6.0) mysql2 (0.5.5) net-imap (0.3.7) @@ -203,8 +203,8 @@ GEM racc (~> 1.4) orm_adapter (0.5.0) pagy (6.0.1) - paper_trail (14.0.0) - activerecord (>= 6.0) + paper_trail (15.1.0) + activerecord (>= 6.1) request_store (~> 1.4) parallel (1.22.1) parser (3.2.0.0) @@ -379,10 +379,11 @@ GEM websocket-extensions (0.1.5) xpath (3.2.0) nokogiri (~> 1.8) - zeitwerk (2.6.11) + zeitwerk (2.6.12) PLATFORMS x86_64-darwin-21 + x86_64-darwin-22 x86_64-linux DEPENDENCIES diff --git a/config/application.rb b/config/application.rb index 42925044..7f79f455 100644 --- a/config/application.rb +++ b/config/application.rb @@ -20,5 +20,6 @@ class Application < Rails::Application # -- all .rb files in that directory are automatically loaded after loading # the framework and any gems in your application. config.active_job.queue_adapter = :inline + config.active_record.yaml_column_permitted_classes = [ActiveSupport::TimeWithZone, Time, ActiveSupport::TimeZone] end end diff --git a/spec/features/end_to_end_spec.rb b/spec/features/end_to_end_spec.rb index ce27f8db..a9883b6b 100644 --- a/spec/features/end_to_end_spec.rb +++ b/spec/features/end_to_end_spec.rb @@ -402,5 +402,17 @@ expect(page).to have_content('Haritha Vytla deleted the in house repair record') expect(page).to_not have_content('Haritha Vytla created the treatment report') expect(page).to have_content('Haritha Vytla updated the treatment report') + + # Check that details page shows diff data + visit conservation_records_path + click_link(conservation_record.title, match: :prefer_exact) + fill_in 'treatment_report_description_binding', with: 'Half leather tightjoint, tight back binding' + click_button('Save Treatment Report') + expect(page).to have_content('Treatment Record updated successfully!') + visit activity_index_path + expect(page).to have_content('Haritha Vytla updated the treatment report') + first('tr').click_link('Details') + expect(page).to have_content('Full leather tightjoint, tight back binding') + expect(page).to have_content('Half leather tightjoint, tight back binding') end end