Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

Merging pre-defined env with built env for request

  • Loading branch information...
commit 0c7f60fca8a421eb0ee03c0c8e7a5f3e50ee5dc3 1 parent 538a4d2
@gus gus authored
View
2  lib/riot/action_controller/http_methods.rb
@@ -10,7 +10,7 @@ def delete(uri, params={}); perform_request("DELETE", uri, params); end
def perform_request(request_method, uri, params)
http_reset
params = params.inject({}) { |acc,(key,val)| acc[key] = val.to_s; acc }
- @env = ::Rack::MockRequest.env_for(uri, {:params => params, :method => request_method})
+ @env = ::Rack::MockRequest.env_for(uri, {:params => params, :method => request_method}).merge(@env)
@env['action_dispatch.show_exceptions'] = false
@app.call(@env)
end
View
2  test/rails_root/config/environment.rb
@@ -11,7 +11,7 @@ class Application < Rails::Application
config.root = File.expand_path(File.join(File.dirname(__FILE__), ".."))
config.session_store :cookie_store, {:key => "_riotrails_session"}
- config.cookie_secret = "i own you." * 3
+ config.secret_token = "i own you." * 3
end
end
Please sign in to comment.
Something went wrong with that request. Please try again.