fixed test failures

nakajima · Feb 3, 2009 · 443df4c · 443df4c
1 parent 07a4526
commit 443df4c
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 5 deletions.
diff --git a/app/controllers/posts_controller.rb b/app/controllers/posts_controller.rb
@@ -42,7 +42,7 @@ def show
   private
 
   def current_post
-    @current_post ||= Post.find_by_permalink(params[:id], :include => :comments) || Post.find(params[:id])
+    @post ||= Post.find_by_permalink(params[:id], :include => :comments) || Post.find(params[:id])
   end
 
   def post_type

diff --git a/test/integration/caching_integration_test.rb b/test/integration/caching_integration_test.rb
@@ -76,10 +76,10 @@ def test_should_page_cache_articles_page_link
   def test_should_be_able_to_expire_by_path
     get_paths '/', '/posts/page/1', '/articles', '/articles/page/1'
     assert_cache_expired('/index.html', '/posts/', '/articles/', '/articles') do
-      @controller.expire_path('/index.html')
-      @controller.expire_path('/posts')
-      @controller.expire_path('/articles.html')
-      @controller.expire_path('/articles')
+      @controller.send :expire_path, '/index.html'
+      @controller.send :expire_path, '/posts'
+      @controller.send :expire_path, '/articles.html'
+      @controller.send :expire_path, '/articles'
     end
   end