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/phone_number_ranges_controller_test.rb | |
parent | 648f51a0ac97675d6cdf6a4b0c3c75bc9ea23168 (diff) | |
parent | 9f14a9a6573db607b79124524088803812454515 (diff) |
Merge branch 'rename_factory_class' into develop
Conflicts:
Gemfile.lock
Diffstat (limited to 'test/functional/phone_number_ranges_controller_test.rb')
-rw-r--r-- | test/functional/phone_number_ranges_controller_test.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/test/functional/phone_number_ranges_controller_test.rb b/test/functional/phone_number_ranges_controller_test.rb index 39f28c4..9569f3e 100644 --- a/test/functional/phone_number_ranges_controller_test.rb +++ b/test/functional/phone_number_ranges_controller_test.rb @@ -5,7 +5,7 @@ class PhoneNumberRangesControllerTest < ActionController::TestCase #TODO Uncomment tests once the views are implemented. setup do - @phone_number_range = Factory.create(:phone_number_range) + @phone_number_range = FactoryGirl.create(:phone_number_range) end test "should get index" do |