aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack/test/controller
diff options
context:
space:
mode:
authorYehuda Katz <wycats@gmail.com>2009-10-29 00:37:29 -0400
committerYehuda Katz <wycats@gmail.com>2009-10-29 00:44:12 -0400
commit51c24ae3e3c1a260a304042aff5e1a7c56faabfe (patch)
treee7d2d4aab16ea617de48ac19df3f66a725eb9cb8 /actionpack/test/controller
parenta288b74f1c75c6f100de7611a5093a421f1ad6d1 (diff)
downloadrails-51c24ae3e3c1a260a304042aff5e1a7c56faabfe.tar.gz
rails-51c24ae3e3c1a260a304042aff5e1a7c56faabfe.tar.bz2
rails-51c24ae3e3c1a260a304042aff5e1a7c56faabfe.zip
Caching refactoring
Diffstat (limited to 'actionpack/test/controller')
-rw-r--r--actionpack/test/controller/caching_test.rb8
1 files changed, 6 insertions, 2 deletions
diff --git a/actionpack/test/controller/caching_test.rb b/actionpack/test/controller/caching_test.rb
index df2dee8228..3ce90b6ccf 100644
--- a/actionpack/test/controller/caching_test.rb
+++ b/actionpack/test/controller/caching_test.rb
@@ -228,12 +228,16 @@ class ActionCachingMockController
@mock_url_for
end
+ def params
+ request.parameters
+ end
+
def request
mocked_path = @mock_path
Object.new.instance_eval(<<-EVAL)
def path; '#{@mock_path}' end
def format; 'all' end
- def cache_format; nil end
+ def parameters; {:format => nil}; end
self
EVAL
end
@@ -466,7 +470,7 @@ class ActionCacheTest < ActionController::TestCase
@mock_controller.mock_url_for = 'http://example.org/'
@mock_controller.mock_path = '/'
- assert_equal 'example.org/index', @path_class.path_for(@mock_controller, {})
+ assert_equal 'example.org/index', @path_class.new(@mock_controller, {}).path
end
def test_file_extensions