@@ -503,7 +503,7 @@ module Camping # Run the request. @response = if app_module.respond_to?(:run) # Camping < 2.0 app_module.run(*@request.to_camping_args) - else # Camping 2.0 + else # Camping 2.0 app_module.call(@request.to_rack_request).pop # Serve a Rack::Response object end @@ -577,8 +577,13 @@ module Camping # Checks that Camping sent us a cookie to attach a session def assert_session_started - assert_not_nil @cookies["camping_sid"], - "The session ID cookie was empty although session should have started" + if Camping.respond_to?(:call) # Camping 2.0 prefers cookie sessions + assert_not_nil @cookies["camping_hash"], + "The session hash cookie was empty although session should have started" + else + assert_not_nil @cookies["camping_sid"], + "The session ID cookie was empty although session should have started" + end end # The reverse of +assert_session_started+ lib/mosquito.rb 01c9515d0b28f291b7f4f18e41995499933568d7 Julik me@julik.nl http://github.com/topfunky/mosquito/commit/5ef37ab84f2c335f0e5dc68bbdcca03ba8de491c 5ef37ab84f2c335f0e5dc68bbdcca03ba8de491c 2008-11-16T11:40:13-08:00 2008-11-16T11:40:13-08:00 Support session flags for cookie sessions in Camping 2.0 39e60a90795680ecf3008133003729648b8b2fcd Julik me@julik.nl