From eb1ba8f708a9cafad38f864c4a7b3df0880f0572 Mon Sep 17 00:00:00 2001
From: albert <r888888888@gmail.com>
Date: Sun, 17 Feb 2013 21:32:07 -0500
Subject: [PATCH] fix tests

---
 app/logical/sources/strategies/pixiv.rb    | 2 +-
 app/models/post.rb                         | 6 +-----
 test/unit/moderator/ip_addr_search_test.rb | 6 +++---
 test/unit/post_test.rb                     | 4 ++--
 4 files changed, 7 insertions(+), 11 deletions(-)

diff --git a/app/logical/sources/strategies/pixiv.rb b/app/logical/sources/strategies/pixiv.rb
index 66a5353f3..9d35e26ef 100644
--- a/app/logical/sources/strategies/pixiv.rb
+++ b/app/logical/sources/strategies/pixiv.rb
@@ -27,7 +27,7 @@ module Sources
       def get_profile_from_page(page)
         profile_url = page.search("a.user-link").first
         if profile_url
-          profile_url = profile_url["href"]
+          profile_url = "http://www.pixiv.net" + profile_url["href"]
         end
         
         artist_name = page.search("h1.user").first
diff --git a/app/models/post.rb b/app/models/post.rb
index 3f7c6f955..4326674d5 100644
--- a/app/models/post.rb
+++ b/app/models/post.rb
@@ -596,10 +596,6 @@ class Post < ActiveRecord::Base
     def fast_count(tags = "")
       tags = tags.to_s.strip
       
-      if tags.blank?
-        return Danbooru.config.blank_tag_search_fast_count || 1_000_000
-      end
-      
       count = get_count_from_cache(tags)
       if count.nil?
         if tags.blank? && Danbooru.config.blank_tag_search_fast_count
@@ -615,7 +611,7 @@ class Post < ActiveRecord::Base
         end
       end
 
-      count
+      count.to_i
     rescue SearchError
       0
     end
diff --git a/test/unit/moderator/ip_addr_search_test.rb b/test/unit/moderator/ip_addr_search_test.rb
index b9e01daa5..e3587baff 100644
--- a/test/unit/moderator/ip_addr_search_test.rb
+++ b/test/unit/moderator/ip_addr_search_test.rb
@@ -18,17 +18,17 @@ module Moderator
       end
     
       should "find by ip addr" do
-        @search = IpAddrSearch.new(:ip_addr_eq => "127.0.0.1")
+        @search = IpAddrSearch.new(:ip_addr => "127.0.0.1")
         assert_equal({@user.id.to_s => 2}, @search.execute)
       end
       
       should "find by user id" do
-        @search = IpAddrSearch.new(:user_id_eq => @user.id.to_s)
+        @search = IpAddrSearch.new(:user_id => @user.id.to_s)
         assert_equal({"127.0.0.1" => 2}, @search.execute)
       end
 
       should "find by user name" do
-        @search = IpAddrSearch.new(:user_name_eq => @user.name)
+        @search = IpAddrSearch.new(:user_name => @user.name)
         assert_equal({"127.0.0.1" => 2}, @search.execute)
       end
     end
diff --git a/test/unit/post_test.rb b/test/unit/post_test.rb
index 2361a1d5e..81bd71974 100644
--- a/test/unit/post_test.rb
+++ b/test/unit/post_test.rb
@@ -759,7 +759,7 @@ class PostTest < ActiveSupport::TestCase
       assert_equal(post1.id, relation.first.id)
     end
   
-    should "return posts for the <uploader> metatag" do
+    should "return posts for the <user> metatag" do
       second_user = FactoryGirl.create(:user)
       post1 = FactoryGirl.create(:post, :uploader => CurrentUser.user)
       
@@ -770,7 +770,7 @@ class PostTest < ActiveSupport::TestCase
         post3 = FactoryGirl.create(:post)
       end
 
-      relation = Post.tag_match("uploader:#{CurrentUser.user.name}")
+      relation = Post.tag_match("user:#{CurrentUser.user.name}")
       assert_equal(1, relation.count)
       assert_equal(post1.id, relation.first.id)
     end