[ARVADOS] updated: 1.1.4-192-g4cbac38

[Git user]

Summary of changes:
 .../functional/arvados/v1/users_controller_test.rb    | 19 +++++++++++++++++++
 1 file changed, 19 insertions(+)

       via  4cbac38547d8047e5e23cb4945b25aaa31e3eb06 (commit)
      from  4b4bb33aca0e12ae06bce395f02031890d6ef8bc (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.


commit 4cbac38547d8047e5e23cb4945b25aaa31e3eb06
Author: Tom Clegg <tclegg at veritasgenetics.com>
Date:   Fri May 4 15:19:14 2018 -0400

    12626: Add tests for missing new_owner_uuid.
    
    Arvados-DCO-1.1-Signed-off-by: Tom Clegg <tclegg at veritasgenetics.com>

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 3bcf3ed..b01597c 100644
--- a/services/api/test/functional/arvados/v1/users_controller_test.rb
+++ b/services/api/test/functional/arvados/v1/users_controller_test.rb
@@ -887,6 +887,25 @@ class Arvados::V1::UsersControllerTest < ActionController::TestCase
     assert_response(403)
   end
 
+  test "refuse to merge if new_owner_uuid is empty" do
+    authorize_with(:project_viewer_trustedclient)
+    post(:merge, {
+           new_user_token: api_client_authorizations(:active_trustedclient).api_token,
+           new_owner_uuid: "",
+           redirect_to_new_user: true,
+         })
+    assert_response(422)
+  end
+
+  test "refuse to merge if new_owner_uuid is not provided" do
+    authorize_with(:project_viewer_trustedclient)
+    post(:merge, {
+           new_user_token: api_client_authorizations(:active_trustedclient).api_token,
+           redirect_to_new_user: true,
+         })
+    assert_response(422)
+  end
+
   test "refuse to update redirect_to_user_uuid directly" do
     authorize_with(:active_trustedclient)
     patch(:update, {

-----------------------------------------------------------------------


hooks/post-receive
--