Merge branch '16859-pdh-version' closes #16859

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

diff --git a/services/api/test/functional/arvados/v1/query_test.rb b/services/api/test/functional/arvados/v1/query_test.rb
index 666b9a214fea832d8a60f7c069cd14836c588dd2..dfa3b7fe778f4c56c897fd4d60e9816e579751ae 100644 (file)
--- a/services/api/test/functional/arvados/v1/query_test.rb
+++ b/services/api/test/functional/arvados/v1/query_test.rb
@@ -1,10 +1,14 @@
+# Copyright (C) The Arvados Authors. All rights reserved.
+#
+# SPDX-License-Identifier: AGPL-3.0
+
 require 'test_helper'
 
 class Arvados::V1::QueryTest < ActionController::TestCase
   test 'no fallback orders when order is unambiguous' do
     @controller = Arvados::V1::LogsController.new
     authorize_with :active
-    get :index, {
+    get :index, params: {
       order: ['id asc'],
       controller: 'logs',
     }
@@ -15,7 +19,7 @@ class Arvados::V1::QueryTest < ActionController::TestCase
   test 'fallback orders when order is ambiguous' do
     @controller = Arvados::V1::LogsController.new
     authorize_with :active
-    get :index, {
+    get :index, params: {
       order: ['event_type asc'],
       controller: 'logs',
     }
@@ -27,7 +31,7 @@ class Arvados::V1::QueryTest < ActionController::TestCase
   test 'skip fallback orders already given by client' do
     @controller = Arvados::V1::LogsController.new
     authorize_with :active
-    get :index, {
+    get :index, params: {
       order: ['modified_at asc'],
       controller: 'logs',
     }
@@ -39,7 +43,7 @@ class Arvados::V1::QueryTest < ActionController::TestCase
   test 'eliminate superfluous orders' do
     @controller = Arvados::V1::LogsController.new
     authorize_with :active
-    get :index, {
+    get :index, params: {
       order: ['logs.modified_at asc',
               'modified_at desc',
               'event_type desc',
@@ -54,7 +58,7 @@ class Arvados::V1::QueryTest < ActionController::TestCase
   test 'eliminate orders after the first unique column' do
     @controller = Arvados::V1::LogsController.new
     authorize_with :active
-    get :index, {
+    get :index, params: {
       order: ['event_type asc',
               'id asc',
               'uuid asc',
@@ -67,9 +71,9 @@ class Arvados::V1::QueryTest < ActionController::TestCase
   end
 
   test 'do not count items_available if count=none' do
-    @controller = Arvados::V1::SpecimensController.new
+    @controller = Arvados::V1::LinksController.new
     authorize_with :active
-    get :index, {
+    get :index, params: {
       count: 'none',
     }
     assert_response(:success)
@@ -78,18 +82,18 @@ class Arvados::V1::QueryTest < ActionController::TestCase
 
   [{}, {count: nil}, {count: ''}, {count: 'exact'}].each do |params|
     test "count items_available if params=#{params.inspect}" do
-      @controller = Arvados::V1::SpecimensController.new
+      @controller = Arvados::V1::LinksController.new
       authorize_with :active
-      get :index, params
+      get :index, params: params
       assert_response(:success)
       assert_operator(json_response['items_available'], :>, 0)
     end
   end
 
   test 'error if count=bogus' do
-    @controller = Arvados::V1::SpecimensController.new
+    @controller = Arvados::V1::LinksController.new
     authorize_with :active
-    get :index, {
+    get :index, params: {
       count: 'bogus',
     }
     assert_response(422)