diff options
| author | spag <spag@golwen.net> | 2012-12-31 08:50:27 +0100 |
|---|---|---|
| committer | spag <spag@golwen.net> | 2012-12-31 08:50:27 +0100 |
| commit | aed84444142604a62e37e57acfaaf957219e2c8d (patch) | |
| tree | e00b1f5844590393171e0bc839ab516d39f5144d /test/functional/user_groups_controller_test.rb | |
| parent | c24bd3a8212e85894b2f7c26e190fe5e89fbaaf2 (diff) | |
| parent | 12c8f4c82770ded6ea6b519e4451ed6757419ddf (diff) | |
Merge branch 'develop' of github.com:amooma/GS5 into develop
Diffstat (limited to 'test/functional/user_groups_controller_test.rb')
| -rw-r--r-- | test/functional/user_groups_controller_test.rb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/test/functional/user_groups_controller_test.rb b/test/functional/user_groups_controller_test.rb index 0e39048..6f0c753 100644 --- a/test/functional/user_groups_controller_test.rb +++ b/test/functional/user_groups_controller_test.rb @@ -4,7 +4,7 @@ class UserGroupsControllerTest < ActionController::TestCase # TODO Create tests which test that a login user has specific rights. # setup do - # @user_group = Factory.create(:user_group) + # @user_group = FactoryGirl.create(:user_group) # end # # test "should get index" do @@ -20,7 +20,7 @@ class UserGroupsControllerTest < ActionController::TestCase # # test "should create user_group" do # assert_difference('UserGroup.count') do - # post :create, user_group: Factory.build(:user_group).attributes + # post :create, user_group: FactoryGirl.build(:user_group).attributes # end # # assert_redirected_to user_group_path(assigns(:user_group)) |