From 82de1eda7c8a8f11b65d8edf70c4af7ce08507ec Mon Sep 17 00:00:00 2001
From: Vipul A M <vipulnsward@gmail.com>
Date: Mon, 25 Nov 2013 23:56:57 +0530
Subject: Fix some minor typos [ci skip]
---
activerecord/CHANGELOG.md | 2 +-
activerecord/test/cases/associations/has_many_associations_test.rb | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/activerecord/CHANGELOG.md b/activerecord/CHANGELOG.md
index 43651c9b48..1114cdb94d 100644
--- a/activerecord/CHANGELOG.md
+++ b/activerecord/CHANGELOG.md
@@ -52,7 +52,7 @@
*Adam Williams*, *Yves Senn*
-* Fix bug where `has_one` associaton record update result in crash, when replaced with itself.
+* Fix bug where `has_one` association record update result in crash, when replaced with itself.
Fixes #12834.
diff --git a/activerecord/test/cases/associations/has_many_associations_test.rb b/activerecord/test/cases/associations/has_many_associations_test.rb
index 359bcfba5f..a025d49fa3 100644
--- a/activerecord/test/cases/associations/has_many_associations_test.rb
+++ b/activerecord/test/cases/associations/has_many_associations_test.rb
@@ -104,7 +104,7 @@ class HasManyAssociationsTest < ActiveRecord::TestCase
car = Car.create(:name => 'honda')
car.funky_bulbs.create!
assert_nothing_raised { car.reload.funky_bulbs.delete_all }
- assert_equal 0, Bulb.count, "bulbs should have been deleted using :delete_all strategey"
+ assert_equal 0, Bulb.count, "bulbs should have been deleted using :delete_all strategy"
end
def test_building_the_associated_object_with_implicit_sti_base_class
--
cgit v1.2.3