fix text
This commit is contained in:
@@ -406,9 +406,9 @@ class User < ActiveRecord::Base
|
|||||||
|
|
||||||
def upload_limited_reason
|
def upload_limited_reason
|
||||||
if created_at > 1.week.ago
|
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
|
elsif upload_limit <= 0
|
||||||
"You can only upload #{upload_limit} posts a day"
|
"can only upload #{upload_limit} posts a day"
|
||||||
else
|
else
|
||||||
nil
|
nil
|
||||||
end
|
end
|
||||||
|
|||||||
@@ -28,4 +28,7 @@ en:
|
|||||||
user_id: "You"
|
user_id: "You"
|
||||||
tag_subscription:
|
tag_subscription:
|
||||||
creator: "You"
|
creator: "You"
|
||||||
creator_id: "You"
|
creator_id: "You"
|
||||||
|
upload:
|
||||||
|
uploader: "You"
|
||||||
|
uploader_id: "You"
|
||||||
@@ -22,6 +22,19 @@ class UploadTest < ActiveSupport::TestCase
|
|||||||
teardown do
|
teardown do
|
||||||
FileUtils.rm_f(Dir.glob("#{Rails.root}/tmp/test.*"))
|
FileUtils.rm_f(Dir.glob("#{Rails.root}/tmp/test.*"))
|
||||||
end
|
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
|
context "that has incredibly absurd res dimensions" do
|
||||||
setup do
|
setup do
|
||||||
|
|||||||
Reference in New Issue
Block a user