diff options
| author | Neeraj Singh <neerajdotname@gmail.com> | 2010-06-15 00:46:44 -0400 |
|---|---|---|
| committer | Neeraj Singh <neerajdotname@gmail.com> | 2010-06-15 00:46:44 -0400 |
| commit | 5e60e6571384a809598f3118fdc02dac1fd9d7b8 (patch) | |
| tree | 3cfccbc36f0133124181ab965480a1352d86ca79 /actionpack/test | |
| parent | 51a9703b1e80caa30d699f30615f023079874623 (diff) | |
| parent | 1a50cc31639f35fd82a4a24821b9fc49dc7eadc9 (diff) | |
| download | rails-5e60e6571384a809598f3118fdc02dac1fd9d7b8.tar.gz rails-5e60e6571384a809598f3118fdc02dac1fd9d7b8.tar.bz2 rails-5e60e6571384a809598f3118fdc02dac1fd9d7b8.zip | |
Merge branch 'master' of github.com:lifo/docrails
Diffstat (limited to 'actionpack/test')
| -rw-r--r-- | actionpack/test/controller/helper_test.rb | 2 | ||||
| -rw-r--r-- | actionpack/test/controller/render_test.rb | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/actionpack/test/controller/helper_test.rb b/actionpack/test/controller/helper_test.rb index 75a96d6497..c9a6e5dd45 100644 --- a/actionpack/test/controller/helper_test.rb +++ b/actionpack/test/controller/helper_test.rb @@ -122,7 +122,7 @@ class HelperTest < ActiveSupport::TestCase def test_helper_proxy methods = AllHelpersController.helpers.methods.map(&:to_s) - # ActionView + # Action View assert methods.include?('pluralize') # abc_helper.rb diff --git a/actionpack/test/controller/render_test.rb b/actionpack/test/controller/render_test.rb index 2b1f2a27df..e3ed097c67 100644 --- a/actionpack/test/controller/render_test.rb +++ b/actionpack/test/controller/render_test.rb @@ -275,7 +275,7 @@ class TestController < ActionController::Base render :action => "hello", :layout => "layouts/builder" end - # :move: test this in ActionView + # :move: test this in Action View def builder_partial_test render :action => "hello_world_container" end |