diff options
| author | Xavier Noria <fxn@hashref.com> | 2010-04-03 10:56:15 -0700 |
|---|---|---|
| committer | Xavier Noria <fxn@hashref.com> | 2010-04-03 10:56:15 -0700 |
| commit | 11161e6c96fb6686a33e05ead106b96089ff9790 (patch) | |
| tree | 35d5618f1a866ce8ba11efd8e6851d2fd7bbf5fc /actionpack/test/template/erb/helper.rb | |
| parent | 4996d1a445acd965d0064500ad00d692a742f669 (diff) | |
| parent | 467d251c3dcbd3e4dd1e785a21d63535b795a64c (diff) | |
| download | rails-11161e6c96fb6686a33e05ead106b96089ff9790.tar.gz rails-11161e6c96fb6686a33e05ead106b96089ff9790.tar.bz2 rails-11161e6c96fb6686a33e05ead106b96089ff9790.zip | |
Merge commit 'rails/master'
Diffstat (limited to 'actionpack/test/template/erb/helper.rb')
| -rw-r--r-- | actionpack/test/template/erb/helper.rb | 11 |
1 files changed, 2 insertions, 9 deletions
diff --git a/actionpack/test/template/erb/helper.rb b/actionpack/test/template/erb/helper.rb index 7147178849..799f9e4036 100644 --- a/actionpack/test/template/erb/helper.rb +++ b/actionpack/test/template/erb/helper.rb @@ -1,20 +1,13 @@ module ERBTest class ViewContext - mock_controller = Class.new do - include SharedTestRoutes.url_helpers - end - + include SharedTestRoutes.url_helpers include ActionView::Helpers::TagHelper include ActionView::Helpers::JavaScriptHelper include ActionView::Helpers::FormHelper - attr_accessor :output_buffer + attr_accessor :output_buffer, :controller def protect_against_forgery?() false end - - define_method(:controller) do - mock_controller.new - end end class BlockTestCase < ActiveSupport::TestCase |