working through last batch of minitest errors re: kwargs

Author: bistline

test/api/api_site_controller_test.rb

@@ -88,7 +88,7 @@ class ApiSiteControllerTest < ActionDispatch::IntegrationTest
       mock_url = "https://storage.googleapis.com/#{@study.bucket_id}/#{file.upload_file_name}"
       mock = Minitest::Mock.new
       mock.expect :execute_gcloud_method, mock_url,
-                  [:generate_signed_url, 0, @study.bucket_id, file.bucket_location, Hash]
+                  [:generate_signed_url, 0, @study.bucket_id, file.bucket_location], expires: Integer
       ApplicationController.stub :firecloud_client, mock do
         execute_http_request(:get, api_v1_site_study_download_data_path(accession: @study.accession, filename: file.upload_file_name))
         assert_response 302, "Did not correctly redirect to file: #{response.code}"

test/api/bulk_download_controller_test.rb

@@ -314,10 +314,10 @@ class BulkDownloadControllerTest < ActionDispatch::IntegrationTest
       # mock all calls to external services, including Google Cloud Storage, HCA Azul, and Terra Data Repo
       gcs_mock = Minitest::Mock.new
       gcs_mock.expect :execute_gcloud_method, mock_signed_url,
-                      [:generate_signed_url, 0, @basic_study.bucket_id, 'metadata.txt', { expires: 1.day.to_i }]
+                      [:generate_signed_url, 0, @basic_study.bucket_id, 'metadata.txt'], expires: 1.day.to_i
       azul_mock = Minitest::Mock.new
       azul_mock.expect :project_manifest_link, mock_manifest_response, [hca_project_id]
-      azul_mock.expect :files, mock_files_response, [Hash]
+      azul_mock.expect :files, mock_files_response, [], query: Hash
 
       # stub all service clients to interpolate mocks
       FireCloudClient.stub :new, gcs_mock do

test/controllers/site_controller_test.rb

@@ -123,7 +123,7 @@ def teardown
         public_mock.verify
       end
 
-      private_mock = generate_download_file_mock([file], private: true)
+      private_mock = generate_download_file_mock([file])
       ApplicationController.stub :firecloud_client, private_mock do
         # set to private, validate study owner/admin can still access
         # note that download_file_path and download_private_file_path both resolve to the same method and enforce the same

test/detached_helper.rb

@@ -25,7 +25,7 @@ def generate_signed_urls_mock(study_files, parent_study: nil)
 end
 
 # adds :get_workspace_file to array of mock expects - useful for testing a user clicking download link
-def generate_download_file_mock(study_files, parent_study: nil, private: false)
+def generate_download_file_mock(study_files, parent_study: nil)
   download_file_mock = Minitest::Mock.new
   study_files.each do |file|
     assign_get_file_mock!(download_file_mock)
@@ -39,11 +39,12 @@ def assign_url_mock!(mock, study_file, parent_study: nil)
   location = study_file.try(:bucket_location) || study_file
   mock_signed_url = "https://www.googleapis.com/storage/v1/b/#{study.bucket_id}/#{location}?"
   params = []
+  expires = { expires: Integer }
   ValidationTools::SIGNED_URL_KEYS.each do |param|
     params << "#{param}=#{SecureRandom.uuid}"
   end
   mock_signed_url += params.join('&')
-  mock.expect :execute_gcloud_method, mock_signed_url, [:generate_signed_url, 0, String, String, Hash]
+  mock.expect :execute_gcloud_method, mock_signed_url, [:generate_signed_url, 0, String, String], **expires
 end
 
 def assign_get_file_mock!(mock)

test/integration/external/import_service_config/hca_test.rb

@@ -153,10 +153,10 @@ def skip_if_api_down
       skip_if_api_down
       study_name = '1-3-million-brain-cells-from-e18-mice'
       access_url = @configuration.file_access_info
-      file_mock = MiniTest::Mock.new
+      file_mock = ::Minitest::Mock.new
       file_mock.expect :generation, '123456789'
       # for study to save, we need to mock all Terra orchestration API calls for creating workspace & setting acls
