diff options
author | Jeremy Kemper <jeremy@bitsweat.net> | 2008-01-05 13:34:15 +0000 |
---|---|---|
committer | Jeremy Kemper <jeremy@bitsweat.net> | 2008-01-05 13:34:15 +0000 |
commit | 139b92495fa7697cdd619c549d4c7b263562b761 (patch) | |
tree | 20589f9f23d3b19697fed12bb1bf5ce48ef595af /actionpack/test | |
parent | fe66397adfb5a8057db78afcabd4d7eb0f13a783 (diff) | |
download | rails-139b92495fa7697cdd619c549d4c7b263562b761.tar.gz rails-139b92495fa7697cdd619c549d4c7b263562b761.tar.bz2 rails-139b92495fa7697cdd619c549d4c7b263562b761.zip |
* Continue evolution toward ActiveSupport::TestCase and friends. #10679 [Josh Peek]
* TestCase: introduce declared setup and teardown callbacks. Pass a list of methods and an optional block to call before setup or after teardown. Setup callbacks are run in the order declared; teardown callbacks are run in reverse. [Jeremy Kemper]
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@8570 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
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 |