* 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/maintenance/user/login_reminders_controller_test.rb
+++ b/test/functional/maintenance/user/login_reminders_controller_test.rb
@@ -5,8 +5,8 @@ module Maintenance
    class LoginRemindersControllerTest < ActionController::TestCase
      context "A login reminder controller" do
        setup do
-          @user = Factory.create(:user)
-          @blank_email_user = Factory.create(:user, :email => "")
+          @user = FactoryGirl.create(:user)
+          @blank_email_user = FactoryGirl.create(:user, :email => "")
          CurrentUser.user = nil
          CurrentUser.ip_addr = "127.0.0.1"
          ActionMailer::Base.delivery_method = :test