Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

Update AR integration tests for TestCase changes

  • Loading branch information...
commit 4af46c4ba1c87333b24d820150f3ecc59165d92a 1 parent c82e8e1
Jeremy Kemper jeremy authored
2  actionpack/test/active_record_unit.rb
View
@@ -83,6 +83,8 @@ def require_fixture_models
end
class ActiveRecordTestCase < ActionController::TestCase
+ include ActiveRecord::TestFixtures
+
# Set our fixture path
if ActiveRecordTestConnector.able_to_connect
self.fixture_path = [FIXTURE_LOAD_PATH]
15 actionpack/test/activerecord/render_partial_with_record_identification_test.rb
View
@@ -47,6 +47,7 @@ def render_with_record_collection_and_spacer_template
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 @@ def render_with_record_collection_in_deeper_nested_controller
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 @@ def test_render_with_record_collection_in_nested_controller
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
Please sign in to comment.
Something went wrong with that request. Please try again.