diff options
author | azul <azul@riseup.net> | 2017-12-09 05:45:47 -0800 |
---|---|---|
committer | azul <azul@riseup.net> | 2017-12-09 05:45:47 -0800 |
commit | 89b879a3e5ee27bfc90751dcd02aa2213262cc5f (patch) | |
tree | de610d5ef7146c073b7129a20762838d78aeca03 /test/functional/identities_controller_test.rb | |
parent | 90c3fc431133cf18d83afd8e394e45c0bd5f63ac (diff) | |
parent | 7120117687e2e6078d7e94ddb9e8b93e8ad5f2e3 (diff) |
Merge branch 'upgrade/gemfile' into 'master'
Upgrade/gemfile
See merge request leap/webapp!55
Diffstat (limited to 'test/functional/identities_controller_test.rb')
-rw-r--r-- | test/functional/identities_controller_test.rb | 16 |
1 files changed, 11 insertions, 5 deletions
diff --git a/test/functional/identities_controller_test.rb b/test/functional/identities_controller_test.rb index 5af2e88..5e46f9c 100644 --- a/test/functional/identities_controller_test.rb +++ b/test/functional/identities_controller_test.rb @@ -1,4 +1,4 @@ -require_relative '../test_helper' +require 'test_helper' class IdentitiesControllerTest < ActionController::TestCase @@ -26,7 +26,7 @@ class IdentitiesControllerTest < ActionController::TestCase test "admin can unblock username" do # an identity without user_id and destination is a blocked handle - identity = FactoryGirl.create :identity + identity = create_identity login :is_admin? => true delete :destroy, id: identity.id assert_response :redirect @@ -34,13 +34,19 @@ class IdentitiesControllerTest < ActionController::TestCase end test "admin cannot remove main identity" do - user = FactoryGirl.create :user - identity = FactoryGirl.create :identity, - Identity.attributes_from_user(user) + user = create_user + identity = create_identity Identity.attributes_from_user(user) login :is_admin? => true delete :destroy, id: identity.id assert_response :redirect assert_equal identity, Identity.find(identity.id) end + def create_identity(attrs={}) + FactoryBot.create :identity, attrs + end + + def create_user + FactoryBot.create :user + end end |