* 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/advertisement_hits_controller_test.rb
+++ b/test/functional/advertisement_hits_controller_test.rb
@@ -3,8 +3,8 @@ require 'test_helper'
 class AdvertisementHitsControllerTest < ActionController::TestCase
  context "An advertisement hits controller" do
    setup do
-      @ad = Factory.create(:advertisement)
-      @advertiser = Factory.create(:admin_user)
+      @ad = FactoryGirl.create(:advertisement)
+      @advertiser = FactoryGirl.create(:admin_user)
    end

    should "create a new hit" do