MockRequest can now only create the Rack environment

darcs-hash:20070228182155-4fc50-a86eb71770e1748ed7555f419b292bb8150c9161.gz

lib/rack/mock.rb

@@ -40,22 +40,35 @@ def put(uri, opts={})    request("PUT", uri, opts)    end
     def delete(uri, opts={}) request("DELETE", uri, opts) end
 
     def request(method="GET", uri="", opts={})
+      env = self.class.env_for(uri, opts.merge(:method => method))
+
+      if opts[:lint]
+        app = Rack::Lint.new(@app)
+      else
+        app = @app
+      end
+
+      errors = env["rack.errors"]
+      MockResponse.new(*(app.call(env) + [errors]))
+    end
+
+    def self.env_for(uri="", opts={})
       uri = URI(uri)
       env = DEFAULT_ENV.dup
 
-      env["REQUEST_METHOD"] = method
+      env["REQUEST_METHOD"] = opts[:method] || "GET"
       env["SERVER_NAME"] = uri.host || "example.org"
       env["SERVER_PORT"] = uri.port ? uri.port.to_s : "80"
       env["QUERY_STRING"] = uri.query.to_s
-      env["PATH_INFO"] = uri.path.empty? ? "/" : uri.path
+      env["PATH_INFO"] = (!uri.path || uri.path.empty?) ? "/" : uri.path
       env["rack.url_scheme"] = uri.scheme || "http"
 
       env["SCRIPT_NAME"] = opts[:script_name] || ""
 
       if opts[:fatal]
         env["rack.errors"] = FatalWarner.new
       else
-        env["rack.errors"] = errors = StringIO.new
+        env["rack.errors"] = StringIO.new
       end
 
       opts[:input] ||= ""
@@ -65,13 +78,11 @@ def request(method="GET", uri="", opts={})
         env["rack.input"] = opts[:input]
       end
 
-      if opts[:lint]
-        app = Rack::Lint.new(@app)
-      else
-        app = @app
-      end
+      opts.each { |field, value|
+        env[field] = value  if String === field
+      }
 
-      MockResponse.new(*(app.call(env) + [errors]))
+      env
     end
   end
 

test/spec_rack_mock.rb

@@ -23,6 +23,12 @@
     res.should.be.kind_of Rack::MockResponse
   end
 
+  specify "should be able to only return the environment" do
+    env = Rack::MockRequest.env_for("")
+    env.should.be.kind_of Hash
+    env.should.include "rack.version"
+  end
+
   specify "should provide sensible defaults" do
     res = Rack::MockRequest.new(App).request
 
@@ -53,6 +59,9 @@
     res = Rack::MockRequest.new(App).delete("", :input => "foo")
     env = YAML.load(res.body)
     env["REQUEST_METHOD"].should.equal "DELETE"
+
+    Rack::MockRequest.env_for("/", :method => "OPTIONS")["REQUEST_METHOD"].
+      should.equal "OPTIONS"
   end
 
   specify "should allow posting" do