aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack/lib/action_controller/test_process.rb
diff options
context:
space:
mode:
authorJeremy Kemper <jeremy@bitsweat.net>2008-08-07 23:43:12 -0700
committerJeremy Kemper <jeremy@bitsweat.net>2008-08-07 23:43:12 -0700
commitb7529ed1cc7cfd8df5fd1b069e2881d39d3d984c (patch)
treeef69ba48ba47e42981101aab20aebae1d111c684 /actionpack/lib/action_controller/test_process.rb
parente43d1c226d09afe49b25f5e3a351c4c10371933a (diff)
downloadrails-b7529ed1cc7cfd8df5fd1b069e2881d39d3d984c.tar.gz
rails-b7529ed1cc7cfd8df5fd1b069e2881d39d3d984c.tar.bz2
rails-b7529ed1cc7cfd8df5fd1b069e2881d39d3d984c.zip
Simplifying usage of ETags and Last-Modified and conditional GET requests
Diffstat (limited to 'actionpack/lib/action_controller/test_process.rb')
-rw-r--r--actionpack/lib/action_controller/test_process.rb14
1 files changed, 3 insertions, 11 deletions
diff --git a/actionpack/lib/action_controller/test_process.rb b/actionpack/lib/action_controller/test_process.rb
index 66675aaa13..42e79fe819 100644
--- a/actionpack/lib/action_controller/test_process.rb
+++ b/actionpack/lib/action_controller/test_process.rb
@@ -23,7 +23,7 @@ module ActionController #:nodoc:
class TestRequest < AbstractRequest #:nodoc:
attr_accessor :cookies, :session_options
- attr_accessor :query_parameters, :request_parameters, :path, :session, :env
+ attr_accessor :query_parameters, :request_parameters, :path, :session
attr_accessor :host, :user_agent
def initialize(query_parameters = nil, request_parameters = nil, session = nil)
@@ -42,7 +42,7 @@ module ActionController #:nodoc:
end
# Wraps raw_post in a StringIO.
- def body
+ def body_stream #:nodoc:
StringIO.new(raw_post)
end
@@ -54,7 +54,7 @@ module ActionController #:nodoc:
def port=(number)
@env["SERVER_PORT"] = number.to_i
- @port_as_int = nil
+ port(true)
end
def action=(action_name)
@@ -83,10 +83,6 @@ module ActionController #:nodoc:
@env['REMOTE_ADDR'] = addr
end
- def remote_addr
- @env['REMOTE_ADDR']
- end
-
def request_uri
@request_uri || super
end
@@ -120,10 +116,6 @@ module ActionController #:nodoc:
self.query_parameters = {}
self.path_parameters = {}
@request_method, @accepts, @content_type = nil, nil, nil
- end
-
- def referer
- @env["HTTP_REFERER"]
end
private