aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorVipul A M <vipulnsward@gmail.com>2017-03-17 17:33:35 +0530
committerGitHub <noreply@github.com>2017-03-17 17:33:35 +0530
commit0a4d1c3cdeaf387b4cb4288462084c8ee1a9b039 (patch)
treed32fee2e71b93512d935da72bb729117d1801da9
parentd730e74bcecc4d1d1a836687d315e651cd7fe1f5 (diff)
downloadrails-0a4d1c3cdeaf387b4cb4288462084c8ee1a9b039.tar.gz
rails-0a4d1c3cdeaf387b4cb4288462084c8ee1a9b039.tar.bz2
rails-0a4d1c3cdeaf387b4cb4288462084c8ee1a9b039.zip
Cleanup documentation fixes (#28460)
-rw-r--r--actionpack/lib/action_dispatch/testing/integration.rb6
-rw-r--r--activesupport/lib/active_support/core_ext/object/with_options.rb4
2 files changed, 5 insertions, 5 deletions
diff --git a/actionpack/lib/action_dispatch/testing/integration.rb b/actionpack/lib/action_dispatch/testing/integration.rb
index 697abc1c48..b46a97413a 100644
--- a/actionpack/lib/action_dispatch/testing/integration.rb
+++ b/actionpack/lib/action_dispatch/testing/integration.rb
@@ -192,9 +192,9 @@ module ActionDispatch
# HTTP methods in integration tests. +#process+ is only required when using a
# request method that doesn't have a method defined in the integration tests.
#
- # This method returns a response status. Furthermore, if this method was
- # called from an ActionDispatch::IntegrationTest object, then that
- # object's <tt>@response</tt> instance variable will point to Response object
+ # This method returns the response status, after performing the request.
+ # Furthermore, if this method was called from an ActionDispatch::IntegrationTest object,
+ # then that object's <tt>@response</tt> instance variable will point to a Response object
# which one can use to inspect the details of the response.
#
# Example:
diff --git a/activesupport/lib/active_support/core_ext/object/with_options.rb b/activesupport/lib/active_support/core_ext/object/with_options.rb
index 4afb20ebfd..3a44e08630 100644
--- a/activesupport/lib/active_support/core_ext/object/with_options.rb
+++ b/activesupport/lib/active_support/core_ext/object/with_options.rb
@@ -62,8 +62,8 @@ class Object
#
# Hence the inherited default for `if` key is ignored.
#
- # NOTE: You cannot call class methods implicitly inside of with_options,
- # refer the methods using the class name instead, like so:
+ # NOTE: You cannot call class methods implicitly inside of with_options.
+ # You can access these methods using the class name instead:
#
# class Phone < ActiveRecord::Base
# enum phone_number_type: [home: 0, office: 1, mobile: 2]