Merge branch 'rename_factory_class' into develop

Conflicts:
	Gemfile.lock

1 files changed, 5 insertions, 5 deletions

diff --git a/test/unit/sip_account_test.rb b/test/unit/sip_account_test.rb
index 6595ccc..e85e493 100644
--- a/test/unit/sip_account_test.rb
+++ b/test/unit/sip_account_test.rb
@@ -3,21 +3,21 @@ require 'test_helper'
 class SipAccountTest < ActiveSupport::TestCase
   
   def test_should_have_a_valid_factory
-    assert Factory.build(:sip_account).valid?
+    assert FactoryGirl.build(:sip_account).valid?
   end
   
   test "that the value_of_to_s field is filled" do
-    sip_account = Factory.create(:sip_account)
+    sip_account = FactoryGirl.create(:sip_account)
     assert_equal sip_account.value_of_to_s, sip_account.to_s
   end
   
   test "should have a unique auth_name per sip_domain" do
-    provider_sip_domain = Factory.create(:sip_domain)
+    provider_sip_domain = FactoryGirl.create(:sip_domain)
     tenants      = []
     sip_accounts = []
     2.times { |i|
-      tenants[i] = provider_sip_domain.tenants.create(Factory.build(:tenant).attributes)
-      sip_accounts[i] = Factory.build(
+      tenants[i] = provider_sip_domain.tenants.create(FactoryGirl.build(:tenant).attributes)
+      sip_accounts[i] = FactoryGirl.build(
         :sip_account,
         :sip_accountable => tenants[i],
         :auth_name => "somerandomauthname",