aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack
diff options
context:
space:
mode:
authorRafael Mendonça França <rafaelmfranca@gmail.com>2013-03-23 14:01:57 -0700
committerRafael Mendonça França <rafaelmfranca@gmail.com>2013-03-23 14:01:57 -0700
commit86414677f83895e5846ee395c15a839577e928fd (patch)
tree030ec472755d3918ca755ac7aa75ad1206d3d209 /actionpack
parent93c498b2a827fa47dbb0493fc05afbf58ec3f50f (diff)
parentba7c9d76af9c4ec1e02d6caadb94f60da2bb2860 (diff)
downloadrails-86414677f83895e5846ee395c15a839577e928fd.tar.gz
rails-86414677f83895e5846ee395c15a839577e928fd.tar.bz2
rails-86414677f83895e5846ee395c15a839577e928fd.zip
Merge pull request #9890 from prathamesh-sonpatki/CL-Typos
activemodel/CHANGELOG typo and change in test description
Diffstat (limited to 'actionpack')
-rw-r--r--actionpack/test/abstract/callbacks_test.rb2
-rw-r--r--actionpack/test/abstract/collector_test.rb2
2 files changed, 2 insertions, 2 deletions
diff --git a/actionpack/test/abstract/callbacks_test.rb b/actionpack/test/abstract/callbacks_test.rb
index 1090af3060..8cba049485 100644
--- a/actionpack/test/abstract/callbacks_test.rb
+++ b/actionpack/test/abstract/callbacks_test.rb
@@ -259,7 +259,7 @@ module AbstractController
end
class TestCallbacksWithArgs < ActiveSupport::TestCase
- test "callbacks still work when invoking process with multiple args" do
+ test "callbacks still work when invoking process with multiple arguments" do
controller = CallbacksWithArgs.new
controller.process(:index, " Howdy!")
assert_equal "Hello world Howdy!", controller.response_body
diff --git a/actionpack/test/abstract/collector_test.rb b/actionpack/test/abstract/collector_test.rb
index c14d24905b..5709ad0378 100644
--- a/actionpack/test/abstract/collector_test.rb
+++ b/actionpack/test/abstract/collector_test.rb
@@ -42,7 +42,7 @@ module AbstractController
end
end
- test "generated methods call custom with args received" do
+ test "generated methods call custom with arguments received" do
collector = MyCollector.new
collector.html
collector.text(:foo)