diff --git a/actionpack/CHANGELOG.md b/actionpack/CHANGELOG.md index 08a484455f..8f32e7a5f2 100644 --- a/actionpack/CHANGELOG.md +++ b/actionpack/CHANGELOG.md @@ -1,3 +1,16 @@ +* Include child session assertion count in ActionDispatch::IntegrationTest + + `IntegrationTest#open_session` uses `dup` to create the new session, which + meant it had its own copy of `@assertions`. This prevented the assertions + from being correctly counted and reported. + + Child sessions now have their `attr_accessor` overriden to delegate to the + root session. + + Fixes #32142 + + *Sam Bostock* + * Add SameSite protection to every written cookie. Enabling `SameSite` cookie protection is an addition to CSRF protection, diff --git a/actionpack/lib/action_dispatch/testing/integration.rb b/actionpack/lib/action_dispatch/testing/integration.rb index 277e2b35ff..3b12eaf74e 100644 --- a/actionpack/lib/action_dispatch/testing/integration.rb +++ b/actionpack/lib/action_dispatch/testing/integration.rb @@ -320,6 +320,7 @@ module ActionDispatch APP_SESSIONS = {} attr_reader :app + attr_accessor :root_session # :nodoc: def initialize(*args, &blk) super(*args, &blk) @@ -387,10 +388,19 @@ module ActionDispatch def open_session dup.tap do |session| session.reset! + session.root_session = self.root_session || self yield session if block_given? end end + def assertions # :nodoc: + root_session ? root_session.assertions : super + end + + def assertions=(assertions) # :nodoc: + root_session ? root_session.assertions = assertions : super + end + # Copy the instance variables from the current session instance into the # test instance. def copy_session_variables! #:nodoc: diff --git a/actionpack/test/controller/integration_test.rb b/actionpack/test/controller/integration_test.rb index f0f89c89e3..b16d53af9c 100644 --- a/actionpack/test/controller/integration_test.rb +++ b/actionpack/test/controller/integration_test.rb @@ -138,6 +138,14 @@ class IntegrationTestTest < ActiveSupport::TestCase assert_not session1.equal?(session2) end + def test_child_session_assertions_bubble_up_to_root + assertions_before = @test.assertions + @test.open_session.assert(true) + assertions_after = @test.assertions + + assert_equal 1, assertions_after - assertions_before + end + # RSpec mixes Matchers (which has a #method_missing) into # IntegrationTest's superclass. Make sure IntegrationTest does not # try to delegate these methods to the session object.