jaculabilis/danbooru
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

fixes #2469

Browse Source
This commit is contained in:
r888888888
2015-10-15 15:24:24 -07:00
parent 8a09151c14
commit 6480864718
30 changed files with 70 additions and 93 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
test/factories/user.rb
View File

@@ -29,7 +29,8 @@ FactoryGirl.define do
end
factory(:contributor_user) do
level 33
level 32
bit_prefs User.flag_value_for("can_upload_free")
end
factory(:janitor_user) do

5
test/functional/moderator/invitations_controller_test.rb
View File

@@ -19,10 +19,11 @@ module Moderator
end
should "create a new invite" do
post :create, {:invitation => {:user_id => @user_1.id, :level => User::Levels::CONTRIBUTOR}}, {:user_id => @mod.id}
post :create, {:invitation => {:user_id => @user_1.id, :level => User::Levels::BUILDER, :can_upload_free => "1"}}, {:user_id => @mod.id}
assert_redirected_to(moderator_invitations_path)
@user_1.reload
assert_equal(User::Levels::CONTRIBUTOR, @user_1.level)
assert_equal(User::Levels::BUILDER, @user_1.level)
assert_equal(true, @user_1.can_upload_free?)
end
should "list invites" do

27
test/unit/user_test.rb
View File

@@ -59,22 +59,23 @@ class UserTest < ActiveSupport::TestCase
end
should "work" do
@user.invite!(User::Levels::CONTRIBUTOR)
@user.invite!(User::Levels::BUILDER, "1")
@user.reload
assert_equal(User::Levels::CONTRIBUTOR, @user.level)
assert_equal(User::Levels::BUILDER, @user.level)
assert_equal(true, @user.can_upload_free)
end
should "not allow invites up to janitor level or beyond" do
@user.invite!(User::Levels::JANITOR)
@user.invite!(User::Levels::JANITOR, "1")
@user.reload
assert_equal(User::Levels::MEMBER, @user.level)
end
should "create a mod action" do
assert_difference("ModAction.count") do
@user.invite!(User::Levels::CONTRIBUTOR)
@user.invite!(User::Levels::BUILDER, "1")
end
assert_equal(%{"#{@user.name}":/users/#{@user.id} level changed Member -> Contributor}, ModAction.last.description)
assert_equal(%{"#{@user.name}":/users/#{@user.id} level changed Member -> Builder}, ModAction.last.description)
end
end
@@ -88,10 +89,8 @@ class UserTest < ActiveSupport::TestCase
should "limit post uploads" do
assert(!@user.can_upload?)
@user.update_column(:level, User::Levels::CONTRIBUTOR)
assert(@user.can_upload?)
@user.update_column(:level, User::Levels::MEMBER)
@user.update_column(:created_at, 15.days.ago)
assert(@user.can_upload?)
assert_equal(10, @user.upload_limit)
9.times do
@@ -156,42 +155,30 @@ class UserTest < ActiveSupport::TestCase
user = FactoryGirl.create(:user, :level => User::Levels::ADMIN)
assert(user.is_moderator?)
assert(user.is_janitor?)
assert(user.is_contributor?)
assert(user.is_gold?)
user = FactoryGirl.create(:user, :level => User::Levels::MODERATOR)
assert(!user.is_admin?)
assert(user.is_moderator?)
assert(user.is_janitor?)
assert(user.is_contributor?)
assert(user.is_gold?)
user = FactoryGirl.create(:user, :level => User::Levels::JANITOR)
assert(!user.is_admin?)
assert(!user.is_moderator?)
assert(user.is_janitor?)
assert(user.is_contributor?)
assert(user.is_gold?)
user = FactoryGirl.create(:user, :level => User::Levels::CONTRIBUTOR)
assert(!user.is_admin?)
assert(!user.is_moderator?)
assert(!user.is_janitor?)
assert(user.is_contributor?)
assert(user.is_gold?)
user = FactoryGirl.create(:user, :level => User::Levels::GOLD)
assert(!user.is_admin?)
assert(!user.is_moderator?)
assert(!user.is_janitor?)
assert(!user.is_contributor?)
assert(user.is_gold?)
user = FactoryGirl.create(:user)
assert(!user.is_admin?)
assert(!user.is_moderator?)
assert(!user.is_janitor?)
assert(!user.is_contributor?)
assert(!user.is_gold?)
end