diff options
| author | José Valim <jose.valim@gmail.com> | 2010-01-24 15:08:06 +0100 |
|---|---|---|
| committer | José Valim <jose.valim@gmail.com> | 2010-01-24 15:08:06 +0100 |
| commit | 6545a68264682e8d0a0ee0e913fa98d92fef9428 (patch) | |
| tree | 8bffb69c52970ad72ab0f35de9acf5ef3db4257e /actionpack/test/controller | |
| parent | 84ebfa4550b2325c6c89bc13aa6f904ff88d0db7 (diff) | |
| download | rails-6545a68264682e8d0a0ee0e913fa98d92fef9428.tar.gz rails-6545a68264682e8d0a0ee0e913fa98d92fef9428.tar.bz2 rails-6545a68264682e8d0a0ee0e913fa98d92fef9428.zip | |
Fix failing tests after merge.
Diffstat (limited to 'actionpack/test/controller')
| -rw-r--r-- | actionpack/test/controller/helper_test.rb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/actionpack/test/controller/helper_test.rb b/actionpack/test/controller/helper_test.rb index 9030e562bb..fe0961e575 100644 --- a/actionpack/test/controller/helper_test.rb +++ b/actionpack/test/controller/helper_test.rb @@ -1,7 +1,7 @@ require 'abstract_unit' require 'active_support/core_ext/kernel/reporting' -ActionController::Base.helpers_dir = File.dirname(__FILE__) + '/../fixtures/helpers' +ActionController::Base.helpers_path = [File.dirname(__FILE__) + '/../fixtures/helpers'] module Fun class GamesController < ActionController::Base @@ -106,7 +106,7 @@ class HelperTest < Test::Unit::TestCase end def test_all_helpers_with_alternate_helper_dir - @controller_class.helpers_dir = File.dirname(__FILE__) + '/../fixtures/alternate_helpers' + @controller_class.helpers_path = [File.dirname(__FILE__) + '/../fixtures/alternate_helpers'] # Reload helpers @controller_class._helpers = Module.new |