diff options
| author | Jeremy Kemper <jeremy@bitsweat.net> | 2008-11-07 15:51:50 -0500 |
|---|---|---|
| committer | Jeremy Kemper <jeremy@bitsweat.net> | 2008-11-07 15:51:50 -0500 |
| commit | 4af46c4ba1c87333b24d820150f3ecc59165d92a (patch) | |
| tree | 0fd87d67acfc04c8aa7135cf5ad160994fdb6abb /actionpack/test | |
| parent | c82e8e1f483ece1fbd2e9f73715fd211487620fc (diff) | |
| download | rails-4af46c4ba1c87333b24d820150f3ecc59165d92a.tar.gz rails-4af46c4ba1c87333b24d820150f3ecc59165d92a.tar.bz2 rails-4af46c4ba1c87333b24d820150f3ecc59165d92a.zip | |
Update AR integration tests for TestCase changes
Diffstat (limited to 'actionpack/test')
| -rw-r--r-- | actionpack/test/active_record_unit.rb | 2 | ||||
| -rw-r--r-- | actionpack/test/activerecord/render_partial_with_record_identification_test.rb | 15 |
2 files changed, 5 insertions, 12 deletions
diff --git a/actionpack/test/active_record_unit.rb b/actionpack/test/active_record_unit.rb index 8eca6cc9bd..d8d2e00dc2 100644 --- a/actionpack/test/active_record_unit.rb +++ b/actionpack/test/active_record_unit.rb @@ -83,6 +83,8 @@ class ActiveRecordTestConnector end class ActiveRecordTestCase < ActionController::TestCase + include ActiveRecord::TestFixtures + # Set our fixture path if ActiveRecordTestConnector.able_to_connect self.fixture_path = [FIXTURE_LOAD_PATH] diff --git a/actionpack/test/activerecord/render_partial_with_record_identification_test.rb b/actionpack/test/activerecord/render_partial_with_record_identification_test.rb index 822a739112..147b270808 100644 --- a/actionpack/test/activerecord/render_partial_with_record_identification_test.rb +++ b/actionpack/test/activerecord/render_partial_with_record_identification_test.rb @@ -47,6 +47,7 @@ class RenderPartialWithRecordIdentificationController < ActionController::Base end class RenderPartialWithRecordIdentificationTest < ActiveRecordTestCase + tests RenderPartialWithRecordIdentificationController fixtures :developers, :projects, :developers_projects, :topics, :replies, :companies, :mascots def test_rendering_partial_with_has_many_and_belongs_to_association @@ -155,12 +156,7 @@ module Fun end class RenderPartialWithRecordIdentificationAndNestedControllersTest < ActiveRecordTestCase - def setup - @controller = Fun::NestedController.new - @request = ActionController::TestRequest.new - @response = ActionController::TestResponse.new - super - end + tests Fun::NestedController def test_render_with_record_in_nested_controller get :render_with_record_in_nested_controller @@ -176,12 +172,7 @@ class RenderPartialWithRecordIdentificationAndNestedControllersTest < ActiveReco end class RenderPartialWithRecordIdentificationAndNestedDeeperControllersTest < ActiveRecordTestCase - def setup - @controller = Fun::Serious::NestedDeeperController.new - @request = ActionController::TestRequest.new - @response = ActionController::TestResponse.new - super - end + tests Fun::Serious::NestedDeeperController def test_render_with_record_in_deeper_nested_controller get :render_with_record_in_deeper_nested_controller |