mirrors
/
rails
mirror of https://github.com/rails/rails
8
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge pull request #40588 from etiennebarrie/activesupport-currentattributes-testhelper-teardown 

Allow access to CurrentAttributes in test teardown
This commit is contained in:
Rafael França 2020-11-09 16:04:42 -05:00 committed by GitHub
parent d39dbc1b3f 0400be279b
commit e71b4a5e04
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
activesupport/lib/active_support/current_attributes/test_helper.rb
View File

@ -6,8 +6,8 @@ module ActiveSupport::CurrentAttributes::TestHelper # :nodoc:
super
end
def before_teardown
ActiveSupport::CurrentAttributes.reset_all
def after_teardown
super
ActiveSupport::CurrentAttributes.reset_all
end
end

8
activesupport/test/current_attributes_test.rb
View File

@ -126,6 +126,14 @@ class CurrentAttributesTest < ActiveSupport::TestCase
assert_equal "account/1", Current.account
end
setup { @testing_teardown = false }
teardown { assert_equal 42, Session.current if @testing_teardown }
test "accessing attributes in teardown" do
Session.current = 42
@testing_teardown = true
end
test "delegation" do
Current.person = Person.new(42, "David", "Central Time (US & Canada)")
assert_equal "Central Time (US & Canada)", Current.time_zone