1 files changed, 18 insertions, 23 deletions
diff --git a/spec/support/factories.rb b/spec/support/factories.rb
index 9a5bb87..1dc613d 100644
--- a/spec/support/factories.rb
+++ b/spec/support/factories.rb
@@ -1,23 +1,18 @@
-# FactoryGirl.define do
-#   
-#   factory :user do
-#     email {Factory.next(:email)}
-#     first_name 'user'
-#     last_name 'usered'
-#     username {Factory.next(:login)}
-#     password "foobar"
-#     password_confirmation { |u| u.password }
-#     role 2
-#   end
-# 
-#   factory :discussion do
-#     recipient_ids {[Factory(:user).id, Factory(:user).id]}
-#   end
-# 
-#   factory :message do
-#     association :user
-#     association :discussion
-#     # user {Factory(:user)}
-#     # discussion {Factory(:discussion)}
-#   end
-# end
-\ No newline at end of file
+FactoryGirl.define do
+  
+  factory :user do
+    email { Factory.next(:email) }
+    name 'user'
+    password "foobar"
+    password_confirmation { |u| u.password }
+  end
+
+  factory :discussion do
+    recipient_ids {[Factory(:user).id, Factory(:user).id]}
+  end
+
+  factory :message do
+    association :user
+    association :discussion
+  end
+end
+\ No newline at end of file