From e0a7e0fec760ba12c8067a37e10c96f1f05876e2 Mon Sep 17 00:00:00 2001 From: erdgeist Date: Wed, 24 Jun 2026 04:13:16 +0200 Subject: Stage 1 complete: Rails 2.3.5 to Rails 3.2.22.5 upgrade - Converted plugins to gems (Gemfile) - Updated config structure (application.rb, boot.rb, environment.rb) - Converted routes to Rails 3 DSL - Converted named_scope to scope throughout models - Converted find(:all, :conditions) to where() chains - Fixed has_many :order to use ordering scope - Updated session store and secret token configuration - Fixed exception_notification middleware configuration - Patched Ruby 2.4 / Rails 3.2 incompatibilities: - Integer/Float duration arithmetic (ActiveSupport) - Arel visit_Integer for PostgreSQL adapter - create_database String/Integer coercion - ActionController consider_all_requests_local - Migrated taggings schema for acts-as-taggable-on - Replaced dynamic_form gem with custom form_error_messages helper - Fixed Rails 3 block helper syntax (form_for, form_tag, fields_for) - Fixed admin layout yield - Updated test suite for Rails 3 APIs --- test/unit/page_test.rb | 2 +- test/unit/user_test.rb | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) (limited to 'test/unit') diff --git a/test/unit/page_test.rb b/test/unit/page_test.rb index 099b79d..401d777 100644 --- a/test/unit/page_test.rb +++ b/test/unit/page_test.rb @@ -118,7 +118,7 @@ class PageTest < ActiveSupport::TestCase assert_equal 2, page.translations.size assert_equal 0, Page.find_with_outdated_translations.size - english = *page.translations.select {|x| x.locale == :en} + english = page.translations.select {|x| x.locale == :en}.first Page::Translation.record_timestamps = false english.update_attributes(:updated_at => (Time.now+25.hours)) Page::Translation.record_timestamps = true diff --git a/test/unit/user_test.rb b/test/unit/user_test.rb index 47e3129..bd5d059 100644 --- a/test/unit/user_test.rb +++ b/test/unit/user_test.rb @@ -16,28 +16,28 @@ class UserTest < ActiveSupport::TestCase def test_should_require_login assert_no_difference 'User.count' do u = create_user(:login => nil) - assert u.errors.on(:login) + assert u.errors[:login].any? end end def test_should_require_password assert_no_difference 'User.count' do u = create_user(:password => nil) - assert u.errors.on(:password) + assert u.errors[:password].any? end end def test_should_require_password_confirmation assert_no_difference 'User.count' do u = create_user(:password_confirmation => nil) - assert u.errors.on(:password_confirmation) + assert u.errors[:password_confirmation].any? end end def test_should_require_email assert_no_difference 'User.count' do u = create_user(:email => nil) - assert u.errors.on(:email) + assert u.errors[:email].any? end end -- cgit v1.3