Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

Revert "scrub instance variables from test cases on teardown"

This reverts commit b5cf2b4.
  • Loading branch information...
commit c545331f9e3cd8eb1ee2fca266c98b7d62b92f3e 1 parent cd0ecff
@jamis jamis authored
View
2  activesupport/lib/active_support/test_case.rb
@@ -3,7 +3,6 @@
require 'active_support/testing/assertions'
require 'active_support/testing/deprecation'
require 'active_support/testing/declarative'
-require 'active_support/testing/garbage_collection'
begin
gem 'mocha', ">= 0.9.7"
@@ -37,6 +36,5 @@ class TestCase < ::Test::Unit::TestCase
include ActiveSupport::Testing::Assertions
include ActiveSupport::Testing::Deprecation
extend ActiveSupport::Testing::Declarative
- include ActiveSupport::Testing::GarbageCollection
end
end
View
19 activesupport/lib/active_support/testing/garbage_collection.rb
@@ -1,19 +0,0 @@
-module ActiveSupport
- module Testing
- module GarbageCollection
- def self.included(base)
- base.teardown :scrub_leftover_instance_variables
- end
-
- private
-
- RESERVED_INSTANCE_VARIABLES = %w(@test_passed @passed @method_name @__name__ @_result).map(&:to_sym)
-
- def scrub_leftover_instance_variables
- (instance_variables.map(&:to_sym) - RESERVED_INSTANCE_VARIABLES).each do |var|
- remove_instance_variable(var)
- end
- end
- end
- end
-end
View
18 activesupport/test/test_case_test.rb
@@ -74,23 +74,5 @@ def test_true; assert true end
assert_match %r{oh noes}, exception.message
end
-
- def test_teardown_should_scrub_instance_variables
- tc = Class.new(TestCase) do
- def test_true; @alpha = "a"; assert_equal "a", @alpha; end
- end
-
- test_name = 'test_true'
- fr = FakeRunner.new
-
- test = tc.new test_name
- test.run(fr) {}
-
- passed_var = IS_MINITEST ? :@passed : :@test_passed
- ivars = test.instance_variables.map(&:to_sym)
-
- assert ivars.include?(passed_var), "#{passed_var} should not have been scrubbed"
- assert !ivars.include?(:@alpha), "@alpha should have been scrubbed"
- end
end
end
View
4 activesupport/test/test_test.rb
@@ -143,7 +143,7 @@ class SetupAndTeardownTest < ActiveSupport::TestCase
def test_inherited_setup_callbacks
assert_equal [:reset_callback_record, :foo], self.class.setup_callback_chain.map(&:method)
assert_equal [:foo], @called_back
- assert_equal [:scrub_leftover_instance_variables, :foo, :sentinel, :foo], self.class.teardown_callback_chain.map(&:method)
+ assert_equal [:foo, :sentinel, :foo], self.class.teardown_callback_chain.map(&:method)
end
def setup
@@ -174,7 +174,7 @@ class SubclassSetupAndTeardownTest < SetupAndTeardownTest
def test_inherited_setup_callbacks
assert_equal [:reset_callback_record, :foo, :bar], self.class.setup_callback_chain.map(&:method)
assert_equal [:foo, :bar], @called_back
- assert_equal [:scrub_leftover_instance_variables, :foo, :sentinel, :foo, :bar], self.class.teardown_callback_chain.map(&:method)
+ assert_equal [:foo, :sentinel, :foo, :bar], self.class.teardown_callback_chain.map(&:method)
end
protected
Please sign in to comment.
Something went wrong with that request. Please try again.