summaryrefslogtreecommitdiff
path: root/test/models
diff options
context:
space:
mode:
authorerdgeist <erdgeist@erdgeist.org>2026-06-26 01:59:57 +0200
committererdgeist <erdgeist@erdgeist.org>2026-06-26 01:59:57 +0200
commitc06723ee715512c2033c7786c48f15674585b56b (patch)
tree46d074bde9a4fc61f0a76cbc601007ed4412ec61 /test/models
parent0818a3057b0a91e422158d828026c941b4e10622 (diff)
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
Diffstat (limited to 'test/models')
-rw-r--r--test/models/page_test.rb2
-rw-r--r--test/models/user_test.rb4
2 files changed, 3 insertions, 3 deletions
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
120 120
121 english = page.translations.select {|x| x.locale == :en}.first 121 english = page.translations.select {|x| x.locale == :en}.first
122 Page::Translation.record_timestamps = false 122 Page::Translation.record_timestamps = false
123 english.update_attributes(:updated_at => (Time.now+25.hours)) 123 english.update(:updated_at => (Time.now+25.hours))
124 Page::Translation.record_timestamps = true 124 Page::Translation.record_timestamps = true
125 assert_equal 1, Page.find_with_outdated_translations.count 125 assert_equal 1, Page.find_with_outdated_translations.count
126 126
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
42 end 42 end
43 43
44 def test_should_reset_password 44 def test_should_reset_password
45 users(:quentin).update_attributes(:password => 'new password', :password_confirmation => 'new password') 45 users(:quentin).update(:password => 'new password', :password_confirmation => 'new password')
46 assert_equal users(:quentin), User.authenticate('quentin', 'new password') 46 assert_equal users(:quentin), User.authenticate('quentin', 'new password')
47 end 47 end
48 48
49 def test_should_not_rehash_password 49 def test_should_not_rehash_password
50 users(:quentin).update_attributes(:login => 'quentin2') 50 users(:quentin).update(:login => 'quentin2')
51 assert_equal users(:quentin), User.authenticate('quentin2', 'monkey') 51 assert_equal users(:quentin), User.authenticate('quentin2', 'monkey')
52 end 52 end
53 53