* Removed Pixa/Tinami sources

* Upgraded to Rails 3.2.3 * Fixed tests
2012-06-01 19:22:58 -04:00
parent 105cba5963
commit 17881068e1
124 changed files with 1063 additions and 1214 deletions
--- a/test/functional/bans_controller_test.rb
+++ b/test/functional/bans_controller_test.rb
@@ -3,11 +3,11 @@ require 'test_helper'
 class BansControllerTest < ActionController::TestCase
  context "A bans controller" do
    setup do
-      @mod = Factory.create(:moderator_user)
+      @mod = FactoryGirl.create(:moderator_user)
      CurrentUser.user = @mod
      CurrentUser.ip_addr = "127.0.0.1"
-      @user = Factory.create(:user)
-      @ban = Factory.create(:ban, :user_id => @user.id)
+      @user = FactoryGirl.create(:user)
+      @ban = FactoryGirl.create(:ban, :user_id => @user.id)
    end
    
    teardown do