X-Git-Url: https://git.arvados.org/arvados.git/blobdiff_plain/90e9b3c5ef43242afc42770d03c61489d69c1de5..359be27e63987690c6e14813c763ea349f4a9534:/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 96daa5b227..4d4d4dabb8 100644
--- 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,43 +9,44 @@ 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
-    uuid = JSON.parse(@response.body)['uuid']
-    assert_not_nil uuid
+    resp = assigns(:object)
+    assert_not_nil resp.uuid
+    assert_equal('test log', resp.summary, "loaded wrong log after creation")
   end
 
   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]}
-    assert_response(:success, "failed to load created log")
-    assert_equal(my_log[:summary], assigns(:object).summary,
-                 "loaded wrong log after creation")
+    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")
   end
 
   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