diff options
author | Yehuda Katz <wycats@gmail.com> | 2009-02-02 09:54:23 -0800 |
---|---|---|
committer | Yehuda Katz <wycats@gmail.com> | 2009-02-02 09:54:23 -0800 |
commit | 44cdf0c5fe080d470429ab0640af25e927244907 (patch) | |
tree | 0dcaa131da49eaeb0e056d0b4cc03673bf5af4c2 /actionpack/test | |
parent | 3030bc90c95e335d726f06fd7a61ed96055e9109 (diff) | |
download | rails-44cdf0c5fe080d470429ab0640af25e927244907.tar.gz rails-44cdf0c5fe080d470429ab0640af25e927244907.tar.bz2 rails-44cdf0c5fe080d470429ab0640af25e927244907.zip |
Some merge cleanup
Diffstat (limited to 'actionpack/test')
-rw-r--r-- | actionpack/test/controller/session/cookie_store_test.rb | 2 | ||||
-rw-r--r-- | actionpack/test/dispatch/rack_test.rb | 2 | ||||
-rw-r--r-- | actionpack/test/dispatch/request_test.rb | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/actionpack/test/controller/session/cookie_store_test.rb b/actionpack/test/controller/session/cookie_store_test.rb index 3a1a9854c3..b48a8c3830 100644 --- a/actionpack/test/controller/session/cookie_store_test.rb +++ b/actionpack/test/controller/session/cookie_store_test.rb @@ -177,7 +177,7 @@ class CookieStoreTest < ActionController::IntegrationTest end def test_session_store_with_expire_after - app = ActionController::Session::CookieStore.new(DispatcherApp, :key => SessionKey, :secret => SessionSecret, :expire_after => 5.hours) + app = ActionDispatch::Session::CookieStore.new(DispatcherApp, :key => SessionKey, :secret => SessionSecret, :expire_after => 5.hours) @integration_session = open_session(app) with_test_route_set do diff --git a/actionpack/test/dispatch/rack_test.rb b/actionpack/test/dispatch/rack_test.rb index a9a9f815da..92e6f163b2 100644 --- a/actionpack/test/dispatch/rack_test.rb +++ b/actionpack/test/dispatch/rack_test.rb @@ -62,7 +62,7 @@ end class RackRequestTest < BaseRackTest test "proxy request" do - assert_equal 'glu.ttono.us', @request.host_with_port(true) + assert_equal 'glu.ttono.us', @request.host_with_port end test "http host" do diff --git a/actionpack/test/dispatch/request_test.rb b/actionpack/test/dispatch/request_test.rb index 60f71f03ce..f1e052ff17 100644 --- a/actionpack/test/dispatch/request_test.rb +++ b/actionpack/test/dispatch/request_test.rb @@ -255,7 +255,7 @@ class RequestTest < ActiveSupport::TestCase end test "server software" do - assert_equal nil, @request.server_software(true) + assert_equal nil, @request.server_software @request.env['SERVER_SOFTWARE'] = 'Apache3.422' assert_equal 'apache', @request.server_software |