Merge branch 'rename_factory_class' into develop

Conflicts:
	Gemfile.lock

1 files changed, 2 insertions, 2 deletions

diff --git a/test/unit/conference_invitee_test.rb b/test/unit/conference_invitee_test.rb
index bcc4c9b..2823709 100644
--- a/test/unit/conference_invitee_test.rb
+++ b/test/unit/conference_invitee_test.rb
@@ -3,11 +3,11 @@ require 'test_helper'
 class ConferenceInviteeTest < ActiveSupport::TestCase
   
   def test_should_have_a_valid_factory
-    assert Factory.build(:conference_invitee).valid?
+    assert FactoryGirl.build(:conference_invitee).valid?
   end
   
   test "parent conference should not have a phone number twice" do
-    invitee = Factory.create(:conference_invitee)
+    invitee = FactoryGirl.create(:conference_invitee)
     conference = invitee.conference
     phone_number = PhoneNumber.new(:number => invitee.phone_number.number)
     invitee_bad = conference.conference_invitees.build(:phone_number => phone_number)