diff options
Diffstat (limited to 'activerecord/test')
| -rw-r--r-- | activerecord/test/cases/calculations_test.rb | 8 | ||||
| -rw-r--r-- | activerecord/test/cases/invalid_date_test.rb | 24 |
2 files changed, 32 insertions, 0 deletions
diff --git a/activerecord/test/cases/calculations_test.rb b/activerecord/test/cases/calculations_test.rb index 7e7beefb77..14987183eb 100644 --- a/activerecord/test/cases/calculations_test.rb +++ b/activerecord/test/cases/calculations_test.rb @@ -160,6 +160,14 @@ class CalculationsTest < ActiveRecord::TestCase end end + def test_should_calculate_grouped_association_with_foreign_key_option + Account.belongs_to :another_firm, :class_name => 'Firm', :foreign_key => 'firm_id' + c = Account.count(:all, :group => :another_firm) + assert_equal 1, c[companies(:first_firm)] + assert_equal 2, c[companies(:rails_core)] + assert_equal 1, c[companies(:first_client)] + end + def test_should_not_modify_options_when_using_includes options = {:conditions => 'companies.id > 1', :include => :firm} options_copy = options.dup diff --git a/activerecord/test/cases/invalid_date_test.rb b/activerecord/test/cases/invalid_date_test.rb new file mode 100644 index 0000000000..e2bb17c37f --- /dev/null +++ b/activerecord/test/cases/invalid_date_test.rb @@ -0,0 +1,24 @@ +require 'cases/helper' +require 'models/topic' + +class InvalidDateTest < Test::Unit::TestCase + def test_assign_valid_dates + valid_dates = [[2007, 11, 30], [1993, 2, 28], [2008, 2, 29]] + + invalid_dates = [[2007, 11, 31], [1993, 2, 29], [2007, 2, 29]] + + topic = Topic.new + + valid_dates.each do |date_src| + topic = Topic.new("last_read(1i)" => date_src[0].to_s, "last_read(2i)" => date_src[1].to_s, "last_read(3i)" => date_src[2].to_s) + assert_equal(topic.last_read, Date.new(*date_src)) + end + + invalid_dates.each do |date_src| + assert_nothing_raised do + topic = Topic.new({"last_read(1i)" => date_src[0].to_s, "last_read(2i)" => date_src[1].to_s, "last_read(3i)" => date_src[2].to_s}) + assert_equal(topic.last_read, Time.local(*date_src).to_date, "The date should be modified according to the behaviour of the Time object") + end + end + end +end |