diff options
author | Santiago Pastorino <santiago@wyeworks.com> | 2012-09-27 07:26:15 -0700 |
---|---|---|
committer | Santiago Pastorino <santiago@wyeworks.com> | 2012-09-27 07:26:15 -0700 |
commit | 1b73dbd36fc5bd2d8ae015a16b2376250ab19b4e (patch) | |
tree | 4a0bb6a357cedd2869dedf67d1bd17937c12c5c0 /activesupport | |
parent | c131211c679ce227f4ba68e1b5f3db5ae0e2bdb6 (diff) | |
parent | ba3411067760ca6cd69c49a4e5c6c3a021011ce6 (diff) | |
download | rails-1b73dbd36fc5bd2d8ae015a16b2376250ab19b4e.tar.gz rails-1b73dbd36fc5bd2d8ae015a16b2376250ab19b4e.tar.bz2 rails-1b73dbd36fc5bd2d8ae015a16b2376250ab19b4e.zip |
Merge pull request #7760 from alindeman/adds_missing_dependency_to_action_view_test_case
Adds missing dependency to ActionView::TestCase::Behavior
Diffstat (limited to 'activesupport')
-rw-r--r-- | activesupport/lib/active_support/test_case.rb | 1 | ||||
-rw-r--r-- | activesupport/test/testing/constant_lookup_test.rb | 1 |
2 files changed, 1 insertions, 1 deletions
diff --git a/activesupport/lib/active_support/test_case.rb b/activesupport/lib/active_support/test_case.rb index 1f874b56db..7b9378a7f6 100644 --- a/activesupport/lib/active_support/test_case.rb +++ b/activesupport/lib/active_support/test_case.rb @@ -38,7 +38,6 @@ module ActiveSupport include ActiveSupport::Testing::SetupAndTeardown include ActiveSupport::Testing::Assertions include ActiveSupport::Testing::Deprecation - include ActiveSupport::Testing::ConstantLookup def self.describe(text) if block_given? diff --git a/activesupport/test/testing/constant_lookup_test.rb b/activesupport/test/testing/constant_lookup_test.rb index d6552b5e49..c56c032cde 100644 --- a/activesupport/test/testing/constant_lookup_test.rb +++ b/activesupport/test/testing/constant_lookup_test.rb @@ -9,6 +9,7 @@ class Baz < Bar; end module FooBar; end class ConstantLookupTest < ActiveSupport::TestCase + include ActiveSupport::Testing::ConstantLookup def find_foo(name) self.class.determine_constant_from_test_name(name) do |constant| |