X-Git-Url: https://git.arvados.org/arvados.git/blobdiff_plain/d25dedaec8ea386c18b7f61c08a3097ba3c4f26c..0eb72b526bf8bbb011551ecf019f604e17a534f1:/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 579b8cc6d0..b75479ff8d 100644 --- a/services/api/test/functional/arvados/v1/users_controller_test.rb +++ b/services/api/test/functional/arvados/v1/users_controller_test.rb @@ -1,3 +1,7 @@ +# Copyright (C) The Arvados Authors. All rights reserved. +# +# SPDX-License-Identifier: AGPL-3.0 + require 'test_helper' require 'helpers/users_test_helper' @@ -6,8 +10,9 @@ class Arvados::V1::UsersControllerTest < ActionController::TestCase include UsersTestHelper setup do - @all_links_at_start = Link.all + @initial_link_count = Link.count @vm_uuid = virtual_machines(:testvm).uuid + ActionMailer::Base.deliveries = [] end test "activate a user after signing UA" do @@ -107,7 +112,7 @@ class Arvados::V1::UsersControllerTest < ActionController::TestCase assert_nil created['identity_url'], 'expected no identity_url' # arvados#user, repo link and link add user to 'All users' group - verify_num_links @all_links_at_start, 4 + verify_links_added 4 verify_link response_items, 'arvados#user', true, 'permission', 'can_login', created['uuid'], created['email'], 'arvados#user', false, 'User' @@ -213,26 +218,6 @@ class Arvados::V1::UsersControllerTest < ActionController::TestCase @vm_uuid, resp_obj['uuid'], 'arvados#virtualMachine', false, 'VirtualMachine' end - test "invoke setup with existing uuid in user, verify response" do - authorize_with :admin - inactive_user = users(:inactive) - - post :setup, { - user: {uuid: inactive_user['uuid']}, - openid_prefix: 'https://www.google.com/accounts/o8/id' - } - - assert_response :success - - response_items = JSON.parse(@response.body)['items'] - resp_obj = find_obj_in_resp response_items, 'User', nil - - assert_not_nil resp_obj['uuid'], 'expected uuid for the new user' - assert_equal inactive_user['uuid'], resp_obj['uuid'] - assert_equal inactive_user['email'], resp_obj['email'], - 'expecting inactive user email' - end - test "invoke setup with existing uuid but different email, expect original email" do authorize_with :admin inactive_user = users(:inactive) @@ -269,7 +254,7 @@ class Arvados::V1::UsersControllerTest < ActionController::TestCase assert_equal response_object['email'], 'foo@example.com', 'expected given email' # four extra links; system_group, login, group and repo perms - verify_num_links @all_links_at_start, 4 + verify_links_added 4 end test "setup user with fake vm and expect error" do @@ -306,7 +291,7 @@ class Arvados::V1::UsersControllerTest < ActionController::TestCase assert_equal response_object['email'], 'foo@example.com', 'expected given email' # five extra links; system_group, login, group, vm, repo - verify_num_links @all_links_at_start, 5 + verify_links_added 5 end test "setup user with valid email, no vm and no repo as input" do @@ -324,7 +309,7 @@ class Arvados::V1::UsersControllerTest < ActionController::TestCase assert_equal response_object['email'], 'foo@example.com', 'expected given email' # three extra links; system_group, login, and group - verify_num_links @all_links_at_start, 3 + verify_links_added 3 verify_link response_items, 'arvados#user', true, 'permission', 'can_login', response_object['uuid'], response_object['email'], 'arvados#user', false, 'User' @@ -361,7 +346,7 @@ class Arvados::V1::UsersControllerTest < ActionController::TestCase 'expecting first name' # five extra links; system_group, login, group, repo and vm - verify_num_links @all_links_at_start, 5 + verify_links_added 5 end test "setup user with an existing user email and check different object is created" do @@ -384,7 +369,7 @@ class Arvados::V1::UsersControllerTest < ActionController::TestCase 'expected different uuid after create operation' assert_equal inactive_user['email'], response_object['email'], 'expected given email' # system_group, openid, group, and repo. No vm link. - verify_num_links @all_links_at_start, 4 + verify_links_added 4 end test "setup user with openid prefix" do @@ -412,7 +397,7 @@ class Arvados::V1::UsersControllerTest < ActionController::TestCase # verify links # four new links: system_group, arvados#user, repo, and 'All users' group. - verify_num_links @all_links_at_start, 4 + verify_links_added 4 verify_link response_items, 'arvados#user', true, 'permission', 'can_login', created['uuid'], created['email'], 'arvados#user', false, 'User' @@ -472,7 +457,7 @@ class Arvados::V1::UsersControllerTest < ActionController::TestCase # five new links: system_group, arvados#user, repo, vm and 'All # users' group link - verify_num_links @all_links_at_start, 5 + verify_links_added 5 verify_link response_items, 'arvados#user', true, 'permission', 'can_login', created['uuid'], created['email'], 'arvados#user', false, 'User' @@ -659,6 +644,24 @@ class Arvados::V1::UsersControllerTest < ActionController::TestCase assert (setup_email.body.to_s.include? "#{Rails.configuration.workbench_address}users/#{created['uuid']}/virtual_machines"), 'Expected virtual machines url in email body' end + test "setup inactive user by changing is_active to true" do + authorize_with :admin + active_user = users(:active) + + # invoke setup with a repository + put :update, { + id: active_user['uuid'], + user: { + is_active: true, + } + } + assert_response :success + assert_equal active_user['uuid'], json_response['uuid'] + updated = User.where(uuid: active_user['uuid']).first + assert_equal(true, updated.is_active) + assert_equal({read: true}, updated.group_permissions[all_users_group_uuid]) + end + test "non-admin user can get basic information about readable users" do authorize_with :spectator get(:index) @@ -841,9 +844,9 @@ class Arvados::V1::UsersControllerTest < ActionController::TestCase "admin's filtered index did not return inactive user") end - def verify_num_links (original_links, expected_additional_links) - assert_equal expected_additional_links, Link.all.size-original_links.size, - "Expected #{expected_additional_links.inspect} more links" + def verify_links_added more + assert_equal @initial_link_count+more, Link.count, + "Started with #{@initial_link_count} links, expected #{more} more" end def find_obj_in_resp (response_items, object_type, head_kind=nil)