diff options
author | Stefan Wintermeyer <stefan.wintermeyer@amooma.de> | 2012-12-30 22:17:32 +0100 |
---|---|---|
committer | Stefan Wintermeyer <stefan.wintermeyer@amooma.de> | 2012-12-30 22:17:32 +0100 |
commit | af79440bd75d2cffb2eb0ba43b5cfe918a78162c (patch) | |
tree | fd6c4dab5dc56fed5f616ddec20e1f82780f20fe /test/functional/call_forwards_controller_test.rb | |
parent | 648f51a0ac97675d6cdf6a4b0c3c75bc9ea23168 (diff) | |
parent | 9f14a9a6573db607b79124524088803812454515 (diff) |
Merge branch 'rename_factory_class' into develop
Conflicts:
Gemfile.lock
Diffstat (limited to 'test/functional/call_forwards_controller_test.rb')
-rw-r--r-- | test/functional/call_forwards_controller_test.rb | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/test/functional/call_forwards_controller_test.rb b/test/functional/call_forwards_controller_test.rb index 0993623..da8e6c9 100644 --- a/test/functional/call_forwards_controller_test.rb +++ b/test/functional/call_forwards_controller_test.rb @@ -3,27 +3,27 @@ require 'test_helper' class CallForwardsControllerTest < ActionController::TestCase setup do - @user = Factory.create(:user) + @user = FactoryGirl.create(:user) - #@tenant = Factory.create(:tenant) + #@tenant = FactoryGirl.create(:tenant) #@tenant.tenant_memberships.create(:user_id => @user.id) #@user.update_attributes!(:current_tenant_id => @tenant.id) - @sip_account = Factory.create( + @sip_account = FactoryGirl.create( :sip_account, :sip_accountable => @user, ) @user.sip_accounts << @sip_account @sip_account = @user.sip_accounts.last - @phone_number = Factory.create( + @phone_number = FactoryGirl.create( :phone_number, :phone_numberable => @sip_account, ) @sip_account.phone_numbers << @phone_number @phone_number = @sip_account.phone_numbers.last - @call_forward = Factory.create( + @call_forward = FactoryGirl.create( :call_forward, :phone_number => @phone_number, ) @@ -50,7 +50,7 @@ class CallForwardsControllerTest < ActionController::TestCase # assert_difference('CallForward.count') do # post :create, # :phone_number_id => @phone_number.to_param, -# :call_forward => Factory.attributes_for( +# :call_forward => FactoryGirl.attributes_for( # :call_forward # ) # end |