* 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/factories/pool.rb
+++ b/test/factories/pool.rb
@@ -1,5 +1,7 @@
-Factory.define(:pool) do |f|
-  f.name {(rand(1_000_000) + 100).to_s}
-  f.creator {|x| x.association(:user)}
-  f.description {Faker::Lorem.sentences}
+FactoryGirl.define do
+  factory(:pool) do
+    name {(rand(1_000_000) + 100).to_s}
+    association :creator, :factory => :user
+    description {Faker::Lorem.sentences.join(" ")}
+  end
 end