* 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/posts_controller_test.rb
+++ b/test/functional/posts_controller_test.rb
@@ -3,10 +3,10 @@ require "test_helper"
 class PostsControllerTest < ActionController::TestCase
  context "The posts controller" do
    setup do
-      @user = Factory.create(:user)
+      @user = FactoryGirl.create(:user)
      CurrentUser.user = @user
      CurrentUser.ip_addr = "127.0.0.1"
-      @post = Factory.create(:post, :uploader_id => @user.id, :tag_string => "aaaa")
+      @post = FactoryGirl.create(:post, :uploader_id => @user.id, :tag_string => "aaaa")
      MEMCACHE.flush_all
    end