summaryrefslogtreecommitdiff
path: root/test/functional/gemeinschaft_setups_controller_test.rb
diff options
context:
space:
mode:
authorspag <spag@golwen.net>2012-12-31 08:50:27 +0100
committerspag <spag@golwen.net>2012-12-31 08:50:27 +0100
commitaed84444142604a62e37e57acfaaf957219e2c8d (patch)
treee00b1f5844590393171e0bc839ab516d39f5144d /test/functional/gemeinschaft_setups_controller_test.rb
parentc24bd3a8212e85894b2f7c26e190fe5e89fbaaf2 (diff)
parent12c8f4c82770ded6ea6b519e4451ed6757419ddf (diff)
Merge branch 'develop' of github.com:amooma/GS5 into develop
Diffstat (limited to 'test/functional/gemeinschaft_setups_controller_test.rb')
-rw-r--r--test/functional/gemeinschaft_setups_controller_test.rb4
1 files changed, 2 insertions, 2 deletions
diff --git a/test/functional/gemeinschaft_setups_controller_test.rb b/test/functional/gemeinschaft_setups_controller_test.rb
index b23a878..5e6cadf 100644
--- a/test/functional/gemeinschaft_setups_controller_test.rb
+++ b/test/functional/gemeinschaft_setups_controller_test.rb
@@ -3,7 +3,7 @@ require 'test_helper'
class GemeinschaftSetupsControllerTest < ActionController::TestCase
setup do
- @gemeinschaft_setup = Factory.build(:gemeinschaft_setup)
+ @gemeinschaft_setup = FactoryGirl.build(:gemeinschaft_setup)
end
# test "should get index" do
@@ -20,7 +20,7 @@ class GemeinschaftSetupsControllerTest < ActionController::TestCase
# test "should create gemeinschaft_setup" do
# assert_difference('GemeinschaftSetup.count') do
# post :create,
-# gemeinschaft_setup: Factory.attributes_for(:gemeinschaft_setup)
+# gemeinschaft_setup: FactoryGirl.attributes_for(:gemeinschaft_setup)
# end
# assert_redirected_to gemeinschaft_setup_path(assigns(:gemeinschaft_setup))
# end