aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack/test/controller/caching_test.rb
diff options
context:
space:
mode:
authorJeremy Kemper <jeremy@bitsweat.net>2008-08-12 17:03:17 -0700
committerJeremy Kemper <jeremy@bitsweat.net>2008-08-12 17:03:17 -0700
commit45b79d933cd2433b30ae98e7dadc4ae060e170c9 (patch)
tree6bc79848cf6aab926cdcfb51b298fe26b68a0ec0 /actionpack/test/controller/caching_test.rb
parent992fda16ed662f028700d63a8dcbd1837f1d58ab (diff)
parent08b0cf07dbc639c8609118eaeb34330d5168e8b2 (diff)
downloadrails-45b79d933cd2433b30ae98e7dadc4ae060e170c9.tar.gz
rails-45b79d933cd2433b30ae98e7dadc4ae060e170c9.tar.bz2
rails-45b79d933cd2433b30ae98e7dadc4ae060e170c9.zip
Merge branch 'conditional-get'
Diffstat (limited to 'actionpack/test/controller/caching_test.rb')
-rw-r--r--actionpack/test/controller/caching_test.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/actionpack/test/controller/caching_test.rb b/actionpack/test/controller/caching_test.rb
index 47a0fcf99d..b6cdd116e5 100644
--- a/actionpack/test/controller/caching_test.rb
+++ b/actionpack/test/controller/caching_test.rb
@@ -109,7 +109,7 @@ class PageCachingTest < Test::Unit::TestCase
uses_mocha("should_cache_ok_at_custom_path") do
def test_should_cache_ok_at_custom_path
- @request.expects(:path).returns("/index.html")
+ @request.stubs(:path).returns("/index.html")
get :ok
assert_response :ok
assert File.exist?("#{FILE_STORE_PATH}/index.html")