summaryrefslogtreecommitdiff
path: root/test/functional/manufacturers_controller_test.rb
diff options
context:
space:
mode:
authorStefan Wintermeyer <stefan.wintermeyer@amooma.de>2012-12-30 22:17:32 +0100
committerStefan Wintermeyer <stefan.wintermeyer@amooma.de>2012-12-30 22:17:32 +0100
commitaf79440bd75d2cffb2eb0ba43b5cfe918a78162c (patch)
treefd6c4dab5dc56fed5f616ddec20e1f82780f20fe /test/functional/manufacturers_controller_test.rb
parent648f51a0ac97675d6cdf6a4b0c3c75bc9ea23168 (diff)
parent9f14a9a6573db607b79124524088803812454515 (diff)
Merge branch 'rename_factory_class' into develop
Conflicts: Gemfile.lock
Diffstat (limited to 'test/functional/manufacturers_controller_test.rb')
-rw-r--r--test/functional/manufacturers_controller_test.rb8
1 files changed, 4 insertions, 4 deletions
diff --git a/test/functional/manufacturers_controller_test.rb b/test/functional/manufacturers_controller_test.rb
index dad38e5..0b10f6d 100644
--- a/test/functional/manufacturers_controller_test.rb
+++ b/test/functional/manufacturers_controller_test.rb
@@ -2,14 +2,14 @@ require 'test_helper'
class ManufacturersControllerTest < ActionController::TestCase
setup do
- @tenant = Factory.create(:tenant)
- @user = Factory.create(:user)
+ @tenant = FactoryGirl.create(:tenant)
+ @user = FactoryGirl.create(:user)
@tenant.tenant_memberships.create(:user_id => @user.id)
@user.update_attributes!(:current_tenant_id => @tenant.id)
- @manufacturer = Factory.create(:manufacturer)
+ @manufacturer = FactoryGirl.create(:manufacturer)
@expected_status_if_not_authorized = :redirect
end
@@ -46,7 +46,7 @@ class ManufacturersControllerTest < ActionController::TestCase
#
# test "should create manufacturer" do
# assert_difference('Manufacturer.count') do
- # post :create, manufacturer: Factory.build(:manufacturer).attributes
+ # post :create, manufacturer: FactoryGirl.build(:manufacturer).attributes
# end
#
# assert_redirected_to manufacturer_path(assigns(:manufacturer))