* 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/post.rb
+++ b/test/factories/post.rb
@@ -1,13 +1,15 @@
-Factory.define(:post) do |f|
-  f.md5 {|x| Time.now.to_f.to_s}
-  f.uploader {|x| x.association(:user)}
-  f.uploader_ip_addr "127.0.0.1"
-  f.tag_string "tag1 tag2"
-  f.tag_count 2
-  f.tag_count_general 2
-  f.file_ext "jpg"
-  f.image_width 100
-  f.image_height 200
-  f.file_size 2000
-  f.rating "q"
-end
+FactoryGirl.define do
+  factory(:post) do
+    md5 {|x| Time.now.to_f.to_s}
+    uploader :factory => :user
+    uploader_ip_addr "127.0.0.1"
+    tag_string "tag1 tag2"
+    tag_count 2
+    tag_count_general 2
+    file_ext "jpg"
+    image_width 100
+    image_height 200
+    file_size 2000
+    rating "q"
+  end
+end