* 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/artist_url.rb
+++ b/test/factories/artist_url.rb
@@ -1,4 +1,6 @@
-Factory.define(:artist_url) do |f|
-  f.artist {|x| x.association(:artist)}
-  f.url {Faker::Internet.domain_name}
-end
+FactoryGirl.define do
+  factory(:artist_url) do
+    artist
+    url {Faker::Internet.domain_name}
+  end
+end