X-Git-Url: https://git.arvados.org/arvados.git/blobdiff_plain/e5804f99569634967d4affe322a382034d81cfa8..ee21f45e958de5ef39970981ead6416e3790cd1a:/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 1ea549486c..daf19a9ab0 100644
--- a/services/api/test/functional/arvados/v1/users_controller_test.rb
+++ b/services/api/test/functional/arvados/v1/users_controller_test.rb
@@ -2,13 +2,10 @@ require 'test_helper'
 
 class Arvados::V1::UsersControllerTest < ActionController::TestCase
 
-	setup do
-		@all_users_at_start = User.all
-		@all_groups_at_start = Group.all
-		@all_links_at_start = Link.all
-
-		@vm_uuid = virtual_machines(:testvm).uuid
-	end
+  setup do
+    @all_links_at_start = Link.all
+    @vm_uuid = virtual_machines(:testvm).uuid
+  end
 
   test "activate a user after signing UA" do
     authorize_with :inactive_but_signed_user_agreement
@@ -51,293 +48,625 @@ class Arvados::V1::UsersControllerTest < ActionController::TestCase
     post :create, user: {
       first_name: "test_first_name",
       last_name: "test_last_name",
-			email: "test@abc.com"
+      email: "test@abc.com"
     }
     assert_response :success
     created = JSON.parse(@response.body)
     assert_equal 'test_first_name', created['first_name']
-    assert_not_nil created['uuid'], 'expected non-null uuid for the newly created user'
-    assert_not_nil created['email'], 'since email was given, expected non-nil email'
-    assert_nil created['identity_url'], 'even though email is provided, expected no identity_url since users_controller only creates user at this time'
+    assert_not_nil created['uuid'], 'expected uuid for the newly created user'
+    assert_not_nil created['email'], 'expected non-nil email'
+    assert_nil created['identity_url'], 'expected no identity_url'
   end
 
-	test "create user with user, vm and repo as input" do
+  test "create user with user, vm and repo as input" do
     authorize_with :admin
-		repo_name = 'test_repo'
+    repo_name = 'test_repo'
 
