Permalink
Browse files

Remove pending rack specifications until they are official

  • Loading branch information...
josh committed Apr 25, 2009
1 parent 617d7eb commit 2d9b45722c5639ad822f9a213edfd4d2bb084dcb
@@ -11,7 +11,7 @@ def call(env)
@app.call(env)
rescue Exception => exception
# Reraise exception in test environment
- if env["rack.test"]
+ if defined?(Rails) && Rails.test?
raise exception
else
failsafe_response(exception)
@@ -292,9 +292,7 @@ def process(method, path, parameters = nil, headers = nil)
"rack.errors" => StringIO.new,
"rack.multithread" => true,
"rack.multiprocess" => true,
- "rack.run_once" => false,
-
- "rack.test" => true
+ "rack.run_once" => false
)
(headers || {}).each do |key, value|
@@ -383,7 +383,7 @@ def parameters
alias_method :params, :parameters
def path_parameters=(parameters) #:nodoc:
- @env["rack.routing_args"] = parameters
+ @env["action_controller.request.path_parameters"] = parameters
@symbolized_path_parameters = @parameters = nil
end
@@ -399,7 +399,7 @@ def symbolized_path_parameters
#
# See <tt>symbolized_path_parameters</tt> for symbolized keys.
def path_parameters
- @env["rack.routing_args"] ||= {}
+ @env["action_controller.request.path_parameters"] ||= {}
end
# The request body is an IO input stream. If the RAW_POST_DATA environment

0 comments on commit 2d9b457

Please sign in to comment.