diff options
author | José Valim <jose.valim@gmail.com> | 2009-07-21 12:51:53 +0200 |
---|---|---|
committer | José Valim <jose.valim@gmail.com> | 2009-07-21 12:51:53 +0200 |
commit | 33048b6e2738ff73b612dbcb35955189221dfbd0 (patch) | |
tree | 7e32f6031199c1e7ee9a3e5a15789b5f568a565d /activerecord/test/cases/base_test.rb | |
parent | edda0bfe76fc9b2adcdb705665aaef2769e6ef03 (diff) | |
parent | 9d7aae710384fb5f04129c35b86c5ea5fb9d83a9 (diff) | |
download | rails-33048b6e2738ff73b612dbcb35955189221dfbd0.tar.gz rails-33048b6e2738ff73b612dbcb35955189221dfbd0.tar.bz2 rails-33048b6e2738ff73b612dbcb35955189221dfbd0.zip |
Solving merge conflicts.
Diffstat (limited to 'activerecord/test/cases/base_test.rb')
-rwxr-xr-x | activerecord/test/cases/base_test.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/activerecord/test/cases/base_test.rb b/activerecord/test/cases/base_test.rb index f9ac37cc87..e47f898485 100755 --- a/activerecord/test/cases/base_test.rb +++ b/activerecord/test/cases/base_test.rb @@ -2026,7 +2026,7 @@ class BasicsTest < ActiveRecord::TestCase def test_inspect_instance topic = topics(:first) - assert_equal %(#<Topic id: 1, title: "The First Topic", author_name: "David", author_email_address: "david@loudthinking.com", written_on: "#{topic.written_on.to_s(:db)}", bonus_time: "#{topic.bonus_time.to_s(:db)}", last_read: "#{topic.last_read.to_s(:db)}", content: "Have a nice day", approved: false, replies_count: 1, parent_id: nil, type: nil>), topic.inspect + assert_equal %(#<Topic id: 1, title: "The First Topic", author_name: "David", author_email_address: "david@loudthinking.com", written_on: "#{topic.written_on.to_s(:db)}", bonus_time: "#{topic.bonus_time.to_s(:db)}", last_read: "#{topic.last_read.to_s(:db)}", content: "Have a nice day", approved: false, replies_count: 1, parent_id: nil, parent_title: nil, type: nil>), topic.inspect end def test_inspect_new_instance |