-      fc_client_mock = Minitest::Mock.new
+      fc_client_mock = ::Minitest::Mock.new
       owner_group = { groupEmail: 'sa-owner-group@firecloud.org' }.with_indifferent_access
       assign_workspace_mock!(fc_client_mock, owner_group, study_name)
       AdminConfiguration.stub :find_or_create_ws_user_group!, owner_group do

test/integration/external/import_service_config/nemo_test.rb

@@ -156,10 +156,10 @@ class NemoTest < ActiveSupport::TestCase
     test 'should import all from service' do
       access_url = 'https://data.nemoarchive.org/other/grant/u01_lein/lein/transcriptome/sncell/10x_v3/human/' \
                    'processed/counts/human_var_scVI_VLMC.h5ad.tar'
-      file_mock = MiniTest::Mock.new
+      file_mock = ::Minitest::Mock.new
       file_mock.expect :generation, '123456789'
       # for study to save, we need to mock all Terra orchestration API calls for creating workspace & setting acls
-      fc_client_mock = Minitest::Mock.new
+      fc_client_mock = ::Minitest::Mock.new
       owner_group = { groupEmail: 'sa-owner-group@firecloud.org' }.with_indifferent_access
       assign_workspace_mock!(fc_client_mock, owner_group, 'human-variation-study-10x-gru')
       AdminConfiguration.stub :find_or_create_ws_user_group!, owner_group do

test/lib/request_utils_test.rb

@@ -144,7 +144,7 @@ class RequestUtilsTest < ActionDispatch::IntegrationTest
     # Validates the most common scenario for client-side bucket access, e.g. a typical
     # user exploring an SCP study they learned about in a scientific journal
 
-    mock = ::MiniTest::Mock.new
+    mock = ::Minitest::Mock.new
     mock.expect :call, nil, []
 
     sign_out @user
@@ -159,7 +159,7 @@ class RequestUtilsTest < ActionDispatch::IntegrationTest
     # Validates a scenario for client-side bucket access, e.g. a particularly engaged
     # user exploring others' studies
 
-    mock = ::MiniTest::Mock.new
+    mock = ::Minitest::Mock.new
     mock.expect :call, nil, []
 
     sign_in @user
@@ -174,7 +174,7 @@ class RequestUtilsTest < ActionDispatch::IntegrationTest
     # Validates a scenario for client-side bucket access, e.g. an owner checking things
     # before publishing their SCP study
 
-    mock = ::MiniTest::Mock.new
+    mock = ::Minitest::Mock.new
     mock.expect :call, nil, [@private_study]
 
     @user.stub :token_for_storage_object, mock do

test/models/ingest_job_test.rb

@@ -134,7 +134,7 @@ class IngestJobTest < ActiveSupport::TestCase
     )
 
     4.times { mock.expect :get_job, dummy_job, [pipeline_name] }
-    mock.expect :get_job_resources, vm_info, [{ job: dummy_job }]
+    mock.expect :get_job_resources, vm_info, [], job: dummy_job
     mock.expect :exit_code_from_task, 0, [pipeline_name]
 
     cells = study.expression_matrix_cells(study_file)
@@ -196,7 +196,7 @@ class IngestJobTest < ActiveSupport::TestCase
     )
 
     4.times { mock.expect :get_job, failed_job, [failed_pipeline] }
-    mock.expect :get_job_resources, vm_info, [{ job: failed_job }]
+    mock.expect :get_job_resources, vm_info, [], job: failed_job
     mock.expect :exit_code_from_task, 1, [failed_pipeline]
 
     ApplicationController.stub :batch_api_client, mock do
@@ -268,7 +268,7 @@ class IngestJobTest < ActiveSupport::TestCase
       )
     )
     4.times { mock.expect :get_job, mock_job, [job_name] }
-    mock.expect :get_job_resources, vm_info, [{job: mock_job}]
+    mock.expect :get_job_resources, vm_info, [], job: mock_job
     mock.expect :exit_code_from_task, 0, [job_name]
 
     ApplicationController.stub :batch_api_client, mock do
