aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorCarlos Antonio da Silva <carlosantoniodasilva@gmail.com>2013-11-14 23:25:41 -0200
committerCarlos Antonio da Silva <carlosantoniodasilva@gmail.com>2013-11-14 23:45:30 -0200
commit6b84de457589335754b0cd2f26d620ce93c3de82 (patch)
tree5388c8549f95dadc6caa363db2a8e86d13fff850
parent6cad0e317b766b5c4aacb4b94e930376025a49f9 (diff)
downloadrails-6b84de457589335754b0cd2f26d620ce93c3de82.tar.gz
rails-6b84de457589335754b0cd2f26d620ce93c3de82.tar.bz2
rails-6b84de457589335754b0cd2f26d620ce93c3de82.zip
Fix test name [ci skip]
-rw-r--r--activerecord/lib/active_record/relation.rb2
-rw-r--r--activerecord/test/cases/associations/has_one_associations_test.rb2
2 files changed, 1 insertions, 3 deletions
diff --git a/activerecord/lib/active_record/relation.rb b/activerecord/lib/active_record/relation.rb
index 0227c21489..ff088818ee 100644
--- a/activerecord/lib/active_record/relation.rb
+++ b/activerecord/lib/active_record/relation.rb
@@ -253,8 +253,6 @@ module ActiveRecord
end
end
-
-
# Returns true if there are any records.
def any?
if block_given?
diff --git a/activerecord/test/cases/associations/has_one_associations_test.rb b/activerecord/test/cases/associations/has_one_associations_test.rb
index a7a8e0c5c6..1f78c73f71 100644
--- a/activerecord/test/cases/associations/has_one_associations_test.rb
+++ b/activerecord/test/cases/associations/has_one_associations_test.rb
@@ -509,7 +509,7 @@ class HasOneAssociationsTest < ActiveRecord::TestCase
assert_no_queries { Firm.new.account = account }
end
- def test_has_one_assignment_dont_triggers_save_on_change_of_same_object
+ def test_has_one_assignment_dont_trigger_save_on_change_of_same_object
pirate = Pirate.create!(catchphrase: "Don' botharrr talkin' like one, savvy?")
ship = pirate.build_ship(name: 'old name')
ship.save!