From c06723ee715512c2033c7786c48f15674585b56b Mon Sep 17 00:00:00 2001 From: erdgeist Date: Fri, 26 Jun 2026 01:59:57 +0200 Subject: Stage 4: Rails 5.2 -> 6.1 on Ruby 2.7.2 - routing-filter 0.6.3 -> 0.7.0 (Rails 6.1 compatibility) - RSS named routes rss_xml/rss_rdf added - RouteWithParams workarounds: will_paginate_patch, content_path shim, safe_path helper - Paperclip removed, replaced with FileAttachment concern (preserves URL scheme) - Assets resource moved to /admin/assets (Sprockets middleware conflict) - ApplicationRecord base class added, all models migrated - Strong parameters added to Assets, Occurrences, Events, MenuItems controllers - update_attributes -> update throughout - render :nothing -> head :ok/:not_found throughout - language_selector rewritten (removes :overwrite_params) - Environment files updated for Rails 6.1 (eager_load, public_file_server, ActionMailer) - Arel::Visitors::DepthFirst and Integer/Float duration patches removed from test_helper - AssetsController tests added (10 tests covering upload, variants, destroy, auth) - ImageMagick geometry: 460x250! for headline crop (not # which is invalid in IM6) 129 runs, 311 assertions, 5 failures (all pre-existing), 0 errors --- test/models/page_test.rb | 2 +- test/models/user_test.rb | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) (limited to 'test/models') diff --git a/test/models/page_test.rb b/test/models/page_test.rb index 8b34399..afba8b5 100644 --- a/test/models/page_test.rb +++ b/test/models/page_test.rb @@ -120,7 +120,7 @@ class PageTest < ActiveSupport::TestCase english = page.translations.select {|x| x.locale == :en}.first Page::Translation.record_timestamps = false - english.update_attributes(:updated_at => (Time.now+25.hours)) + english.update(:updated_at => (Time.now+25.hours)) Page::Translation.record_timestamps = true assert_equal 1, Page.find_with_outdated_translations.count diff --git a/test/models/user_test.rb b/test/models/user_test.rb index bd5d059..6e4d2d7 100644 --- a/test/models/user_test.rb +++ b/test/models/user_test.rb @@ -42,12 +42,12 @@ class UserTest < ActiveSupport::TestCase end def test_should_reset_password - users(:quentin).update_attributes(:password => 'new password', :password_confirmation => 'new password') + users(:quentin).update(:password => 'new password', :password_confirmation => 'new password') assert_equal users(:quentin), User.authenticate('quentin', 'new password') end def test_should_not_rehash_password - users(:quentin).update_attributes(:login => 'quentin2') + users(:quentin).update(:login => 'quentin2') assert_equal users(:quentin), User.authenticate('quentin2', 'monkey') end -- cgit v1.3