Merge branch 'rename_factory_class' into develop

Conflicts:
	Gemfile.lock

1 files changed, 15 insertions, 13 deletions

diff --git a/test/factories/call_forwards.rb b/test/factories/call_forwards.rb
index d275e9d..bdb899e 100644
--- a/test/factories/call_forwards.rb
+++ b/test/factories/call_forwards.rb
@@ -1,16 +1,18 @@
 # Read about factories at http://github.com/thoughtbot/factory_girl
 
-Factory.define :call_forward do |f|
-  f.association :phone_number
-  #OPTIMIZE Make sure that the phone_number's phone_numberable
-  # isn't a phone_book_entry but a sip_account.
-  #f.sequence( :call_forward_case_id ) { |n| CallForwardCase.where(:value => "always").first.id }
-  #f.association :call_forward_case
-  f.sequence( :call_forward_case_id  ) { |n| 1 }
-  f.sequence( :destination  ) { |n| "20#{n}" }
-  f.sequence( :to_voicemail ) { |n| false }
-  f.sequence( :timeout      ) { |n| nil }
-  f.sequence( :source       ) { |n| nil }
-  f.sequence( :depth        ) { |n| 5 }
-  f.sequence( :active       ) { |n| false }
+FactoryGirl.define do
+  factory :call_forward do
+    association :phone_number
+    #OPTIMIZE Make sure that the phone_number's phone_numberable
+    # isn't a phone_book_entry but a sip_account.
+    #f.sequence( :call_forward_case_id ) { |n| CallForwardCase.where(:value => "always").first.id }
+    #f.association :call_forward_case
+    sequence( :call_forward_case_id  ) { |n| 1 }
+    sequence( :destination  ) { |n| "20#{n}" }
+    sequence( :to_voicemail ) { |n| false }
+    sequence( :timeout      ) { |n| nil }
+    sequence( :source       ) { |n| nil }
+    sequence( :depth        ) { |n| 5 }
+    sequence( :active       ) { |n| false }
+  end
 end