-    post :create, {
+    post :setup, {
       repo_name: repo_name,
-			vm_uuid: 'no_such_vm',
+      openid_prefix: 'https://www.google.com/accounts/o8/id',
       user: {
-		    uuid: "is_this_correct",		    
-				first_name: "in_create_test_first_name",
-		    last_name: "test_last_name",
-				email: "test@abc.com"
+        uuid: "this_is_agreeable",        
+        first_name: "in_create_test_first_name",
+        last_name: "test_last_name",
+        email: "test@abc.com"
       }
     }
     assert_response :success
-    created = JSON.parse(@response.body)
+    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_not_nil created['email'], 'expected non-nil email'
+    assert_nil created['identity_url'], 'expected no identity_url' 
+
+    # invoke setup again with the same data
+    post :setup, {
+      repo_name: repo_name,
+      openid_prefix: 'https://www.google.com/accounts/o8/id',
+      user: {
+        uuid: "this_is_agreeable",        
+        first_name: "in_create_test_first_name",
+        last_name: "test_last_name",
+        email: "test@abc.com"
+      }
+    }
+
+    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 newly created user'
-		assert_equal 'is_this_correct', created['uuid']
-    assert_not_nil created['email'], 'since email was given, expected non-nil email'
-    assert_nil created['identity_url'], 'even though email isprovided, expected no identity_url since users_controller only creates user' 
+    assert_not_nil created['uuid'], 'expected non-null uuid for the new user'
+    assert_equal 'this_is_agreeable', created['uuid']
+    assert_not_nil created['email'], 'expected non-nil email'
+    assert_nil created['identity_url'], 'expected no identity_url' 
 
-		# since no such vm exists, expect only three new links: oid_login_perm, repo link and link add user to 'All users' group
-		verify_num_links @all_links_at_start, 3
+    # since no such vm exists, expect only three new links: 
+    # arvados#user, repo link and link add user to 'All users' group
+    verify_num_links @all_links_at_start, 3
 
-		verify_link_exists_for_type 'User', 'permission', 'can_login', created['uuid'], created['email'], 'arvados#user', false
+    verify_link response_items, 'arvados#user', true, 'permission', 'can_login',
+        created['uuid'], created['email'], 'arvados#user', false, 'User'
 
-		verify_link_exists_for_type 'Repository', 'permission', 'can_write', repo_name, created['uuid'], 'arvados#repository', true
+    verify_link response_items, 'arvados#repository', true, 'permission', 'can_write',
+        repo_name, created['uuid'], 'arvados#repository', true, 'Repository'
 
-		verify_link_exists_for_type 'Group', 'permission', 'can_read', 'All users', created['uuid'], 'arvados#group', true
-	end
+    verify_link response_items, 'arvados#group', true, 'permission', 'can_read',
+        'All users', created['uuid'], 'arvados#group', true, 'Group'
 
-	test "create user with user_param, vm and repo as input" do
+    verify_link response_items, 'arvados#virtualMachine', false, 'permission', 'can_login',
+        nil, created['uuid'], 'arvados#virtualMachine', false, 'VirtualMachine'
+  end
+
+  test "setup user with bogus uuid and expect error" do
     authorize_with :admin
 
-    post :create, {
-      user_param: 'not_an_existing_uuid_and_not_email_format',
+    post :setup, {
+      uuid: 'bogus_uuid',
       repo_name: 'test_repo',
-			vm_uuid: 'no_such_vm',
-      user: {}
+      vm_uuid: @vm_uuid
     }
+    response_body = JSON.parse(@response.body)
+    response_errors = response_body['errors']
+    assert_not_nil response_errors, 'Expected error in response'
+    assert (response_errors.first.include? 'Path not found'), 'Expected 404'
+  end
 
+  test "setup user with bogus uuid in user and expect error" do
+    authorize_with :admin
+
+    post :setup, {
+      user: {uuid: 'bogus_uuid'},
+      repo_name: 'test_repo',
+      vm_uuid: @vm_uuid,
+      openid_prefix: 'https://www.google.com/accounts/o8/id'
+    }
     response_body = JSON.parse(@response.body)
     response_errors = response_body['errors']
-		assert_not_nil response_errors, 'Expected error in response'
-		incorrectly_formatted = response_errors.first.include?('ArgumentError: User param is not of valid email format')
-		assert incorrectly_formatted, 'Expected not valid email format error'
-	end
+    assert_not_nil response_errors, 'Expected error in response'
+    assert (response_errors.first.include? 'ArgumentError: Require user email'),
+      'Expected RuntimeError'
+  end
 
-	test "create user with existing uuid user_param, vm and repo as input" do
-		authorize_with :inactive
+  test "setup user with no uuid and user, expect error" do
+    authorize_with :admin
+
+    post :setup, {
+      repo_name: 'test_repo',
+      vm_uuid: @vm_uuid,
+      openid_prefix: 'https://www.google.com/accounts/o8/id'
+    }
+    response_body = JSON.parse(@response.body)
+    response_errors = response_body['errors']
+    assert_not_nil response_errors, 'Expected error in response'
+    assert (response_errors.first.include? 'Required uuid or user'),
+        'Expected ArgumentError'
+  end
+
+  test "setup user with no uuid and email, expect error" do
+    authorize_with :admin
+
+    post :setup, {
+      user: {},
+      repo_name: 'test_repo',
+      vm_uuid: @vm_uuid,
+      openid_prefix: 'https://www.google.com/accounts/o8/id'
+    }
+    response_body = JSON.parse(@response.body)
+    response_errors = response_body['errors']
+    assert_not_nil response_errors, 'Expected error in response'
+    assert (response_errors.first.include? '<ArgumentError: Require user email'),
+        'Expected ArgumentError'
+  end
+
+  test "invoke setup with existing uuid, vm and repo and verify links" do
+    authorize_with :inactive
     get :current
     assert_response :success
     inactive_user = JSON.parse(@response.body)
-		
+    
     authorize_with :admin
 
-    post :create, {
-      user_param: inactive_user['uuid'],
+    post :setup, {
+      uuid: inactive_user['uuid'],
       repo_name: 'test_repo',
-			vm_uuid: 'no_such_vm',
-      user: {}
+      vm_uuid: @vm_uuid
     }
 
     assert_response :success
-    response_object = JSON.parse(@response.body)
-    assert_not_nil response_object['uuid'], 'expected non-null uuid for the newly created user'
-		assert_equal inactive_user['uuid'], response_object['uuid']
-    assert_equal inactive_user['email'], response_object['email'], 'expecting inactive user email'
-	end
 
-	test "create user with valid email user_param, vm and repo as input" do
+    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'
+
+    # expect repo and vm links
+    verify_link response_items, 'arvados#repository', true, 'permission', 'can_write',
+        'test_repo', resp_obj['uuid'], 'arvados#repository', true, 'Repository'
+
+    verify_link response_items, 'arvados#virtualMachine', true, 'permission', 'can_login',
+        @vm_uuid, resp_obj['uuid'], 'arvados#virtualMachine', false, 'VirtualMachine'
+  end
+
+  test "invoke setup with existing uuid in user, verify response" do
+    authorize_with :inactive
+    get :current
+    assert_response :success
+    inactive_user = JSON.parse(@response.body)
+    
     authorize_with :admin
 
-    post :create, {
-      user_param: 'abc@xyz.com',
-      repo_name: 'test_repo',
-			vm_uuid: 'no_such_vm',
-      user: {}
+    post :setup, {
+      user: {uuid: inactive_user['uuid']},
+      openid_prefix: 'https://www.google.com/accounts/o8/id'
     }
 
     assert_response :success
-    response_object = JSON.parse(@response.body)
-    assert_not_nil response_object['uuid'], 'expected non-null uuid for the newly created user'
-    assert_equal response_object['email'], 'abc@xyz.com', 'expecting given email'
-	end
 
-	test "create user with valid email user_param, no vm and repo as input" do
+    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 :inactive
+    get :current
+    assert_response :success
+    inactive_user = JSON.parse(@response.body)
+    
     authorize_with :admin
 
-    post :create, {
-      user_param: 'abc@xyz.com',
-      user: {}
+    post :setup, {
+      uuid: inactive_user['uuid'],
+      user: {email: 'junk_email'}
     }
 
-    assert_response :success		
-    response_object = JSON.parse(@response.body)
-    assert_not_nil response_object['uuid'], 'expected non-null uuid for the newly created user'
-    assert_equal response_object['email'], 'abc@xyz.com', 'expecting given email'
-	end
+    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 "create user with user_param and non-empty user which will be ignored" do
+  test "setup user with valid email and repo as input" do
     authorize_with :admin
 
-    post :create, {
-      user_param: 'abc@xyz.com',
+    post :setup, {
       repo_name: 'test_repo',
-			vm_uuid: 'no_such_vm',
-      user: {
-        first_name: 'test_first_name',
-				email: 'will_be_ignored@xyz.com'
-			}
+      user: {email: 'abc@xyz.com'},
+      openid_prefix: 'https://www.google.com/accounts/o8/id'
     }
 
     assert_response :success
-    response_object = JSON.parse(@response.body)
-    assert_not_nil response_object['uuid'], 'expected non-null uuid for the newly created user'
-    assert_equal response_object['email'], 'abc@xyz.com', 'expecting user_param as email'
-    assert_nil response_object['first_name'], 'expecting no first name since it will be reset when user_param is used'
-	end
+    response_items = JSON.parse(@response.body)['items']
+    response_object = find_obj_in_resp response_items, 'User', nil
+    assert_not_nil response_object['uuid'], 'expected uuid for the new user'
+    assert_equal response_object['email'], 'abc@xyz.com', 'expected given email'
+
+    # three extra links; login link, group link and repo link
+    verify_num_links @all_links_at_start, 3
+  end
 
-	test "create user with valid email user_param, vm and repo as input with opt.n" do
+  test "setup user with fake vm and expect error" do
     authorize_with :admin
 
-    post :create, {
-      user_param: 'abc@xyz.com',
+    post :setup, {
       repo_name: 'test_repo',
-			vm_uuid: 'no_such_vm',
-			just_probe: 'true',
-      user: {}
+      vm_uuid: 'no_such_vm',
+      user: {email: 'abc@xyz.com'},
+      openid_prefix: 'https://www.google.com/accounts/o8/id'
     }
 
-    assert_response :success
-    response_object = JSON.parse(@response.body)
-    assert_nil response_object['uuid'], 'expected null uuid since no object created due to just probe'
-	end
+    response_body = JSON.parse(@response.body)
+    response_errors = response_body['errors']
+    assert_not_nil response_errors, 'Expected error in response'
+    assert (response_errors.first.include? "No vm found for no_such_vm"), 
+          'Expected RuntimeError: No vm found for no_such_vm'
+  end
 
-	test "create user twice with user param and check links are not recreated" do
+  test "setup user with valid email, repo and real vm as input" do
     authorize_with :admin
 
-    post :create, {
-      user_param: 'abc@xyz.com',
+    post :setup, {
       repo_name: 'test_repo',
-			vm_uuid: 'no_such_vm',
-      user: {}
+      openid_prefix: 'https://www.google.com/accounts/o8/id',
+      vm_uuid: @vm_uuid,
+      user: {email: 'abc@xyz.com'}
     }
 
     assert_response :success
-    response_object = JSON.parse(@response.body)
-    assert_not_nil response_object['uuid'], 'expected non-null uuid for the newly created user'
-    assert_equal response_object['email'], 'abc@xyz.com', 'expecting given email'
-		verify_num_links @all_links_at_start, 3		# openid, group, and repo links. no vm link
+    response_items = JSON.parse(@response.body)['items']
+    response_object = find_obj_in_resp response_items, 'User', nil
+    assert_not_nil response_object['uuid'], 'expected uuid for the new user'
+    assert_equal response_object['email'], 'abc@xyz.com', 'expected given email'
 
-		# create again
-    post :create, {
-      user_param: 'abc@xyz.com',
+    # three extra links; login link, group link and repo link
+    verify_num_links @all_links_at_start, 4
+  end
+
+  test "setup user with valid email, no vm and repo as input" do
+    authorize_with :admin
+
+    post :setup, {
+      user: {email: 'abc@xyz.com'},
+      openid_prefix: 'https://www.google.com/accounts/o8/id'
+    }
+
+    assert_response :success    
+    response_items = JSON.parse(@response.body)['items']
+    response_object = find_obj_in_resp response_items, 'User', nil
+    assert_not_nil response_object['uuid'], 'expected uuid for new user'
+    assert_equal response_object['email'], 'abc@xyz.com', 'expected given email'
+
+    # two extra links; login link and group link
+    verify_num_links @all_links_at_start, 2
+  end
+
+  test "setup user with email, first name, repo name and vm uuid" do
+    authorize_with :admin
+
+    post :setup, {
+      openid_prefix: 'https://www.google.com/accounts/o8/id',
       repo_name: 'test_repo',
-			vm_uuid: 'no_such_vm',
-      user: {}
+      vm_uuid: @vm_uuid,
+      user: {
+        first_name: 'test_first_name',
+        email: 'abc@xyz.com'
+      }
     }
 
     assert_response :success
-    response_object2 = JSON.parse(@response.body)
-    assert_equal response_object['uuid'], response_object2['uuid'], 'expected same uuid as first create operation'
-    assert_equal response_object['email'], 'abc@xyz.com', 'expecting given email'
-		verify_num_links @all_links_at_start, 3		# openid, group, and repo links. no vm link
-	end
+    response_items = JSON.parse(@response.body)['items']
+    response_object = find_obj_in_resp response_items, 'User', nil
+    assert_not_nil response_object['uuid'], 'expected uuid for new user'
+    assert_equal response_object['email'], 'abc@xyz.com', 'expected given email'
+    assert_equal 'test_first_name', response_object['first_name'], 
+        'expecting first name'
+
+    # four extra links; login link, group link, repo link and vm link
+    verify_num_links @all_links_at_start, 4
+  end
 
-	test "create user twice with user object as input and check links are not recreated" do
+  test "setup user twice with email and check two different objects created" do
     authorize_with :admin
 
-    post :create, {
+    post :setup, {
+      openid_prefix: 'https://www.google.com/accounts/o8/id',
       repo_name: 'test_repo',
       user: {
-				email: 'abc@xyz.com'
-			}
+        email: 'abc@xyz.com'
+      }
     }
 
     assert_response :success
-    response_object = JSON.parse(@response.body)
-    assert_not_nil response_object['uuid'], 'expected non-null uuid for the newly created user'
-    assert_equal response_object['email'], 'abc@xyz.com', 'expecting given email'
-		verify_num_links @all_links_at_start, 3		# openid, group, and repo links. no vm link
-
-		# create again
-	  post :create, user: {
-			email: 'abc@xyz.com'
+    response_items = JSON.parse(@response.body)['items']
+    response_object = find_obj_in_resp response_items, 'User', nil
+    assert_not_nil response_object['uuid'], 'expected uuid for new user'
+    assert_equal response_object['email'], 'abc@xyz.com', 'expected given email'
+    verify_num_links @all_links_at_start, 3   # openid, group, and repo. no vm
+
+    # create again
+    post :setup, {
+      user: {email: 'abc@xyz.com'},
+      openid_prefix: 'https://www.google.com/accounts/o8/id'
     }
 
     assert_response :success
-    response_object2 = JSON.parse(@response.body)
-    assert_equal response_object['uuid'], response_object2['uuid'], 'expected same uuid as first create operation'
-    assert_equal response_object['email'], 'abc@xyz.com', 'expecting given email'
-		verify_num_links @all_links_at_start, 3		# openid, group, and repo links. no vm link
-	end
+    response_items = JSON.parse(@response.body)['items']
+    response_object2 = find_obj_in_resp response_items, 'User', nil
+    assert_not_equal response_object['uuid'], response_object2['uuid'], 
+        'expected same uuid as first create operation'
+    assert_equal response_object['email'], 'abc@xyz.com', 'expected given email'
+
+    # extra login link only
+    verify_num_links @all_links_at_start, 4
+  end
 
-	test "create user with openid prefix" do
+  test "setup user with openid prefix" do
     authorize_with :admin
 
-    post :create, {
+    post :setup, {
       repo_name: 'test_repo',
-			vm_uuid: 'no_such_vm',
-			openid_prefix: 'http://www.xyz.com/account',
+      openid_prefix: 'http://www.xyz.com/account',
       user: {
-				first_name: "in_create_test_first_name",
-		    last_name: "test_last_name",
-				email: "test@abc.com"
+        first_name: "in_create_test_first_name",
+        last_name: "test_last_name",
+        email: "test@abc.com"
       }
     }
+
     assert_response :success
-    created = JSON.parse(@response.body)
+
+    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 newly created user'
-    assert_not_nil created['email'], 'since email was given, expected non-nil email'
-    assert_nil created['identity_url'], 'even though email is provided, expected no identity_url since users_controller only creates user' 
+    assert_not_nil created['uuid'], 'expected uuid for new user'
+    assert_not_nil created['email'], 'expected non-nil email'
+    assert_nil created['identity_url'], 'expected no identity_url' 
+
+    # verify links
+    # 3 new links: arvados#user, repo, and 'All users' group.
+    verify_num_links @all_links_at_start, 3
 
-		# verify links
-		# expect 3 new links: oid_login_perm, repo link, and link add user to 'All users' group. No vm link since the vm_uuid passed in is not in system
-		verify_num_links @all_links_at_start, 3
+    verify_link response_items, 'arvados#user', true, 'permission', 'can_login',
+        created['uuid'], created['email'], 'arvados#user', false, 'User'
 
-		verify_link_exists_for_type 'User', 'permission', 'can_login', created['uuid'], created['email'], 'arvados#user', false
+    verify_link response_items, 'arvados#repository', true, 'permission', 'can_write',
+        'test_repo', created['uuid'], 'arvados#repository', true, 'Repository'
 
-		verify_link_exists_for_type 'Repository', 'permission', 'can_write', 'test_repo', created['uuid'], 'arvados#repository', true
+    verify_link response_items, 'arvados#group', true, 'permission', 'can_read',
+        'All users', created['uuid'], 'arvados#group', true, 'Group'
 
-		verify_link_exists_for_type 'Group', 'permission', 'can_read', 'All users', created['uuid'], 'arvados#group', true
-	end
+    verify_link response_items, 'arvados#virtualMachine', false, 'permission', 'can_login',
+        nil, created['uuid'], 'arvados#virtualMachine', false, 'VirtualMachine'
+  end
 
-	test "create user with user, vm and repo and verify links" do
+  test "invoke setup with no openid prefix, expect error" do
     authorize_with :admin
 
-    post :create, {
+    post :setup, {
       repo_name: 'test_repo',
-			vm_uuid: @vm_uuid,
       user: {
-				first_name: "in_create_test_first_name",
-		    last_name: "test_last_name",
-				email: "test@abc.com"
+        first_name: "in_create_test_first_name",
+        last_name: "test_last_name",
+        email: "test@abc.com"
       }
     }
+
+    response_body = JSON.parse(@response.body)
+    response_errors = response_body['errors']
+    assert_not_nil response_errors, 'Expected error in response'
+    assert (response_errors.first.include? 'openid_prefix parameter is missing'),
+        'Expected ArgumentError'
+  end
+
+  test "setup user with user, vm and repo and verify links" do
+    authorize_with :admin
+
+    post :setup, {
+      user: {
+        first_name: "in_create_test_first_name",
+        last_name: "test_last_name",
+        email: "test@abc.com"
+      },
+      vm_uuid: @vm_uuid,
+      repo_name: 'test_repo',
+      openid_prefix: 'https://www.google.com/accounts/o8/id'
+    }
+
     assert_response :success
-    created = JSON.parse(@response.body)
+
+    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 newly created user'
-    assert_not_nil created['email'], 'since email was given, expected non-nil email'
-    assert_nil created['identity_url'], 'even though email is provided, expected no identity_url since users_controller only creates user' 
-
-		# expect 4 new links: oid_login_perm, repo link, vm link and link add user to 'All users' group. 
-		verify_num_links @all_links_at_start, 4
-
-		verify_link_exists_for_type 'User', 'permission', 'can_login', created['uuid'], created['email'], 'arvados#user', false
-
-		verify_link_exists_for_type 'Repository', 'permission', 'can_write', 'test_repo', created['uuid'], 'arvados#repository', true
-
-		verify_link_exists_for_type 'Group', 'permission', 'can_read', 'All users', created['uuid'], 'arvados#group', true
-
-		verify_link_exists_for_type 'VirtualMachine', 'permission', 'can_login', @vm_uuid, created['uuid'], 'arvados#virtualMachine', false
-	end
-
-	def verify_num_links (original_links, expected_num_additional_links)
-		links_now = Link.all
-		assert_equal original_links.size+expected_num_additional_links, Link.all.size, 
-							"Expected #{expected_num_additional_links.inspect} more links"
-	end
-
-	def verify_link_exists_for_type(class_name, link_class, link_name, head_uuid, tail_uuid, head_kind, fetch_object)
-		if fetch_object
-			object = Object.const_get(class_name).where(name: head_uuid)
-			assert [] != object, "expected a #{class_name.inspect} with the name #{head_uuid.inspect}"
-			head_uuid = object.first[:uuid]
-		end
-
-		links = Link.where(link_class: link_class,
-              				 name: link_name,
-             					 tail_uuid: tail_uuid,
-             					 head_uuid: head_uuid,
-				               head_kind: head_kind)
-		assert links.size > 0, "expected one or more links with the given criteria #{class_name} with #{head_uuid}"
-	end
+    assert_not_nil created['uuid'], 'expected uuid for new user'
+    assert_not_nil created['email'], 'expected non-nil email'
+    assert_nil created['identity_url'], 'expected no identity_url' 
+
+    # expect 4 new links: arvados#user, repo, vm and 'All users' group link
+    verify_num_links @all_links_at_start, 4
+
+    verify_link response_items, 'arvados#user', true, 'permission', 'can_login',
+        created['uuid'], created['email'], 'arvados#user', false, 'User'
+
+    verify_link response_items, 'arvados#repository', true, 'permission', 'can_write',
+        'test_repo', created['uuid'], 'arvados#repository', true, 'Repository'
+
+    verify_link response_items, 'arvados#group', true, 'permission', 'can_read',
+        'All users', created['uuid'], 'arvados#group', true, 'Group'
+
+    verify_link response_items, 'arvados#virtualMachine', true, 'permission', 'can_login', 
+        @vm_uuid, created['uuid'], 'arvados#virtualMachine', false, 'VirtualMachine'
+  end
+
+  test "create user as non admin user and expect error" do
+    authorize_with :active
+
+    post :create, {
+      user: {email: 'abc@xyz.com'}
+    }
+
+    response_body = JSON.parse(@response.body)
+    response_errors = response_body['errors']
+    assert_not_nil response_errors, 'Expected error in response'
+    assert (response_errors.first.include? 'PermissionDenied'), 
+          'Expected PermissionDeniedError'
+  end
+
+  test "setup user as non admin user and expect error" do
+    authorize_with :active
+
+    post :setup, {
+      openid_prefix: 'https://www.google.com/accounts/o8/id',
+      user: {email: 'abc@xyz.com'}
+    }
+
+    response_body = JSON.parse(@response.body)
+    response_errors = response_body['errors']
+    assert_not_nil response_errors, 'Expected error in response'
+    assert (response_errors.first.include? 'PermissionDenied'), 
+          'Expected PermissionDeniedError'
+  end
+
+  test "setup user in multiple steps and verify response" do
+    authorize_with :admin
+
+    post :setup, {
+      openid_prefix: 'http://www.xyz.com/account',
+      user: {
+        email: "test@abc.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 new user'
+    assert_not_nil created['email'], 'expected non-nil email'
+    assert_equal created['email'], 'test@abc.com', 'expected input email'
+
+    # verify links; 2 new links: arvados#user, and 'All users' group.
+    verify_num_links @all_links_at_start, 2
+
+    verify_link response_items, 'arvados#user', true, 'permission', 'can_login',
+        created['uuid'], created['email'], 'arvados#user', false, 'User'
+
+    verify_link response_items, 'arvados#group', true, 'permission', 'can_read',
+        'All users', created['uuid'], 'arvados#group', true, 'Group'
+
+    verify_link response_items, 'arvados#repository', false, 'permission', 'can_write',
+        'test_repo', created['uuid'], 'arvados#repository', true, 'Repository'
+
+    verify_link response_items, 'arvados#virtualMachine', false, 'permission', 'can_login',
+        nil, created['uuid'], 'arvados#virtualMachine', false, 'VirtualMachine'
+
+   # invoke setup with a repository
+    post :setup, {
+      openid_prefix: 'http://www.xyz.com/account',
+      repo_name: 'new_repo',
+      uuid: created['uuid']
+    }
+
+    assert_response :success
+
+    response_items = JSON.parse(@response.body)['items']
+    created = find_obj_in_resp response_items, 'User', nil
+
+    assert_equal 'test@abc.com', created['email'], 'expected input email'
+
+     # verify links
+    verify_link response_items, 'arvados#group', true, 'permission', 'can_read',
+        'All users', created['uuid'], 'arvados#group', true, 'Group'
+
+    verify_link response_items, 'arvados#repository', true, 'permission', 'can_write',
+        'new_repo', created['uuid'], 'arvados#repository', true, 'Repository'
+
+    verify_link response_items, 'arvados#virtualMachine', false, 'permission', 'can_login',
+        nil, created['uuid'], 'arvados#virtualMachine', false, 'VirtualMachine'
+
+    # invoke setup with a vm_uuid
+    post :setup, {
+      vm_uuid: @vm_uuid,
+      openid_prefix: 'http://www.xyz.com/account',
+      user: {
+        email: 'junk_email'
+      },
+      uuid: created['uuid']
+    }
+
+    assert_response :success
+
+    response_items = JSON.parse(@response.body)['items']
+    created = find_obj_in_resp response_items, 'User', nil
+
+    assert_equal created['email'], 'test@abc.com', 'expected original email'
+
+    # verify links
+    verify_link response_items, 'arvados#group', true, 'permission', 'can_read',
+        'All users', created['uuid'], 'arvados#group', true, 'Group'
+
+    # since no repo name in input, we won't get any; even though user has one
+    verify_link response_items, 'arvados#repository', false, 'permission', 'can_write',
+        'new_repo', created['uuid'], 'arvados#repository', true, 'Repository'
+
+    verify_link response_items, 'arvados#virtualMachine', true, 'permission', 'can_login',
+        @vm_uuid, created['uuid'], 'arvados#virtualMachine', false, 'VirtualMachine'
+  end
+
+  def verify_num_links (original_links, expected_additional_links)
+    links_now = Link.all
+    assert_equal original_links.size+expected_additional_links, Link.all.size,
+        "Expected #{expected_additional_links.inspect} more links"
+  end
+
+  def find_obj_in_resp (response_items, object_type, head_kind=nil)
+    return_obj = nil
+    response_items.each { |x|
+      if !x
+        next
+      end
+
+      if object_type == 'User'
+        if !x['head_kind']
+          return_obj = x
+          break
+        end
+      else  # looking for a link
+        if x['head_kind'] == head_kind
+          return_obj = x
+          break
+        end
+      end
+    }
+    return return_obj
+  end
+
+  def verify_link(response_items, link_object_name, expect_link, link_class,
+        link_name, head_uuid, tail_uuid, head_kind, fetch_object, class_name)
+
+    link = find_obj_in_resp response_items, 'Link', link_object_name
+
+    if !expect_link 
+      assert_nil link, "Expected no link for #{link_object_name}"
+      return
+    end
+
+    assert_not_nil link, "Expected link for #{link_object_name}"
+
+    if fetch_object
+      object = Object.const_get(class_name).where(name: head_uuid)
+      assert [] != object, "expected #{class_name} with name #{head_uuid}"
+      head_uuid = object.first[:uuid]
+    end
+    assert_equal link['link_class'], link_class,
+        "did not find expected link_class for #{link_object_name}"
+ 
+    assert_equal link['name'], link_name,
+        "did not find expected link_name for #{link_object_name}"
+ 
+    assert_equal link['tail_uuid'], tail_uuid,
+        "did not find expected tail_uuid for #{link_object_name}"
+ 
+    assert_equal link['head_kind'], head_kind,
+        "did not find expected head_kind for #{link_object_name}"
+ 
+    assert_equal link['head_uuid'], head_uuid,
+        "did not find expected head_uuid for #{link_object_name}"
+  end
 
 end