Skip to content

Commit 6a386ea

Browse files
committed
2-0-stable: Fix Fixtures for ActionController tests with fixtures. Closes rails#11162 [menno.sman]
git-svn-id: http://svn-commit.rubyonrails.org/rails/branches/2-0-stable@8910 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
1 parent 9d03813 commit 6a386ea

File tree

2 files changed

+25
-0
lines changed

2 files changed

+25
-0
lines changed

actionpack/lib/action_controller/test_case.rb

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -62,6 +62,7 @@ def self.method_added(method)
6262
unless method_defined?(:setup_without_controller)
6363
alias_method :setup_without_controller, :setup
6464
define_method(:setup) do
65+
setup_with_fixtures if respond_to?(:setup_with_fixtures)
6566
setup_with_controller
6667
setup_without_controller
6768
end
Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,24 @@
1+
require File.dirname(__FILE__) + '/../active_record_unit'
2+
require "action_controller/test_case"
3+
4+
class ActionController::TestCase
5+
self.fixture_path = File.dirname(__FILE__) + '/../fixtures'
6+
self.use_transactional_fixtures = false
7+
end
8+
9+
class DeveloperController < ActionController::Base
10+
end
11+
12+
class DeveloperControllerTest < ActionController::TestCase
13+
fixtures :developers
14+
15+
def setup
16+
@david = developers(:david)
17+
end
18+
19+
def test_should_have_loaded_fixtures
20+
assert_kind_of(Developer, @david)
21+
assert_kind_of(Developer, developers(:jamis))
22+
assert_equal(@developers.size, Developer.count)
23+
end
24+
end

0 commit comments

Comments
 (0)