Merge pull request #9972 from divineforest/fix-overriden-typo

Fix typo: overriden => overriDDen

3 files changed, 3 insertions, 3 deletions

diff --git a/activerecord/test/cases/base_test.rb b/activerecord/test/cases/base_test.rb
index 69eef500f5..08223902c7 100644
--- a/activerecord/test/cases/base_test.rb
+++ b/activerecord/test/cases/base_test.rb
@@ -1579,7 +1579,7 @@ class BasicsTest < ActiveRecord::TestCase
     assert_equal ['foo'], klass.all.merge!(select: 'foo').select_values
   end
 
-  test "connection_handler can be overriden" do
+  test "connection_handler can be overridden" do
     klass = Class.new(ActiveRecord::Base)
     orig_handler = klass.connection_handler
     new_handler = ActiveRecord::ConnectionAdapters::ConnectionHandler.new
diff --git a/activerecord/test/cases/dup_test.rb b/activerecord/test/cases/dup_test.rb
index dbf6005a67..f73e449610 100644
--- a/activerecord/test/cases/dup_test.rb
+++ b/activerecord/test/cases/dup_test.rb
@@ -128,7 +128,7 @@ module ActiveRecord
       prev_default_scopes = Topic.default_scopes
       Topic.default_scopes = [Topic.where(:approved => true)]
       topic = Topic.new(:approved => false)
-      assert !topic.dup.approved?, "should not be overriden by default scopes"
+      assert !topic.dup.approved?, "should not be overridden by default scopes"
     ensure
       Topic.default_scopes = prev_default_scopes
     end
diff --git a/activerecord/test/cases/relation_scoping_test.rb b/activerecord/test/cases/relation_scoping_test.rb
index 6cd89b6227..e2af66ff9d 100644
--- a/activerecord/test/cases/relation_scoping_test.rb
+++ b/activerecord/test/cases/relation_scoping_test.rb
@@ -293,7 +293,7 @@ class HasManyScopingTest< ActiveRecord::TestCase
     assert_equal [magician], people(:michael).bad_references
   end
 
-  def test_should_default_scope_on_associations_is_overriden_by_association_conditions
+  def test_should_default_scope_on_associations_is_overridden_by_association_conditions
     reference = references(:michael_unicyclist).becomes(BadReference)
     assert_equal [reference], people(:michael).fixed_bad_references
   end