User/Person models merge

spec/factories/event_users.rb

@@ -1,10 +1,10 @@
 # Read about factories at https://github.com/thoughtbot/factory_girl
 
 FactoryGirl.define do
-  factory :event_person do
-    person
+  factory :event_user do
+    user
 
-    Hash[EventPerson::ROLES].values.each do |role|
+    Hash[EventUser::ROLES].values.each do |role|
       factory role do
         event_role role
       end

spec/factories/events.rb

@@ -33,7 +33,7 @@ FactoryGirl.define do
       libero quis porta ultricies. Fusce pulvinar accumsan lobortis.
     EOS
     after(:build) do |event|
-      event.event_people << build(:submitter, event: event)
+      event.event_users << build(:submitter, event: event)
     end
   end
 end

spec/factories/people.rb

@@ -1,18 +0,0 @@
-# Read about factories at https://github.com/thoughtbot/factory_girl
-
-FactoryGirl.define do
-  factory :person do
-    first_name 'Pat'
-    last_name 'Jones'
-    email 'pjones@nowhere.net'
-    biography <<-EOS
-      Lorem ipsum dolor sit amet, consectetur adipiscing elit. Vivamus enim
-      nunc, venenatis non sapien convallis, dictum suscipit purus. Vestibulum
-      sed tincidunt tortor. Fusce viverra nisi nisi, quis congue dui faucibus
-      nec. Sed sodales suscipit nulla, accumsan porttitor augue ultrices vel.
-      Quisque cursus facilisis consequat. Etiam volutpat ligula turpis, at
-      gravida.
-    EOS
-  end
-
-end

spec/factories/registration.rb

@@ -2,7 +2,7 @@
 
 FactoryGirl.define do
   factory :registration do
-    person
+    user
     conference
   end
 end

spec/factories/users.rb

@@ -2,9 +2,18 @@
 FactoryGirl.define do
   factory :user do
     sequence(:email) { |n| "example#{n}@example.com" }
+    sequence(:name) { |n| "name#{n}" }
     password 'changeme'
     password_confirmation 'changeme'
     confirmed_at Time.now
+    biography <<-EOS
+      Lorem ipsum dolor sit amet, consectetur adipiscing elit. Vivamus enim
+      nunc, venenatis non sapien convallis, dictum suscipit purus. Vestibulum
+      sed tincidunt tortor. Fusce viverra nisi nisi, quis congue dui faucibus
+      nec. Sed sodales suscipit nulla, accumsan porttitor augue ultrices vel.
+      Quisque cursus facilisis consequat. Etiam volutpat ligula turpis, at
+      gravida.
+    EOS
 
     factory :participant do
       after(:create) { |user| user.role_ids = create(:participant_role).id }