Merge branch '16387-batch-update-deactivated-user'

[arvados.git] / services / api / test / functional / arvados / v1 / virtual_machines_controller_test.rb

diff --git a/services/api/test/functional/arvados/v1/virtual_machines_controller_test.rb b/services/api/test/functional/arvados/v1/virtual_machines_controller_test.rb
index 329bc1589afc6a2298472d739524fc094e7f0723..9367775ec581e76ee6c24844861df8b6d451bf14 100644 (file)
--- a/services/api/test/functional/arvados/v1/virtual_machines_controller_test.rb
+++ b/services/api/test/functional/arvados/v1/virtual_machines_controller_test.rb
@@ -1,9 +1,13 @@
+# Copyright (C) The Arvados Authors. All rights reserved.
+#
+# SPDX-License-Identifier: AGPL-3.0
+
 require 'test_helper'
 
 class Arvados::V1::VirtualMachinesControllerTest < ActionController::TestCase
   def get_logins_for(vm_sym)
     authorize_with :admin
-    get(:logins, id: virtual_machines(vm_sym).uuid)
+    get(:logins, params: {id: virtual_machines(vm_sym).uuid})
   end
 
   def find_login(sshkey_sym)
@@ -33,7 +37,6 @@ class Arvados::V1::VirtualMachinesControllerTest < ActionController::TestCase
   test "groups is an empty list by default" do
     get_logins_for(:testvm2)
     active_login = find_login(:active)
-    perm = links(:active_can_login_to_testvm2)
     assert_equal([], active_login["groups"])
   end
 
@@ -57,11 +60,11 @@ class Arvados::V1::VirtualMachinesControllerTest < ActionController::TestCase
                    properties: {'username' => 'bobblogin'})
     end
     authorize_with :admin
-    get :logins, id: vm.uuid
+    get :logins, params: {id: vm.uuid}
     assert_response :success
     assert_equal 1, json_response['items'].length
-    assert_equal nil, json_response['items'][0]['public_key']
-    assert_equal nil, json_response['items'][0]['authorized_key_uuid']
+    assert_nil json_response['items'][0]['public_key']
+    assert_nil json_response['items'][0]['authorized_key_uuid']
     assert_equal u.uuid, json_response['items'][0]['user_uuid']
     assert_equal 'bobblogin', json_response['items'][0]['username']
   end