* 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/news_updates_controller_test.rb
+++ b/test/functional/news_updates_controller_test.rb
@@ -3,10 +3,10 @@ require 'test_helper'
 class NewsUpdatesControllerTest < ActionController::TestCase
  context "the news updates controller" do
    setup do
-      @admin = Factory.create(:admin_user)
+      @admin = FactoryGirl.create(:admin_user)
      CurrentUser.user = @admin
      CurrentUser.ip_addr = "127.0.0.1"
-      @news_update = Factory.create(:news_update)
+      @news_update = FactoryGirl.create(:news_update)
    end
    
    teardown do