diff options
| -rw-r--r-- | activerecord/CHANGELOG | 2 | ||||
| -rwxr-xr-x | activerecord/test/fixtures_test.rb | 12 |
2 files changed, 6 insertions, 8 deletions
diff --git a/activerecord/CHANGELOG b/activerecord/CHANGELOG index d9af0c2157..ecad62c038 100644 --- a/activerecord/CHANGELOG +++ b/activerecord/CHANGELOG @@ -1,5 +1,7 @@ *SVN* +* Fixed that Base.save should always return false if the save didn't succeed, including if it has halted by before_save's #1861, #2477 [DHH] + * Speed up class -> connection caching and stale connection verification. #3979 [Stefan Kaes] * Add set_fixture_class to allow the use of table name accessors with models which use set_table_name. [Kevin Clark] diff --git a/activerecord/test/fixtures_test.rb b/activerecord/test/fixtures_test.rb index 72cb977c87..a57232e315 100755 --- a/activerecord/test/fixtures_test.rb +++ b/activerecord/test/fixtures_test.rb @@ -172,19 +172,15 @@ class FixturesTest < Test::Unit::TestCase end end - def test_non_yml_file_in_subdirectory - assert_equal(categories(:sub_special_1).name, "A special category") - assert_equal(categories(:sub_special_1).class, SpecialCategory) - end def test_yml_file_in_subdirectory - assert_equal(categories(:sub_special_3).name, "A special category in a .yml file") - assert_equal(categories(:sub_special_3).class, SpecialCategory) + assert_equal(categories(:sub_special_1).name, "A special category in a subdir file") + assert_equal(categories(:sub_special_1).class, SpecialCategory) end def test_subsubdir_file_with_arbitrary_name - assert_equal(categories(:sub_special_5).name, "A special category in an arbitrarily named subsubdir file") - assert_equal(categories(:sub_special_5).class, SpecialCategory) + assert_equal(categories(:sub_special_3).name, "A special category in an arbitrarily named subsubdir file") + assert_equal(categories(:sub_special_3).class, SpecialCategory) end |