From be10906044953aef524ca8167c19af3d2085954e Mon Sep 17 00:00:00 2001
From: albert <r888888888@gmail.com>
Date: Thu, 18 Mar 2010 18:35:16 -0400
Subject: [PATCH] fixed unit tests

---
 app/models/comment.rb    | 2 +-
 test/factories/upload.rb | 2 +-
 test/unit/ban_test.rb    | 4 ++--
 test/unit/upload_test.rb | 4 ++--
 4 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/app/models/comment.rb b/app/models/comment.rb
index 1d193ae96..f81aaa8a7 100644
--- a/app/models/comment.rb
+++ b/app/models/comment.rb
@@ -9,7 +9,7 @@ class Comment < ActiveRecord::Base
   attr_accessor :do_not_bump_post
   
   scope :recent, :order => "comments.id desc", :limit => 6
-  scope :search_body, lambda {|query| where("body_index @@ plainto_tsquery(?)", query)}
+  scope :search_body, lambda {|query| where("body_index @@ plainto_tsquery(?)", query).order("comments.id DESC")}
   scope :hidden, lambda {|user| where("score < ?", user.comment_threshold)}
 
   def update_last_commented_at
diff --git a/test/factories/upload.rb b/test/factories/upload.rb
index e6f1929c4..09ae486c7 100644
--- a/test/factories/upload.rb
+++ b/test/factories/upload.rb
@@ -2,7 +2,7 @@ require 'fileutils'
 
 Factory.define(:upload) do |f|
   f.rating "s"
-  f.uploader {|x| x.association(:user)}
+  f.uploader {|x| x.association(:user, :is_contributor => true)}
   f.uploader_ip_addr "127.0.0.1"
   f.tag_string "special"
   f.status "pending"
diff --git a/test/unit/ban_test.rb b/test/unit/ban_test.rb
index 1b9dadff5..1c3f597a7 100644
--- a/test/unit/ban_test.rb
+++ b/test/unit/ban_test.rb
@@ -147,11 +147,11 @@ class BanTest < ActiveSupport::TestCase
 
         user = Factory.create(:user)
         ban = Factory.create(:ban, :user => user, :banner => admin, :duration => -1)
-        assert(!Ban.is_user_banned?(user))
+        assert(!Ban.is_banned?(user))
 
         user = Factory.create(:user)
         ban = Factory.create(:ban, :user => user, :banner => admin, :duration => 1)
-        assert(Ban.is_user_banned?(user))
+        assert(Ban.is_banned?(user))
       end
     end    
   end
diff --git a/test/unit/upload_test.rb b/test/unit/upload_test.rb
index 9dc4c5a6c..761262a01 100644
--- a/test/unit/upload_test.rb
+++ b/test/unit/upload_test.rb
@@ -125,7 +125,7 @@ class UploadTest < ActiveSupport::TestCase
       assert_equal(110, post.image_height)
       assert_equal(8558, post.file_size)
       assert_equal(post.id, @upload.post_id)
-      assert_equal("finished", @upload.status)
+      assert_equal("completed", @upload.status)
     end
   end
   
@@ -151,6 +151,6 @@ class UploadTest < ActiveSupport::TestCase
     assert(File.exists?(post.file_path))
     assert_equal(28086, File.size(post.file_path))
     assert_equal(post.id, @upload.post_id)
-    assert_equal("finished", @upload.status)    
+    assert_equal("completed", @upload.status)    
   end
 end