0
@@ -52,7 +52,7 @@
0
     end
0
 
0
     def user_agent
0
-      env['HTTP_USER_AGENT']
0
+      @env['HTTP_USER_AGENT']
0
     end
0
 
0
     private
0
@@ -810,7 +810,7 @@
0
     end
0
     
0
     def session
0
-      @request.env['rack.session'] || {}
0
+      request.env['rack.session'] ||= {}
0
     end
0
     
0
     private

0
@@ -1,13 +1,3 @@
0
-class Rack::MockRequest
0
-  class << self
0
-    alias :env_for_without_env :env_for
0
-    def env_for(uri = "", opts = {})
0
-      env = { 'HTTP_USER_AGENT' => opts.delete(:agent) }
0
-      env_for_without_env(uri, opts).merge(env)
0
-    end
0
-  end
0
-end
0
-
0
 module Sinatra
0
   
0
   module Test
0
0
@@ -16,12 +6,19 @@
0
 
0
       def easy_env_map
0
         {
0
-          :accept => 'HTTP_ACCEPT',
0
-          :agent => 'HTTP_AGENT',
0
-          :host => 'HTTP_POST'
0
+          :accept => "HTTP_ACCEPT",
0
+          :agent => "HTTP_USER_AGENT",
0
+          :host => "HTTP_HOST",
0
+          :session => "HTTP_COOKIE",
0
+          :cookies => "HTTP_COOKIE"
0
         }
0
       end
0
-    
0
+      
0
+      def session(data, key = 'rack.session')
0
+        data = data.from_params if data.respond_to?(:from_params)
0
+        "#{Rack::Utils.escape(key)}=#{[Marshal.dump(data)].pack("m*")}"
0
+      end
0
+          
0
       def map_easys(params)
0
         easy_env_map.inject(params.dup) do |m, (from, to)|
0
           m[to] = m.delete(from) if m.has_key?(from); m
0
0
0
@@ -30,14 +27,14 @@
0
 
0
       %w(get head post put delete).each do |m|
0
         define_method("#{m}_it") do |path, *args|
0
-          request = Rack::MockRequest.new(Sinatra.build_application)
0
           env, input = if args.size == 2
0
             [args.last, args.first]
0
           elsif args.size == 1
0
             data = args.first
0
-            data.is_a?(Hash) ? [data.delete(:env), data.to_params] : [nil, data]
0
+            data.is_a?(Hash) ? [map_easys(data.delete(:env) || {}), data.to_params] : [nil, data]
0
           end
0
-          @response = request.request(m.upcase, path, {:input => input}.merge(env || {}))
0
+          @request = Rack::MockRequest.new(Sinatra.build_application)
0
+          @response = @request.request(m.upcase, path, {:input => input}.merge(env || {}))
0
         end
0
       end
0
       

0
@@ -135,17 +135,17 @@
0
     get '/', :agent => /Windows/ do
0
       request.env['HTTP_USER_AGENT']
0
     end
0
-        
0
+        
0
     get_it '/', :env => { :agent => 'Windows' }
0
     should.be.ok
0
     body.should.equal 'Windows'
0
 
0
-    get_it '/', :agent => 'Mac'
0
+    get_it '/', :env => { :agent => 'Mac' }
0
     should.not.be.ok
0
 
0
   end
0
 
0
-  specify "can filters by agent" do
0
+  specify "can use regex to get parts of user-agent" do
0
     
0
     get '/', :agent => /Windows (NT)/ do
0
       params[:agent].first