Merge branch '18631-shell-login-sync'

[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 2931a380927a22da94a8a01da30f7a36bf57e392..fae9dc40c6daf2c9df1e28edae47cd743757db52 100644 (file)
--- a/services/api/test/functional/arvados/v1/query_test.rb
+++ b/services/api/test/functional/arvados/v1/query_test.rb
@@ -8,7 +8,7 @@ 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',
     }
@@ -19,31 +19,31 @@ 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',
     }
     assert_response :success
-    assert_equal('logs.event_type asc, logs.modified_at desc, logs.uuid',
+    assert_equal('logs.event_type asc, logs.modified_at desc, logs.uuid desc',
                  assigns(:objects).order_values.join(', '))
   end
 
   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',
     }
     assert_response :success
-    assert_equal('logs.modified_at asc, logs.uuid',
+    assert_equal('logs.modified_at asc, logs.uuid desc',
                  assigns(:objects).order_values.join(', '))
   end
 
   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',
@@ -51,14 +51,14 @@ class Arvados::V1::QueryTest < ActionController::TestCase
       controller: 'logs',
     }
     assert_response :success
-    assert_equal('logs.modified_at asc, logs.event_type desc, logs.uuid',
+    assert_equal('logs.modified_at asc, logs.event_type desc, logs.uuid desc',
                  assigns(:objects).order_values.join(', '))
   end
 
   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',
@@ -73,7 +73,17 @@ class Arvados::V1::QueryTest < ActionController::TestCase
   test 'do not count items_available if count=none' do
     @controller = Arvados::V1::LinksController.new
     authorize_with :active
-    get :index, {
+    get :index, params: {
+      count: 'none',
+    }
+    assert_response(:success)
+    refute(json_response.has_key?('items_available'))
+  end
+
+  test 'do not count items_available if count=none for group contents endpoint' do
+    @controller = Arvados::V1::GroupsController.new
+    authorize_with :active
+    get :contents, params: {
       count: 'none',
     }
     assert_response(:success)
@@ -84,7 +94,7 @@ class Arvados::V1::QueryTest < ActionController::TestCase
     test "count items_available if params=#{params.inspect}" do
       @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
@@ -93,7 +103,7 @@ class Arvados::V1::QueryTest < ActionController::TestCase
   test 'error if count=bogus' do
     @controller = Arvados::V1::LinksController.new
     authorize_with :active
-    get :index, {
+    get :index, params: {
       count: 'bogus',
     }
     assert_response(422)