Merge remote-tracking branch 'upstream/pull/1580'

[rails.git] / test / factories / user_preferences.rb

diff --git a/test/factories/user_preferences.rb b/test/factories/user_preferences.rb
index 552cfcd75e5c922dbc93019ded21cf9460e9e036..e6f0d6b874a917aa659c86a18980cd611b5b48c6 100644 (file)
--- a/test/factories/user_preferences.rb
+++ b/test/factories/user_preferences.rb
@@ -3,7 +3,6 @@ FactoryGirl.define do
     sequence(:k) { |n| "Key #{n}" }
     sequence(:v) { |n| "Value #{n}" }
 
-    # FIXME: needs user factory
-    user_id 1
+    user
   end
 end