From e3ddafa265e582e67a0eb34446a442068ba89a9b Mon Sep 17 00:00:00 2001
From: albert <r888888888@gmail.com>
Date: Mon, 18 Feb 2013 20:59:45 -0500
Subject: [PATCH] fix tests

---
 app/helpers/advertisements_helper.rb          | 32 ++++++++++---------
 app/presenters/tag_set_presenter.rb           |  1 -
 .../functional/forum_posts_controller_test.rb |  3 +-
 3 files changed, 19 insertions(+), 17 deletions(-)

diff --git a/app/helpers/advertisements_helper.rb b/app/helpers/advertisements_helper.rb
index d17bddb4f..221daef54 100644
--- a/app/helpers/advertisements_helper.rb
+++ b/app/helpers/advertisements_helper.rb
@@ -2,21 +2,23 @@ module AdvertisementsHelper
   def render_advertisement(ad_type)
 		if Danbooru.config.can_see_ads?(CurrentUser.user)
 	    @advertisement = Advertisement.find(:first, :conditions => ["ad_type = ? AND status = 'active'", ad_type], :order => "random()")
-	    content_tag(
-	      "div", 
-	      link_to(
-	        image_tag(
-	          @advertisement.image_url, 
-	          :alt => "Advertisement", 
-	          :width => @advertisement.width, 
-	          :height => @advertisement.height
-	        ), 
-	        advertisement_hits_path(:advertisement_id => @advertisement.id),
-	        :remote => true,
-	        :method => :post
-	      ),
-        :style => "margin-bottom: 1em;"
-	    )
+	    if @advertisement
+  	    content_tag(
+  	      "div", 
+  	      link_to(
+  	        image_tag(
+  	          @advertisement.image_url, 
+  	          :alt => "Advertisement", 
+  	          :width => @advertisement.width, 
+  	          :height => @advertisement.height
+  	        ), 
+  	        advertisement_hits_path(:advertisement_id => @advertisement.id),
+  	        :remote => true,
+  	        :method => :post
+  	      ),
+          :style => "margin-bottom: 1em;"
+  	    )
+	    end
 		else
 			""
 		end
diff --git a/app/presenters/tag_set_presenter.rb b/app/presenters/tag_set_presenter.rb
index d96497bb1..c2817c7a5 100644
--- a/app/presenters/tag_set_presenter.rb
+++ b/app/presenters/tag_set_presenter.rb
@@ -7,7 +7,6 @@
 class TagSetPresenter < Presenter
   def initialize(tags)
     @tags = tags
-    puts @tags.inspect
   end
   
   def tag_list_html(template, options = {})
diff --git a/test/functional/forum_posts_controller_test.rb b/test/functional/forum_posts_controller_test.rb
index 17f83531e..e4647560c 100644
--- a/test/functional/forum_posts_controller_test.rb
+++ b/test/functional/forum_posts_controller_test.rb
@@ -76,7 +76,8 @@ class ForumPostsControllerTest < ActionController::TestCase
     
     context "destroy action" do
       should "destroy the posts" do
-        post :destroy, {:id => @forum_post.id}, {:user_id => @user.id}
+        CurrentUser.user = @mod
+        post :destroy, {:id => @forum_post.id}, {:user_id => @mod.id}
         assert_redirected_to(forum_post_path(@forum_post))
         @forum_post.reload
         assert_equal(true, @forum_post.is_deleted?)