X-Git-Url: https://git.arvados.org/arvados.git/blobdiff_plain/481e341b75f1c6c0015171539c008e540dea2c2d..2c157382b1ecf0175f0356d6c3a457dca942f5f3:/services/api/test/functional/arvados/v1/users_controller_test.rb diff --git a/services/api/test/functional/arvados/v1/users_controller_test.rb b/services/api/test/functional/arvados/v1/users_controller_test.rb index 0a2418e4ba..6dc5950dd8 100644 --- a/services/api/test/functional/arvados/v1/users_controller_test.rb +++ b/services/api/test/functional/arvados/v1/users_controller_test.rb @@ -73,7 +73,7 @@ class Arvados::V1::UsersControllerTest < ActionController::TestCase repo_name: repo_name, openid_prefix: 'https://www.google.com/accounts/o8/id', user: { - uuid: "this_is_agreeable", + uuid: 'zzzzz-tpzed-abcdefghijklmno', first_name: "in_create_test_first_name", last_name: "test_last_name", email: "foo@example.com" @@ -83,9 +83,10 @@ class Arvados::V1::UsersControllerTest < ActionController::TestCase response_items = JSON.parse(@response.body)['items'] created = find_obj_in_resp response_items, 'User', nil + assert_equal 'in_create_test_first_name', created['first_name'] assert_not_nil created['uuid'], 'expected non-null uuid for the new user' - assert_equal 'this_is_agreeable', created['uuid'] + assert_equal 'zzzzz-tpzed-abcdefghijklmno', created['uuid'] assert_not_nil created['email'], 'expected non-nil email' assert_nil created['identity_url'], 'expected no identity_url' @@ -112,7 +113,7 @@ class Arvados::V1::UsersControllerTest < ActionController::TestCase vm_uuid: @vm_uuid, openid_prefix: 'https://www.google.com/accounts/o8/id', user: { - uuid: "this_is_agreeable", + uuid: 'zzzzz-tpzed-abcdefghijklmno', first_name: "in_create_test_first_name", last_name: "test_last_name", email: "foo@example.com" @@ -124,7 +125,7 @@ class Arvados::V1::UsersControllerTest < ActionController::TestCase created = find_obj_in_resp response_items, 'User', nil assert_equal 'in_create_test_first_name', created['first_name'] assert_not_nil created['uuid'], 'expected non-null uuid for the new user' - assert_equal 'this_is_agreeable', created['uuid'] + assert_equal 'zzzzz-tpzed-abcdefghijklmno', created['uuid'] assert_not_nil created['email'], 'expected non-nil email' assert_nil created['identity_url'], 'expected no identity_url' @@ -706,6 +707,58 @@ class Arvados::V1::UsersControllerTest < ActionController::TestCase false, false, false, false, false end + test "setup user with send notification param false and verify no email" do + authorize_with :admin + + post :setup, { + openid_prefix: 'http://www.example.com/account', + send_notification_email: 'false', + user: { + email: "foo@example.com" + } + } + + assert_response :success + response_items = JSON.parse(@response.body)['items'] + created = find_obj_in_resp response_items, 'User', nil + assert_not_nil created['uuid'], 'expected uuid for the new user' + assert_equal created['email'], 'foo@example.com', 'expected given email' + + setup_email = ActionMailer::Base.deliveries.last + assert_nil setup_email, 'expected no setup email' + end + + test "setup user with send notification param true and verify email" do + authorize_with :admin + + post :setup, { + openid_prefix: 'http://www.example.com/account', + send_notification_email: 'true', + user: { + email: "foo@example.com" + } + } + + assert_response :success + response_items = JSON.parse(@response.body)['items'] + created = find_obj_in_resp response_items, 'User', nil + assert_not_nil created['uuid'], 'expected uuid for the new user' + assert_equal created['email'], 'foo@example.com', 'expected given email' + + setup_email = ActionMailer::Base.deliveries.last + assert_not_nil setup_email, 'Expected email after setup' + + assert_equal Rails.configuration.user_notifier_email_from, setup_email.from[0] + assert_equal 'foo@example.com', setup_email.to[0] + assert_equal 'Welcome to Curoverse', setup_email.subject + assert (setup_email.body.to_s.include? 'Your Arvados account has been set up'), + 'Expected Your Arvados account has been set up in email body' + assert (setup_email.body.to_s.include? 'foo@example.com'), + 'Expected user email in email body' + assert (setup_email.body.to_s.include? Rails.configuration.workbench_address), + 'Expected workbench url in email body' + end + def verify_num_links (original_links, expected_additional_links) links_now = Link.all assert_equal expected_additional_links, Link.all.size-original_links.size, @@ -720,12 +773,12 @@ class Arvados::V1::UsersControllerTest < ActionController::TestCase end if object_type == 'User' - if !x['head_kind'] + if ArvadosModel::resource_class_for_uuid(x['uuid']) == User return_obj = x break end else # looking for a link - if x['head_kind'] == head_kind + if x['head_uuid'] and ArvadosModel::resource_class_for_uuid(x['head_uuid']).kind == head_kind return_obj = x break end @@ -751,19 +804,19 @@ class Arvados::V1::UsersControllerTest < ActionController::TestCase assert [] != object, "expected #{class_name} with name #{head_uuid}" head_uuid = object.first[:uuid] end - assert_equal link['link_class'], link_class, + assert_equal link_class, link['link_class'], "did not find expected link_class for #{link_object_name}" - assert_equal link['name'], link_name, + assert_equal link_name, link['name'], "did not find expected link_name for #{link_object_name}" - assert_equal link['tail_uuid'], tail_uuid, + assert_equal tail_uuid, link['tail_uuid'], "did not find expected tail_uuid for #{link_object_name}" - assert_equal link['head_kind'], head_kind, + assert_equal head_kind, link['head_kind'], "did not find expected head_kind for #{link_object_name}" - assert_equal link['head_uuid'], head_uuid, + assert_equal head_uuid, link['head_uuid'], "did not find expected head_uuid for #{link_object_name}" end @@ -771,9 +824,8 @@ class Arvados::V1::UsersControllerTest < ActionController::TestCase expect_repo_perms, expect_vm_perms, expect_group_perms, expect_signatures # verify that all links are deleted for the user oid_login_perms = Link.where(tail_uuid: email, - head_kind: 'arvados#user', link_class: 'permission', - name: 'can_login') + name: 'can_login').where("head_uuid like ?", User.uuid_like_pattern) if expect_oid_login_perms assert oid_login_perms.any?, "expected oid_login_perms" else @@ -781,9 +833,8 @@ class Arvados::V1::UsersControllerTest < ActionController::TestCase end repo_perms = Link.where(tail_uuid: uuid, - head_kind: 'arvados#repository', link_class: 'permission', - name: 'can_write') + name: 'can_write').where("head_uuid like ?", Repository.uuid_like_pattern) if expect_repo_perms assert repo_perms.any?, "expected repo_perms" else @@ -791,9 +842,8 @@ class Arvados::V1::UsersControllerTest < ActionController::TestCase end vm_login_perms = Link.where(tail_uuid: uuid, - head_kind: 'arvados#virtualMachine', link_class: 'permission', - name: 'can_login') + name: 'can_login').where("head_uuid like ?", VirtualMachine.uuid_like_pattern) if expect_vm_perms assert vm_login_perms.any?, "expected vm_login_perms" else @@ -805,7 +855,6 @@ class Arvados::V1::UsersControllerTest < ActionController::TestCase end.first group_read_perms = Link.where(tail_uuid: uuid, head_uuid: group[:uuid], - head_kind: 'arvados#group', link_class: 'permission', name: 'can_read') if expect_group_perms @@ -815,7 +864,6 @@ class Arvados::V1::UsersControllerTest < ActionController::TestCase end signed_uuids = Link.where(link_class: 'signature', - tail_kind: 'arvados#user', tail_uuid: uuid) if expect_signatures