Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

Revert [8392]. Closes #10568, reopens #10379.

git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@8442 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
  • Loading branch information...
commit 0b84af9599d624f563a41bc13ed318ddc457efb1 1 parent 40bff29
@jeremy jeremy authored
View
15 activerecord/lib/active_record/fixtures.rb
@@ -916,8 +916,6 @@ def use_transactional_fixtures?
end
def setup_with_fixtures
- return if @fixtures_setup
- @fixtures_setup = true
return unless defined?(ActiveRecord::Base) && !ActiveRecord::Base.configurations.blank?
if pre_loaded_fixtures && !use_transactional_fixtures
@@ -949,8 +947,6 @@ def setup_with_fixtures
alias_method :setup, :setup_with_fixtures
def teardown_with_fixtures
- return if @fixtures_teardown
- @fixtures_teardown = true
return unless defined?(ActiveRecord::Base) && !ActiveRecord::Base.configurations.blank?
unless use_transactional_fixtures?
@@ -967,31 +963,24 @@ def teardown_with_fixtures
alias_method :teardown, :teardown_with_fixtures
def self.method_added(method)
- return if @__disable_method_added__
- @__disable_method_added__ = true
-
case method.to_s
when 'setup'
unless method_defined?(:setup_without_fixtures)
alias_method :setup_without_fixtures, :setup
- define_method(:full_setup) do
+ define_method(:setup) do
setup_with_fixtures
setup_without_fixtures
end
end
- alias_method :setup, :full_setup
when 'teardown'
unless method_defined?(:teardown_without_fixtures)
alias_method :teardown_without_fixtures, :teardown
- define_method(:full_teardown) do
+ define_method(:teardown) do
teardown_without_fixtures
teardown_with_fixtures
end
end
- alias_method :teardown, :full_teardown
end
-
- @__disable_method_added__ = false
end
private
View
16 activerecord/test/fixtures_test.rb
@@ -324,22 +324,6 @@ def test_fixture_table_names
end
end
-# This is to reproduce a bug where if a TestCase is loaded
-# twice by Ruby, it loses its fixture setup hook.
-class_def = <<-CODE
- class DoubleLoadedTestCase < Test::Unit::TestCase
- fixtures :topics
-
- def setup
- end
-
- def test_should_properly_setup_fixtures
- assert_nothing_raised { topics(:first) }
- end
- end
-CODE
-2.times { eval(class_def) }
-
class OverlappingFixturesTest < Test::Unit::TestCase
fixtures :topics, :developers
fixtures :developers, :accounts
Please sign in to comment.
Something went wrong with that request. Please try again.