@@ -21,6 +21,7 @@ context "Sessions" do specify "should be able to store data accross requests" do set_option :sessions, true + set_option :environment, :not_test # necessary because sessions are disabled get '/foo' do session[:test] = true @@ -34,6 +35,8 @@ context "Sessions" do get_it '/foo', :env => { :host => 'foo.sinatrarb.com' } assert ok? assert include?('Set-Cookie') + + set_option :environment, :test end end compat/sessions_test.rb @@ -776,7 +776,7 @@ module Sinatra # an instance of the class new was called on. def new(*args, &bk) builder = Rack::Builder.new - builder.use Rack::Session::Cookie if sessions? + builder.use Rack::Session::Cookie if sessions? && !test? builder.use Rack::CommonLogger if logging? builder.use Rack::MethodOverride if methodoverride? @middleware.each { |c, args, bk| builder.use(c, *args, &bk) } lib/sinatra/base.rb 8edb40963c1386b5f368cd4b79d995733a77b881 Ryan Tomayko rtomayko@gmail.com http://github.com/bmizerany/sinatra/commit/08b142b4cc5501277b74ece88b1edfae3e239348 08b142b4cc5501277b74ece88b1edfae3e239348 2009-02-26T22:48:46-08:00 2009-02-26T22:47:05-08:00 Never use Session middleware in test environment [#119] 3b411c0acd971681f6208d000b186092c9b4c34c Ryan Tomayko rtomayko@gmail.com