This commit is contained in:
albert
2013-03-21 15:21:07 -07:00
parent 27342c8d9f
commit 5ba535efd3
3 changed files with 19 additions and 3 deletions

View File

@@ -406,9 +406,9 @@ class User < ActiveRecord::Base
def upload_limited_reason
if created_at > 1.week.ago
"You cannot upload during your first week of registration"
"cannot upload during your first week of registration"
elsif upload_limit <= 0
"You can only upload #{upload_limit} posts a day"
"can only upload #{upload_limit} posts a day"
else
nil
end

View File

@@ -28,4 +28,7 @@ en:
user_id: "You"
tag_subscription:
creator: "You"
creator_id: "You"
creator_id: "You"
upload:
uploader: "You"
uploader_id: "You"

View File

@@ -22,6 +22,19 @@ class UploadTest < ActiveSupport::TestCase
teardown do
FileUtils.rm_f(Dir.glob("#{Rails.root}/tmp/test.*"))
end
context "from a user that is limited" do
setup do
CurrentUser.user = FactoryGirl.create(:user, :created_at => 1.year.ago)
User.any_instance.stubs(:upload_limit).returns(0)
end
should "fail creation" do
@upload = FactoryGirl.build(:jpg_upload, :tag_string => "")
@upload.save
assert_equal(["You can only upload 0 posts a day"], @upload.errors.full_messages)
end
end
context "that has incredibly absurd res dimensions" do
setup do