Skip to content

Commit

Permalink
fix error preventing activity log diff
Browse files Browse the repository at this point in the history
  • Loading branch information
crowesn committed Nov 30, 2023
1 parent dac33e7 commit 16e8f2e
Show file tree
Hide file tree
Showing 3 changed files with 18 additions and 4 deletions.
9 changes: 5 additions & 4 deletions Gemfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand All @@ -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)
Expand Down Expand Up @@ -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
Expand Down
1 change: 1 addition & 0 deletions config/application.rb
Original file line number Diff line number Diff line change
Expand Up @@ -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
12 changes: 12 additions & 0 deletions spec/features/end_to_end_spec.rb
Original file line number Diff line number Diff line change
Expand Up @@ -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

0 comments on commit 16e8f2e

Please # to comment.