diff options
author | Rafael Mendonça França <rafaelmfranca@gmail.com> | 2013-03-23 14:01:57 -0700 |
---|---|---|
committer | Rafael Mendonça França <rafaelmfranca@gmail.com> | 2013-03-23 14:01:57 -0700 |
commit | 86414677f83895e5846ee395c15a839577e928fd (patch) | |
tree | 030ec472755d3918ca755ac7aa75ad1206d3d209 | |
parent | 93c498b2a827fa47dbb0493fc05afbf58ec3f50f (diff) | |
parent | ba7c9d76af9c4ec1e02d6caadb94f60da2bb2860 (diff) | |
download | rails-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
-rw-r--r-- | actionpack/test/abstract/callbacks_test.rb | 2 | ||||
-rw-r--r-- | actionpack/test/abstract/collector_test.rb | 2 | ||||
-rw-r--r-- | activemodel/CHANGELOG.md | 2 |
3 files changed, 3 insertions, 3 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) diff --git a/activemodel/CHANGELOG.md b/activemodel/CHANGELOG.md index 62d684fd0b..b4ada0e0b5 100644 --- a/activemodel/CHANGELOG.md +++ b/activemodel/CHANGELOG.md @@ -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* |