Changeset 8164

Timestamp:

11/17/07 05:41:47 (1 year ago)

Author:

nzkoz

Message:

memoize host with port and refactor the tests which depend on it changing

Files:

• trunk/actionpack/lib/action_controller/request.rb (modified) (1 diff)
• trunk/actionpack/test/controller/caching_test.rb (modified) (2 diffs)
• trunk/actionpack/test/controller/request_test.rb (modified) (1 diff)

trunk/actionpack/lib/action_controller/request.rb

@@ -167 +167 @@
-    # example.com:8080.
-    def host_with_port
-
+@host_with_port ||= 
-    end
-

trunk/actionpack/test/controller/caching_test.rb

@@ -249 +249 @@
-    get :index
-    jamis_cache = content_to_cache
-
+
+
+
-    @request.host = 'david.hostname.com'
-    get :index
@@ -255 +257 @@
-    assert_not_equal jamis_cache, @response.body
-
+    reset!
+
-    @request.host = 'jamis.hostname.com'
-    get :index
-    assert_equal jamis_cache, @response.body
+
+    reset!
-
-    @request.host = 'david.hostname.com'

trunk/actionpack/test/controller/request_test.rb

@@ -253 +253 @@
-
-
-
+default_
-    @request.host = "rubyonrails.org"
-    @request.port = 80
-    assert_equal "rubyonrails.org", @request.host_with_port
-
+
+
+
-    @request.host = "rubyonrails.org"
-    @request.port = 81