* 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/ip_addrs_controller_test.rb
+++ b/test/functional/moderator/ip_addrs_controller_test.rb
@@ -4,10 +4,10 @@ module Moderator
  class IpAddrsControllerTest < ActionController::TestCase
    context "The ip addrs controller" do
      setup do
-        @user = Factory.create(:moderator_user)
+        @user = FactoryGirl.create(:moderator_user)
        CurrentUser.user = @user
        CurrentUser.ip_addr = "127.0.0.1"
-        Factory.create(:comment)
+        FactoryGirl.create(:comment)
        MEMCACHE.flush_all
      end