added limit methods to user, more work on post views

test/factories/comment_vote.rb

@@ -0,0 +1,4 @@
+Factory.define(:comment_vote) do |f|
+  f.comment {|x| x.association(:comment)}
+  f.user {|x| x.association(:user)}
+end

test/factories/user.rb

@@ -1,8 +1,10 @@
 Factory.define(:user) do |f|
   f.name {Faker::Name.first_name}
+  f.password "password"
   f.password_hash {User.sha1("password")}
   f.email {Faker::Internet.email}
   f.default_image_size "medium"
+  f.base_upload_limit 10
 end
 
 Factory.define(:banned_user, :parent => :user) do |f|

test/test_helper.rb

@@ -1,4 +1,5 @@
 require File.expand_path(File.dirname(__FILE__) + "/../config/environment")
+
 require 'shoulda'
 require 'factory_girl'
 require 'mocha'

test/unit/user_test.rb

@@ -6,6 +6,45 @@ class UserTest < ActiveSupport::TestCase
       MEMCACHE.flush_all
     end
     
+    should "limit post uploads" do
+      user = Factory.create(:user)
+      assert(!user.can_upload?)
+      user.update_attribute(:is_contributor, true)
+      assert(user.can_upload?)
+      user.update_attribute(:is_contributor, false)
+      
+      40.times do
+        Factory.create(:post, :uploader => user, :is_deleted => true)
+      end
+      
+      assert(!user.can_upload?)
+    end
+    
+    should "limit comment votes" do
+      user = Factory.create(:user)
+      assert(user.can_comment_vote?)
+      12.times do
+        Factory.create(:comment_vote, :user => user)
+      end
+      assert(!user.can_comment_vote?)
+      CommentVote.update_all("created_at = '1990-01-01'")
+      assert(user.can_comment_vote?)
+    end
+    
+    should "limit comments" do
+      user = Factory.create(:user)
+      assert(!user.can_comment?)
+      user.update_attribute(:is_privileged, true)
+      assert(user.can_comment?)
+      user.update_attribute(:is_privileged, false)
+      user.update_attribute(:created_at, 1.year.ago)
+      assert(user.can_comment?)
+      (Danbooru.config.member_comment_limit + 1).times do
+        Factory.create(:comment, :creator => user)
+      end
+      assert(!user.can_comment?)
+    end
+    
     should "verify" do
       user = Factory.create(:user)
       assert(user.is_verified?)
@@ -17,7 +56,7 @@ class UserTest < ActiveSupport::TestCase
       assert_nothing_raised {user.verify!(user.email_verification_key)}
       assert(user.is_verified?)
     end
-    
+      
     should "authenticate" do
       @user = Factory.create(:user)
       assert(User.authenticate(@user.name, "password"), "Authentication should have succeeded")
@@ -25,42 +64,42 @@ class UserTest < ActiveSupport::TestCase
       assert(User.authenticate_hash(@user.name, @user.password_hash), "Authentication should have succeeded")
       assert(!User.authenticate_hash(@user.name, "xxxx"), "Authentication should not have succeeded")
     end
-    
+      
     should "normalize its level" do
       user = Factory.create(:user, :is_admin => true)
       assert(user.is_moderator?)
       assert(user.is_janitor?)
       assert(user.is_contributor?)
       assert(user.is_privileged?)
-      
+    
       user = Factory.create(:user, :is_moderator => true)      
       assert(!user.is_admin?)
       assert(user.is_moderator?)
       assert(user.is_janitor?)
       assert(!user.is_contributor?)
       assert(user.is_privileged?)
-
+    
       user = Factory.create(:user, :is_janitor => true)      
       assert(!user.is_admin?)
       assert(!user.is_moderator?)
       assert(user.is_janitor?)
       assert(!user.is_contributor?)
       assert(user.is_privileged?)
-
+    
       user = Factory.create(:user, :is_contributor => true)      
       assert(!user.is_admin?)
       assert(!user.is_moderator?)
       assert(!user.is_janitor?)
       assert(user.is_contributor?)
       assert(user.is_privileged?)
-
+    
       user = Factory.create(:user, :is_privileged => true)      
       assert(!user.is_admin?)
       assert(!user.is_moderator?)
       assert(!user.is_janitor?)
       assert(!user.is_contributor?)
       assert(user.is_privileged?)
-
+    
       user = Factory.create(:user)      
       assert(!user.is_admin?)
       assert(!user.is_moderator?)
@@ -68,24 +107,24 @@ class UserTest < ActiveSupport::TestCase
       assert(!user.is_contributor?)
       assert(!user.is_privileged?)
     end
-    
+      
     context "name" do
       should "be #{Danbooru.config.default_guest_name} given an invalid user id" do
         assert_equal(Danbooru.config.default_guest_name, User.find_name(-1))
       end
-      
+    
       should "be fetched given a user id" do
         @user = Factory.create(:user)
         assert_equal(@user.name, User.find_name(@user.id))
       end
-      
+    
       should "be updated" do
         @user = Factory.create(:user)
         @user.update_attribute(:name, "danzig")
         assert_equal("danzig", User.find_name(@user.id))
       end
     end
-    
+      
     context "password" do
       should "match the confirmation" do
         @user = Factory.create(:user)
@@ -95,7 +134,7 @@ class UserTest < ActiveSupport::TestCase
         @user.reload
         assert(User.authenticate(@user.name, "zugzug5"), "Authentication should have succeeded")
       end
-    
+      
       should "match the confirmation" do
         @user = Factory.create(:user)
         @user.password = "zugzug6"
@@ -103,7 +142,7 @@ class UserTest < ActiveSupport::TestCase
         @user.save
         assert_equal(["Password doesn't match confirmation"], @user.errors.full_messages)
       end
-    
+      
       should "not be too short" do
         @user = Factory.create(:user)
         @user.password = "x5"
@@ -111,7 +150,7 @@ class UserTest < ActiveSupport::TestCase
         @user.save
         assert_equal(["Password is too short (minimum is 5 characters)"], @user.errors.full_messages)
       end
-    
+      
       should "should be reset" do
         @user = Factory.create(:user)
         new_pass = @user.reset_password