@@ -322,7 +322,7 @@ class IngestJobTest < ActiveSupport::TestCase
       )
     )
     4.times { mock.expect :get_job, mock_job, [reference_pipeline] }
-    mock.expect :get_job_resources, vm_info, [{job: mock_job}]
+    mock.expect :get_job_resources, vm_info, [], job: mock_job
     mock.expect :exit_code_from_task, 0, [reference_pipeline]
 
     ApplicationController.stub :batch_api_client, mock do
@@ -391,7 +391,7 @@ class IngestJobTest < ActiveSupport::TestCase
     mock = Minitest::Mock.new
     mock.expect :list_jobs, list_mock
     mock.expect :job_done?, true, [dummy_job]
-    3.times { mock.expect :get_job_command_line, mock_commands, [{ job: dummy_job }] }
+    3.times { mock.expect :get_job_command_line, mock_commands, [], job: dummy_job }
     2.times { mock.expect :job_error, false, [pipeline_name] }
 
     ApplicationController.stub :batch_api_client, mock do
@@ -519,7 +519,7 @@ class IngestJobTest < ActiveSupport::TestCase
     mock.expect :list_jobs, list_mock
     mock.expect :job_done?, true, [dummy_job]
     mock.expect :exit_code_from_task, 65, [pipeline_name]
-    4.times { mock.expect :get_job_command_line, mock_commands, [{ job: dummy_job }] }
+    4.times { mock.expect :get_job_command_line, mock_commands, [], job: dummy_job }
     3.times { mock.expect :job_error, job_error, [pipeline_name] }
     ApplicationController.stub :batch_api_client, mock do
       cell_metadata_file = RequestUtils.data_fragment_url(ann_data_file, 'metadata')
@@ -745,7 +745,7 @@ class IngestJobTest < ActiveSupport::TestCase
 
     batch_mock = Minitest::Mock.new
     batch_mock.expect :get_job, Google::Apis::BatchV1::Job, [pipeline_name]
-    batch_mock.expect :get_job_command_line, %w[foo bar bing baz], [{job: Google::Apis::BatchV1::Job}]
+    batch_mock.expect :get_job_command_line, %w[foo bar bing baz], [], job: Google::Apis::BatchV1::Job
     ApplicationController.stub :firecloud_client, mock do
       ApplicationController.stub :batch_api_client, batch_mock do
         job.handle_ingest_failure('parse failure')
@@ -767,7 +767,7 @@ class IngestJobTest < ActiveSupport::TestCase
     )
     pipeline_name = SecureRandom.uuid
     failed_job = IngestJob.new(
-      pipeline_name: , study:, study_file: failed_file, user: @user, action: :ingest_cluster
+      pipeline_name:, study:, study_file: failed_file, user: @user, action: :ingest_cluster
     )
     error_log = "parse_logs/#{failed_file.id}/user_log.txt"
     mock = Minitest::Mock.new
@@ -785,7 +785,7 @@ class IngestJobTest < ActiveSupport::TestCase
 
     batch_mock = Minitest::Mock.new
     batch_mock.expect :get_job, Google::Apis::BatchV1::Job, [pipeline_name]
-    batch_mock.expect :get_job_command_line, %w[foo bar bing baz], [{job: Google::Apis::BatchV1::Job}]
+    batch_mock.expect :get_job_command_line, %w[foo bar bing baz], [], job: Google::Apis::BatchV1::Job
     ApplicationController.stub :firecloud_client, mock do
       ApplicationController.stub :batch_api_client, batch_mock do
         failed_job.handle_ingest_failure('parse failure')
@@ -909,8 +909,8 @@ class IngestJobTest < ActiveSupport::TestCase
     }.with_indifferent_access
 
     mock = Minitest::Mock.new
-    mock.expect :get_job_resources, vm_info, [{ job: dummy_job }]
-    mock.expect :get_job_command_line, mock_commands, [{ job: dummy_job }]
+    mock.expect :get_job_resources, vm_info, [], job: dummy_job
+    mock.expect :get_job_command_line, mock_commands, [], job: dummy_job
     12.times { mock.expect :get_job, dummy_job, [pipeline_name] }
     2.times { mock.expect :exit_code_from_task, 1, [pipeline_name] }
 
