Trying to remove the pain out of session testing

lib/sinatra/test.rb

@@ -14,13 +14,17 @@ def self.deprecate(framework)
       EOF
     end
 
-    def make_request(verb, path, data=nil, h=nil)
+    def make_request(verb, path, data={}, h=nil)
       @app = Sinatra::Application if @app.nil? && defined?(Sinatra::Application)
       fail "@app not set - cannot make request" if @app.nil?
 
       @request = Rack::MockRequest.new(@app)
       options  = { :lint => true }
 
+      session = data[:session]
+      session = data[:env][:session] if data[:env]
+      options['rack.session'] = session unless session.nil?
+
       case data
       when Hash
         if env = data.delete(:env)
@@ -67,12 +71,12 @@ def respond_to?(symbol, include_private=false)
   private
 
     RACK_OPTIONS = {
-      :accept => "HTTP_ACCEPT",
-      :agent => "HTTP_USER_AGENT",
-      :host => "HTTP_HOST",
-      :session => "HTTP_COOKIE",
-      :cookies => "HTTP_COOKIE",
-      :content_type => "CONTENT_TYPE"
+      :accept       => 'HTTP_ACCEPT',
+      :agent        => 'HTTP_USER_AGENT',
+      :host         => 'HTTP_HOST',
+      :session      => 'HTTP_COOKIE',
+      :cookies      => 'HTTP_COOKIE',
+      :content_type => 'CONTENT_TYPE'
     }
 
     def rack_options(opts)

test/test_test.rb

@@ -102,6 +102,25 @@ def request_params
     assert_equal 'text/plain', request['CONTENT_TYPE']
   end
 
+  it 'allow to test session easily' do
+    app = mock_app(Sinatra::Default) {
+      get '/' do
+        session['foo'] = 'bar'
+        200
+      end
+
+      post '/' do
+        assert_equal 'bar', session['foo']
+        session['foo'] || "blah"
+      end
+    }
+
+    browser = Sinatra::TestHarness.new(app)
+    browser.get '/'
+    browser.post '/', :session => { 'foo' => 'bar' }
+    assert_equal 'bar', browser.response.body
+  end
+
   it 'yields the request object to the block before invoking the application' do
     called = false
     get '/' do |req|