aboutsummaryrefslogtreecommitdiffstats
path: root/activerecord
diff options
context:
space:
mode:
authorYves Senn <yves.senn@gmail.com>2015-04-15 13:35:56 +0200
committerYves Senn <yves.senn@gmail.com>2015-04-15 13:35:56 +0200
commitc0939a5038d11ba3b5580ac87dd996cf85c03daa (patch)
treed42368ab562e1fdcf0c65b73f6cb7f9e75a3099e /activerecord
parent5f00ed10dd820b6802168933c2497d17c43c88f5 (diff)
parent6345f31fbfb4a683f98a3d13dc73c20533d0e0b7 (diff)
downloadrails-c0939a5038d11ba3b5580ac87dd996cf85c03daa.tar.gz
rails-c0939a5038d11ba3b5580ac87dd996cf85c03daa.tar.bz2
rails-c0939a5038d11ba3b5580ac87dd996cf85c03daa.zip
Merge pull request #19763 from jonatack/fix-typos-in-docs
Fix typos and improve the documentation
Diffstat (limited to 'activerecord')
-rw-r--r--activerecord/test/cases/connection_management_test.rb2
-rw-r--r--activerecord/test/cases/connection_pool_test.rb4
2 files changed, 3 insertions, 3 deletions
diff --git a/activerecord/test/cases/connection_management_test.rb b/activerecord/test/cases/connection_management_test.rb
index f53c496ecd..bab624b78a 100644
--- a/activerecord/test/cases/connection_management_test.rb
+++ b/activerecord/test/cases/connection_management_test.rb
@@ -110,7 +110,7 @@ module ActiveRecord
assert ActiveRecord::Base.connection_handler.active_connections?
end
- test "proxy is polite to it's body and responds to it" do
+ test "proxy is polite to its body and responds to it" do
body = Class.new(String) { def to_path; "/path"; end }.new
app = lambda { |_| [200, {}, body] }
response_body = ConnectionManagement.new(app).call(@env)[2]
diff --git a/activerecord/test/cases/connection_pool_test.rb b/activerecord/test/cases/connection_pool_test.rb
index 8d15a76735..aa50efc979 100644
--- a/activerecord/test/cases/connection_pool_test.rb
+++ b/activerecord/test/cases/connection_pool_test.rb
@@ -204,13 +204,13 @@ module ActiveRecord
end
# The connection pool is "fair" if threads waiting for
- # connections receive them the order in which they began
+ # connections receive them in the order in which they began
# waiting. This ensures that we don't timeout one HTTP request
# even while well under capacity in a multi-threaded environment
# such as a Java servlet container.
#
# We don't need strict fairness: if two connections become
- # available at the same time, it's fine of two threads that were
+ # available at the same time, it's fine if two threads that were
# waiting acquire the connections out of order.
#
# Thus this test prepares waiting threads and then trickles in