aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack/test/abstract
diff options
context:
space:
mode:
authorJosé Valim <jose.valim@gmail.com>2010-01-24 15:08:06 +0100
committerJosé Valim <jose.valim@gmail.com>2010-01-24 15:08:06 +0100
commit6545a68264682e8d0a0ee0e913fa98d92fef9428 (patch)
tree8bffb69c52970ad72ab0f35de9acf5ef3db4257e /actionpack/test/abstract
parent84ebfa4550b2325c6c89bc13aa6f904ff88d0db7 (diff)
downloadrails-6545a68264682e8d0a0ee0e913fa98d92fef9428.tar.gz
rails-6545a68264682e8d0a0ee0e913fa98d92fef9428.tar.bz2
rails-6545a68264682e8d0a0ee0e913fa98d92fef9428.zip
Fix failing tests after merge.
Diffstat (limited to 'actionpack/test/abstract')
-rw-r--r--actionpack/test/abstract/helper_test.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/actionpack/test/abstract/helper_test.rb b/actionpack/test/abstract/helper_test.rb
index ade29140ba..0cdf5c2298 100644
--- a/actionpack/test/abstract/helper_test.rb
+++ b/actionpack/test/abstract/helper_test.rb
@@ -1,6 +1,6 @@
require 'abstract_unit'
-ActionController::Base.helpers_dir = File.dirname(__FILE__) + '/../fixtures/helpers'
+ActionController::Base.helpers_path = [File.dirname(__FILE__) + '/../fixtures/helpers']
module AbstractController
module Testing