fixes #3007: Eliminate Janitor role

test/factories/user.rb

@@ -43,12 +43,6 @@ FactoryGirl.define do
       bit_prefs User.flag_value_for("can_upload_free")
     end
 
-
-    factory(:janitor_user) do
-      level 35
-      can_approve_posts true
-    end
-
     factory(:moderator_user) do
       level 40
       can_approve_posts true

test/unit/ban_test.rb

@@ -35,10 +35,6 @@ class BanTest < ActiveSupport::TestCase
         ban = FactoryGirl.create(:ban, :user => user, :banner => @banner)
         assert(ban.errors.empty?)
 
-        user = FactoryGirl.create(:janitor_user)
-        ban = FactoryGirl.create(:ban, :user => user, :banner => @banner)
-        assert(ban.errors.empty?)
-
         user = FactoryGirl.create(:contributor_user)
         ban = FactoryGirl.create(:ban, :user => user, :banner => @banner)
         assert(ban.errors.empty?)
@@ -79,10 +75,6 @@ class BanTest < ActiveSupport::TestCase
       end
 
       should "be valid against anyone who is not an admin or a moderator" do
-        user = FactoryGirl.create(:janitor_user)
-        ban = FactoryGirl.create(:ban, :user => user, :banner => @banner)
-        assert(ban.errors.empty?)
-
         user = FactoryGirl.create(:contributor_user)
         ban = FactoryGirl.create(:ban, :user => user, :banner => @banner)
         assert(ban.errors.empty?)
@@ -97,52 +89,6 @@ class BanTest < ActiveSupport::TestCase
       end
     end
 
-    context "created by a janitor" do
-      setup do
-        @banner = FactoryGirl.create(:janitor_user)
-        CurrentUser.user = @banner
-        CurrentUser.ip_addr = "127.0.0.1"
-      end
-
-      teardown do
-        @banner = nil
-        CurrentUser.user = nil
-        CurrentUser.ip_addr = nil
-      end
-
-      should "always be invalid" do
-        user = FactoryGirl.create(:admin_user)
-        ban = FactoryGirl.build(:ban, :user => user, :banner => @banner)
-        ban.save
-        assert(ban.errors.any?)
-
-        user = FactoryGirl.create(:moderator_user)
-        ban = FactoryGirl.build(:ban, :user => user, :banner => @banner)
-        ban.save
-        assert(ban.errors.any?)
-
-        user = FactoryGirl.create(:janitor_user)
-        ban = FactoryGirl.build(:ban, :user => user, :banner => @banner)
-        ban.save
-        assert(ban.errors.any?)
-
-        user = FactoryGirl.create(:contributor_user)
-        ban = FactoryGirl.build(:ban, :user => user, :banner => @banner)
-        ban.save
-        assert(ban.errors.any?)
-
-        user = FactoryGirl.create(:gold_user)
-        ban = FactoryGirl.build(:ban, :user => user, :banner => @banner)
-        ban.save
-        assert(ban.errors.any?)
-
-        user = FactoryGirl.create(:user)
-        ban = FactoryGirl.build(:ban, :user => user, :banner => @banner)
-        ban.save
-        assert(ban.errors.any?)
-      end
-    end
-
     should "initialize the expiration date" do
       user = FactoryGirl.create(:user)
       admin = FactoryGirl.create(:admin_user)

test/unit/post_test.rb

@@ -420,8 +420,8 @@ class PostTest < ActiveSupport::TestCase
 
       context "that was previously approved by person X" do
         setup do
-          @user = FactoryGirl.create(:janitor_user, :name => "xxx")
-          @user2 = FactoryGirl.create(:janitor_user, :name => "yyy")
+          @user = FactoryGirl.create(:moderator_user, :name => "xxx")
+          @user2 = FactoryGirl.create(:moderator_user, :name => "yyy")
           @post = FactoryGirl.create(:post, :approver_id => @user.id)
           @post.flag!("bad")
         end

test/unit/user_test.rb

@@ -63,12 +63,6 @@ class UserTest < ActiveSupport::TestCase
         assert_equal(true, @user.can_upload_free)
       end
 
-      should "not allow invites up to janitor level or beyond" do
-        @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::BUILDER, "1")
@@ -152,31 +146,21 @@ class UserTest < ActiveSupport::TestCase
     should "normalize its level" do
       user = FactoryGirl.create(:user, :level => User::Levels::ADMIN)
       assert(user.is_moderator?)
-      assert(user.is_janitor?)
       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_gold?)
-
-      user = FactoryGirl.create(:user, :level => User::Levels::JANITOR)
-      assert(!user.is_admin?)
-      assert(!user.is_moderator?)
-      assert(user.is_janitor?)
       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_gold?)
 
       user = FactoryGirl.create(:user)
       assert(!user.is_admin?)
       assert(!user.is_moderator?)
-      assert(!user.is_janitor?)
       assert(!user.is_gold?)
     end