@@ -979,8 +979,8 @@ class IngestJobTest < ActiveSupport::TestCase
     # must mock batch_api_client getting pipeline metadata
     client_mock = Minitest::Mock.new
     4.times { client_mock.expect :exit_code_from_task, 137, [pipeline_name] }
-    client_mock.expect :get_job_resources, vm_info, [{job: dummy_job}]
-    client_mock.expect :get_job_command_line, commands, [{ job: dummy_job }]
+    client_mock.expect :get_job_resources, vm_info, [], job: dummy_job
+    client_mock.expect :get_job_command_line, commands, [], job: dummy_job
     # new pipeline mock is resubmitted job with larger machine_type
     new_pipeline = Minitest::Mock.new
     new_op = Google::Apis::BatchV1::Job.new(

test/models/study_test.rb

@@ -86,7 +86,7 @@ class StudyTest < ActiveSupport::TestCase
       ok_status_mock.verify
     end
 
-    group_mock = MiniTest::Mock.new
+    group_mock = Minitest::Mock.new
     group_mock.expect :get_user_groups, @user_groups
     services_mock = Minitest::Mock.new
     services_mock.expect :services_available?, true, @services_args

test/services/azul_search_service_test.rb

@@ -55,7 +55,7 @@ class AzulSearchServiceTest < ActiveSupport::TestCase
   end
 
   test 'should search Azul using facets' do
-    mock = MiniTest::Mock.new
+    mock = Minitest::Mock.new
     mock.expect :format_query_from_facets, @mock_facet_query, [@facets]
     mock.expect :merge_query_objects, @mock_facet_query, [@mock_facet_query, nil]
     mock.expect :projects, @human_tcell_response, [{ query: @mock_facet_query }]
@@ -83,7 +83,7 @@ class AzulSearchServiceTest < ActiveSupport::TestCase
       }.with_indifferent_access
     ]
     mock_age_query = { organismAgeRange: { within: [[31557600, 157788000]] } }
-    mock = MiniTest::Mock.new
+    mock = Minitest::Mock.new
     mock.expect :format_query_from_facets, mock_age_query, [facets]
     mock.expect :merge_query_objects, mock_age_query, [mock_age_query, nil]
     mock.expect :projects, @human_thymus_response, [{ query: mock_age_query }]
@@ -101,7 +101,7 @@ class AzulSearchServiceTest < ActiveSupport::TestCase
   end
 
   test 'should search Azul using terms' do
-    mock = MiniTest::Mock.new
+    mock = Minitest::Mock.new
     mock.expect :format_query_from_facets, nil, [[]]
     mock.expect :format_facet_query_from_keyword, @terms_to_facets, [@terms]
     mock.expect :format_query_from_facets, @mock_term_query, [@terms_to_facets]
@@ -126,7 +126,7 @@ class AzulSearchServiceTest < ActiveSupport::TestCase
     ]
     organ_query = { organ: { is: %w[lung] } }
     merged_query = @mock_term_query.merge(organ_query).with_indifferent_access
-    mock = MiniTest::Mock.new
+    mock = Minitest::Mock.new
     mock.expect :format_query_from_facets, organ_query, [facets]
     mock.expect :format_facet_query_from_keyword, @terms_to_facets, [@terms]
     mock.expect :format_query_from_facets, @mock_term_query, [@terms_to_facets]
@@ -180,7 +180,7 @@ class AzulSearchServiceTest < ActiveSupport::TestCase
       }
     }.with_indifferent_access
     initial_results = [@study]
-    mock = MiniTest::Mock.new
+    mock = Minitest::Mock.new
     mock.expect :format_query_from_facets, @mock_facet_query, [@facets]
     mock.expect :format_facet_query_from_keyword, @terms_to_facets, [@terms]
     mock.expect :format_query_from_facets, @mock_term_query, [@terms_to_facets]