Permalink
Browse files

Merge pull request #16491 from akshay-vishnoi/doc-changes

[ci skip] fix spelling of overridden
  • Loading branch information...
2 parents bf0a679 + 12ce5b1 commit 80cee184acfa9cc831a20aca7be13d3bc8dcf845 @senny senny committed Aug 13, 2014
@@ -640,7 +640,7 @@ class RequestProtocol < BaseRequestTest
class RequestMethod < BaseRequestTest
test "method returns environment's request method when it has not been
- overriden by middleware".squish do
+ overridden by middleware".squish do
ActionDispatch::Request::HTTP_METHODS.each do |method|
request = stub_request('REQUEST_METHOD' => method)
@@ -69,8 +69,8 @@ def changed?(old_value, new_value, _new_value_before_type_cast)
end
# Determines whether the mutable value has been modified since it was
- # read. Returns +false+ by default. This method should not need to be
- # overriden directly. Types which return a mutable value should include
+ # read. Returns +false+ by default. This method should not be overridden
+ # directly. Types which return a mutable value should include
# +Type::Mutable+, which will define this method.
def changed_in_place?(*)
false
@@ -150,7 +150,7 @@ def test_mysql_set_session_variable
end
end
- def test_mysql_sql_mode_variable_overides_strict_mode
+ def test_mysql_sql_mode_variable_overrides_strict_mode
run_without_connection do |orig_connection|
ActiveRecord::Base.establish_connection(orig_connection.deep_merge(variables: { 'sql_mode' => 'ansi' }))
result = ActiveRecord::Base.connection.exec_query 'SELECT @@SESSION.sql_mode'
@@ -76,7 +76,7 @@ def test_mysql_set_session_variable
end
end
- def test_mysql_sql_mode_variable_overides_strict_mode
+ def test_mysql_sql_mode_variable_overrides_strict_mode
run_without_connection do |orig_connection|
ActiveRecord::Base.establish_connection(orig_connection.deep_merge(variables: { 'sql_mode' => 'ansi' }))
result = ActiveRecord::Base.connection.exec_query 'SELECT @@SESSION.sql_mode'

0 comments on commit 80cee18

Please sign in to comment.