Permalink
Browse files

Don't require AV::TestCases to have a helper class. Only include the …

…helper class in setup if it hasn't been already.
  • Loading branch information...
1 parent c5d37c0 commit 7520770c825eab21079dd2b69b1199f138294301 @jeremy jeremy committed May 26, 2008
Showing with 4 additions and 10 deletions.
  1. +4 −10 actionpack/lib/action_view/test_case.rb
@@ -1,14 +1,6 @@
require 'active_support/test_case'
module ActionView
- class NonInferrableHelperError < ActionViewError
- def initialize(name)
- super "Unable to determine the helper to test from #{name}. " +
- "You'll need to specify it using tests YourHelper in your " +
- "test case definition"
- end
- end
-
class TestCase < ActiveSupport::TestCase
class_inheritable_accessor :helper_class
@@helper_class = nil
@@ -29,7 +21,7 @@ def helper_class
def determine_default_helper_class(name)
name.sub(/Test$/, '').constantize
rescue NameError
- raise NonInferrableHelperError.new(name)
+ nil
end
end
@@ -42,7 +34,9 @@ def determine_default_helper_class(name)
setup :setup_with_helper_class
def setup_with_helper_class
- self.class.send(:include, helper_class)
+ if helper_class && !self.class.ancestors.include?(helper_class)
+ self.class.send(:include, helper_class)
+ end
end
class TestController < ActionController::Base

0 comments on commit 7520770

Please sign in to comment.