aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack/test/controller/integration_test.rb
diff options
context:
space:
mode:
authorJoshua Peek <josh@joshpeek.com>2009-04-30 14:28:42 -0500
committerJoshua Peek <josh@joshpeek.com>2009-04-30 14:28:42 -0500
commit9bac470c7ac7bc15830a66f416358d8efc74a39d (patch)
tree1b06508f16eb377a732a4f303ea216ff2eb6b60e /actionpack/test/controller/integration_test.rb
parentba9887c9c02a3671c3d1d893cbee9f360ea2df2d (diff)
downloadrails-9bac470c7ac7bc15830a66f416358d8efc74a39d.tar.gz
rails-9bac470c7ac7bc15830a66f416358d8efc74a39d.tar.bz2
rails-9bac470c7ac7bc15830a66f416358d8efc74a39d.zip
Group integration test helpers and delegate other helpers to request and response objects
Diffstat (limited to 'actionpack/test/controller/integration_test.rb')
-rw-r--r--actionpack/test/controller/integration_test.rb12
1 files changed, 1 insertions, 11 deletions
diff --git a/actionpack/test/controller/integration_test.rb b/actionpack/test/controller/integration_test.rb
index 70fa41aded..c616107324 100644
--- a/actionpack/test/controller/integration_test.rb
+++ b/actionpack/test/controller/integration_test.rb
@@ -30,7 +30,7 @@ class SessionTest < Test::Unit::TestCase
def test_request_via_redirect_uses_given_method
path = "/somepath"; args = {:id => '1'}; headers = {"X-Test-Header" => "testvalue"}
- @session.expects(:put).with(path, args, headers)
+ @session.expects(:process).with(:put, path, args, headers)
@session.stubs(:redirect?).returns(false)
@session.request_via_redirect(:put, path, args, headers)
end
@@ -90,16 +90,6 @@ class SessionTest < Test::Unit::TestCase
assert_equal '/show', @session.url_for(options)
end
- def test_redirect_bool_with_status_in_300s
- @session.stubs(:status).returns 301
- assert @session.redirect?
- end
-
- def test_redirect_bool_with_status_in_200s
- @session.stubs(:status).returns 200
- assert !@session.redirect?
- end
-
def test_get
path = "/index"; params = "blah"; headers = {:location => 'blah'}
@session.expects(:process).with(:get,path,params,headers)