aboutsummaryrefslogtreecommitdiffstats
path: root/activerecord
diff options
context:
space:
mode:
authorRafael Mendonça França <rafaelmfranca@gmail.com>2013-03-28 07:58:57 -0700
committerRafael Mendonça França <rafaelmfranca@gmail.com>2013-03-28 07:58:57 -0700
commit9802cbe1f3c384bc2e5e30ea801193a2b77989f9 (patch)
tree841106e4a3055d06110ee5d2e7b115911c746d56 /activerecord
parent15d97117e263b68e0fc936291124ea826d1e1cab (diff)
parentcec034396584df907fa00738e9c4326f70b16388 (diff)
downloadrails-9802cbe1f3c384bc2e5e30ea801193a2b77989f9.tar.gz
rails-9802cbe1f3c384bc2e5e30ea801193a2b77989f9.tar.bz2
rails-9802cbe1f3c384bc2e5e30ea801193a2b77989f9.zip
Merge pull request #9972 from divineforest/fix-overriden-typo
Fix typo: overriden => overriDDen
Diffstat (limited to 'activerecord')
-rw-r--r--activerecord/lib/active_record/core.rb4
-rw-r--r--activerecord/test/cases/base_test.rb2
-rw-r--r--activerecord/test/cases/dup_test.rb2
-rw-r--r--activerecord/test/cases/relation_scoping_test.rb2
4 files changed, 5 insertions, 5 deletions
diff --git a/activerecord/lib/active_record/core.rb b/activerecord/lib/active_record/core.rb
index 1ed05c1bd4..db5e7b82ca 100644
--- a/activerecord/lib/active_record/core.rb
+++ b/activerecord/lib/active_record/core.rb
@@ -78,7 +78,7 @@ module ActiveRecord
self.disable_implicit_join_references = false
class_attribute :default_connection_handler, instance_writer: false
-
+
def self.connection_handler
Thread.current[:active_record_connection_handler] || self.default_connection_handler
end
@@ -444,7 +444,7 @@ module ActiveRecord
end
def init_changed_attributes
- # Intentionally avoid using #column_defaults since overriden defaults (as is done in
+ # Intentionally avoid using #column_defaults since overridden defaults (as is done in
# optimistic locking) won't get written unless they get marked as changed
self.class.columns.each do |c|
attr, orig_value = c.name, c.default
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