Update comments in the tests

diff --git a/services/api/app/controllers/arvados/v1/users_controller.rb b/services/api/app/controllers/arvados/v1/users_controller.rb
index 6558655e65797bd6625450cd03c0aa2b5a75c978..e07d503da1859ef2e5081cab92e6b89fcb882a0f 100644 (file)
--- a/services/api/app/controllers/arvados/v1/users_controller.rb
+++ b/services/api/app/controllers/arvados/v1/users_controller.rb
@@ -102,9 +102,9 @@ class Arvados::V1::UsersController < ApplicationController
 
                @object = model_class.new resource_attrs
 
-               # If user_param is passed, lookup for user. If exists, skip create and create any missing links. 
+               # If user_param is passed, lookup for user. If exists, skip create and only create any missing links. 
                if params[:user_param]
-                       begin 
+                       begin
                                @object_found = find_user_from_input params[:user_param], params[:user_param]
                  end
                        if !@object_found
@@ -117,7 +117,7 @@ class Arvados::V1::UsersController < ApplicationController
                else            # need to create user for the given user data
                        @object_found = find_user_from_input @object[:uuid], @object[:email]
                        if !@object_found
-                       need_to_create = true
+                       need_to_create = true           # use the user object sent in to create with the user
                        else
                                @object = @object_found
                        end
@@ -131,7 +131,7 @@ class Arvados::V1::UsersController < ApplicationController
 
                # create if need be, and then create or update the links as needed 
                if need_to_create
-                       if @object.save         # save succeeded
+                       if @object.save
                                oid_login_perm = Link.where(tail_uuid: @object[:email],
                                                        head_kind: 'arvados#user',
                                                        link_class: 'permission',
@@ -164,7 +164,7 @@ class Arvados::V1::UsersController < ApplicationController
 
        protected 
 
-       # find the user from the given user parameter
+       # find the user from the given user parameters
        def find_user_from_input(user_uuid, user_email)
                if user_uuid
                        found_object = User.find_by_uuid user_uuid
@@ -290,5 +290,5 @@ class Arvados::V1::UsersController < ApplicationController
                        end
                end
        end
- 
+
 end

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 fe0c22a1d741ea21ce54f5f6491ff981448a309a..1ea549486cf9683ce75b392cba6840a1aafe577c 100644 (file)
--- a/services/api/test/functional/arvados/v1/users_controller_test.rb
+++ b/services/api/test/functional/arvados/v1/users_controller_test.rb
@@ -162,7 +162,7 @@ class Arvados::V1::UsersControllerTest < ActionController::TestCase
     assert_equal response_object['email'], 'abc@xyz.com', 'expecting given email'
        end
 
-       test "create user with user_param and user which will be ignored" do
+       test "create user with user_param and non-empty user which will be ignored" do
     authorize_with :admin
 
     post :create, {
@@ -170,7 +170,8 @@ class Arvados::V1::UsersControllerTest < ActionController::TestCase
       repo_name: 'test_repo',
                        vm_uuid: 'no_such_vm',
       user: {
-                               email: 'will_be_ignored@xyz.om'
+        first_name: 'test_first_name',
+                               email: 'will_be_ignored@xyz.com'
                        }
     }
 
@@ -178,6 +179,7 @@ class Arvados::V1::UsersControllerTest < ActionController::TestCase
     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
 
        test "create user with valid email user_param, vm and repo as input with opt.n" do