Skip to content

Commit

Permalink
Merge pull request #9890 from prathamesh-sonpatki/CL-Typos
Browse files Browse the repository at this point in the history
activemodel/CHANGELOG typo and change in test description
  • Loading branch information
rafaelfranca committed Mar 23, 2013
2 parents 93c498b + ba7c9d7 commit 8641467
Show file tree
Hide file tree
Showing 3 changed files with 3 additions and 3 deletions.
2 changes: 1 addition & 1 deletion actionpack/test/abstract/callbacks_test.rb
Expand Up @@ -259,7 +259,7 @@ def index(text)
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
Expand Down
2 changes: 1 addition & 1 deletion actionpack/test/abstract/collector_test.rb
Expand Up @@ -42,7 +42,7 @@ class TestCollector < ActiveSupport::TestCase
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)
Expand Down
2 changes: 1 addition & 1 deletion activemodel/CHANGELOG.md
Expand Up @@ -91,7 +91,7 @@

*Yves Senn*

* Use BCrypt's `MIN_COST` in the test environment for speedier tests when using `has_secure_pasword`.
* Use BCrypt's `MIN_COST` in the test environment for speedier tests when using `has_secure_password`.

*Brian Cardarella + Jeremy Kemper + Trevor Turk*

Expand Down

0 comments on commit 8641467

Please sign in to comment.