* 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/moderator/invitations_controller_test.rb
+++ b/test/functional/moderator/invitations_controller_test.rb
@@ -4,13 +4,13 @@ module Moderator
  class InvitationsControllerTest < ActionController::TestCase
    context "The invitations controller" do
      setup do
-        @mod = Factory.create(:moderator_user)
+        @mod = FactoryGirl.create(:moderator_user)
        CurrentUser.user = @mod
        CurrentUser.ip_addr = "127.0.0.1"
        MEMCACHE.flush_all
        
-        @user_1 = Factory.create(:user)
-        @user_2 = Factory.create(:user, :inviter_id => @mod.id)
+        @user_1 = FactoryGirl.create(:user)
+        @user_2 = FactoryGirl.create(:user, :inviter_id => @mod.id)
      end
      
      should "render the new page" do