test updates #1628

seek4science · Feb 20, 2024 · 672cc37 · 672cc37
1 parent bbf08ae
commit 672cc37
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 6 deletions.
diff --git a/app/controllers/data_files_controller.rb b/app/controllers/data_files_controller.rb
@@ -38,7 +38,7 @@ def destroy
       redirect_to destroy_samples_confirm_data_file_path(@data_file)
     else
       if params[:destroy_extracted_samples] == '1'
-        @data_file.extracted_samples_ids.each_slice(500) do |ids|
+        @data_file.extracted_sample_ids.each_slice(500) do |ids|
           SamplesBatchDeleteJob.perform_later(ids)
         end
       end

diff --git a/test/functional/data_files_controller_test.rb b/test/functional/data_files_controller_test.rb
@@ -2833,18 +2833,21 @@ def test_show_item_attributed_to_jerm_file
 
     df = data_file_with_extracted_samples
     sample = df.extracted_samples.first
+    sample_ids = df.extracted_sample_ids
 
     assert_no_difference('DataFile.count') do
       delete :destroy, params: { id: df.id }
     end
     assert_redirected_to destroy_samples_confirm_data_file_path(df)
 
     assert_difference('DataFile.count', -1) do
-      assert_difference('Sample.count', -4) do
-        assert_enqueued_jobs(5, only: AuthLookupDeleteJob) do
+      assert_no_difference('Sample.count') do
+        assert_enqueued_jobs(1, only: AuthLookupDeleteJob) do
           assert_enqueued_with(job: AuthLookupDeleteJob, args: ['DataFile', df.id]) do
-            assert_enqueued_with(job: AuthLookupDeleteJob, args: ['Sample', sample.id]) do
-              delete :destroy, params: { id: df.id, destroy_extracted_samples: '1' }
+            assert_enqueued_jobs(1, only: SamplesBatchDeleteJob) do
+              assert_enqueued_with(job: SamplesBatchDeleteJob, args: [sample_ids]) do
+                delete :destroy, params: { id: df.id, destroy_extracted_samples: '1' }
+              end
             end
           end
         end
@@ -2869,7 +2872,9 @@ def test_show_item_attributed_to_jerm_file
       assert_no_difference('Sample.count') do
         assert_enqueued_jobs(1, only: AuthLookupDeleteJob) do
           assert_enqueued_with(job: AuthLookupDeleteJob, args: ['DataFile', df.id]) do
-            delete :destroy, params: { id: df.id, destroy_extracted_samples: '0' }
+            assert_no_enqueued_jobs(only: SamplesBatchDeleteJob) do
+              delete :destroy, params: { id: df.id, destroy_extracted_samples: '0' }
+            end
           end
         end
       end