19146: Add can_write/can_manage to users#list, fix select=can_*.

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

diff --git a/services/api/test/functional/arvados/v1/logs_controller_test.rb b/services/api/test/functional/arvados/v1/logs_controller_test.rb
index f3826ca8c733a32b20497d301f2baa58769d2671..4d4d4dabb82f9d94659627db7a362f9d5e58415f 100644 (file)
--- a/services/api/test/functional/arvados/v1/logs_controller_test.rb
+++ b/services/api/test/functional/arvados/v1/logs_controller_test.rb
@@ -1,3 +1,7 @@
+# Copyright (C) The Arvados Authors. All rights reserved.
+#
+# SPDX-License-Identifier: AGPL-3.0
+
 require 'test_helper'
 
 class Arvados::V1::LogsControllerTest < ActionController::TestCase
@@ -5,7 +9,7 @@ class Arvados::V1::LogsControllerTest < ActionController::TestCase
 
   test "non-admins can create their own logs" do
     authorize_with :active
-    post :create, log: {summary: 'test log'}
+    post :create, params: {log: {summary: 'test log'}}
     assert_response :success
     resp = assigns(:object)
     assert_not_nil resp.uuid
@@ -15,7 +19,7 @@ class Arvados::V1::LogsControllerTest < ActionController::TestCase
   test "non-admins can read their own logs" do
     authorize_with :active
     my_log = logs(:log_owned_by_active)
-    get :show, {id: my_log[:uuid]}
+    get :show, params: {id: my_log[:uuid]}
     assert_response(:success, "failed to get log")
     resp = assigns(:object)
     assert_equal(my_log[:summary], resp.summary, "got wrong log")
@@ -23,26 +27,26 @@ class Arvados::V1::LogsControllerTest < ActionController::TestCase
 
   test "test can still use where object_kind" do
     authorize_with :admin
-    get :index, {
+    get :index, params: {
       where: { object_kind: 'arvados#user' }
     }
     assert_response :success
     found = assigns(:objects)
     assert_not_equal 0, found.count
-    assert_equal found.count, (found.select { |f| f.object_uuid.match /[a-z0-9]{5}-tpzed-[a-z0-9]{15}/}).count
+    assert_equal found.count, (found.select { |f| f.object_uuid.match User.uuid_regex }).count
     l = JSON.parse(@response.body)
     assert_equal 'arvados#user', l['items'][0]['object_kind']
   end
 
   test "test can still use filter object_kind" do
     authorize_with :admin
-    get :index, {
+    get :index, params: {
       filters: [ ['object_kind', '=', 'arvados#user'] ]
     }
     assert_response :success
     found = assigns(:objects)
     assert_not_equal 0, found.count
-    assert_equal found.count, (found.select { |f| f.object_uuid.match /[a-z0-9]{5}-tpzed-[a-z0-9]{15}/}).count
+    assert_equal found.count, (found.select { |f| f.object_uuid.match User.uuid_regex }).count
   end
 
 end