diff options
| author | Paul Gallagher <gallagher.paul@gmail.com> | 2011-06-19 10:21:15 +0800 |
|---|---|---|
| committer | Paul Gallagher <gallagher.paul@gmail.com> | 2011-06-19 10:21:15 +0800 |
| commit | 2b3d67fdaf2c78a5447316a90c54c7c9c520c71a (patch) | |
| tree | 19cf0443c671ddf015c12b85e7022a2bd428b9ba /actionpack/test/abstract/abstract_controller_test.rb | |
| parent | b0d59907f733841280095b16c98a95574b3a0938 (diff) | |
| parent | 6c705e33ef78d28d5d964a03edc627f31d7f8c25 (diff) | |
| download | rails-2b3d67fdaf2c78a5447316a90c54c7c9c520c71a.tar.gz rails-2b3d67fdaf2c78a5447316a90c54c7c9c520c71a.tar.bz2 rails-2b3d67fdaf2c78a5447316a90c54c7c9c520c71a.zip | |
Merge remote branch 'rails/master' into pg_schema_fu
Diffstat (limited to 'actionpack/test/abstract/abstract_controller_test.rb')
| -rw-r--r-- | actionpack/test/abstract/abstract_controller_test.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/actionpack/test/abstract/abstract_controller_test.rb b/actionpack/test/abstract/abstract_controller_test.rb index 53712a60ec..5823e64637 100644 --- a/actionpack/test/abstract/abstract_controller_test.rb +++ b/actionpack/test/abstract/abstract_controller_test.rb @@ -181,7 +181,7 @@ module AbstractController class TestLayouts < ActiveSupport::TestCase test "layouts are included" do controller = Me4.new - result = controller.process(:index) + controller.process(:index) assert_equal "Me4 Enter : Hello from me4/index.erb : Exit", controller.response_body end end |