diff options
Diffstat (limited to 'actionpack/test')
-rw-r--r-- | actionpack/test/active_record_unit.rb | 2 | ||||
-rw-r--r-- | actionpack/test/controller/test_test.rb | 11 |
2 files changed, 2 insertions, 11 deletions
diff --git a/actionpack/test/active_record_unit.rb b/actionpack/test/active_record_unit.rb index d4cc474478..a7d526850e 100644 --- a/actionpack/test/active_record_unit.rb +++ b/actionpack/test/active_record_unit.rb @@ -84,7 +84,7 @@ class ActiveRecordTestConnector end end -class ActiveRecordTestCase < Test::Unit::TestCase +class ActiveRecordTestCase < ActiveSupport::TestCase # Set our fixture path if ActiveRecordTestConnector.able_to_connect self.fixture_path = "#{File.dirname(__FILE__)}/fixtures/" diff --git a/actionpack/test/controller/test_test.rb b/actionpack/test/controller/test_test.rb index 57c97a326c..b3a8e8750b 100644 --- a/actionpack/test/controller/test_test.rb +++ b/actionpack/test/controller/test_test.rb @@ -613,18 +613,9 @@ class InferringClassNameTest < Test::Unit::TestCase end end -class ContentControllerTest < ActionController::TestCase - def setup - # Should not override ActionController setup methods - end - - def test_should_still_setup_controller - assert_kind_of(ContentController, @controller) - end -end - class CrazyNameTest < ActionController::TestCase tests ContentController + def test_controller_class_can_be_set_manually_not_just_inferred assert_equal ContentController, self.class.controller_class end |