fix tests

test/unit/ban_test.rb

@@ -146,19 +146,19 @@ class BanTest < ActiveSupport::TestCase
     should "initialize the expiration date" do
       user = FactoryGirl.create(:user)
       admin = FactoryGirl.create(:admin_user)
-      CurrentUser.user = admin
-      ban = FactoryGirl.create(:ban, :user => user, :banner => admin)
-      CurrentUser.user = nil
-      assert_not_nil(ban.expires_at)
+      CurrentUser.scoped(admin) do
+        ban = FactoryGirl.create(:ban, :user => user, :banner => admin)
+        assert_not_nil(ban.expires_at)
+      end
     end
 
     should "update the user's feedback" do
       user = FactoryGirl.create(:user)
       admin = FactoryGirl.create(:admin_user)
       assert(user.feedback.empty?)
-      CurrentUser.user = admin
-      ban = FactoryGirl.create(:ban, :user => user, :banner => admin)
-      CurrentUser.user = nil
+      CurrentUser.scoped(admin) do
+        FactoryGirl.create(:ban, :user => user, :banner => admin)
+      end
       assert(!user.feedback.empty?)
       assert_equal("negative", user.feedback.last.category)
     end