From 66eebbc795c4688965e107c2612a99a55180e0ad Mon Sep 17 00:00:00 2001 From: Daniel Pierce Date: Wed, 23 Mar 2022 11:33:33 -0400 Subject: [PATCH 1/2] Fix flaky file ordering --- spec/jobs/valkyrie_ingest_job_spec.rb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/spec/jobs/valkyrie_ingest_job_spec.rb b/spec/jobs/valkyrie_ingest_job_spec.rb index f5929fa258..57e38c6ba4 100644 --- a/spec/jobs/valkyrie_ingest_job_spec.rb +++ b/spec/jobs/valkyrie_ingest_job_spec.rb @@ -86,8 +86,8 @@ described_class.perform_now(thumbnail_upload, pcdm_use: Hyrax::FileMetadata::Use::THUMBNAIL) reloaded_file_set = Hyrax.query_service.find_by(id: file_set.id) - expect(reloaded_file_set) - .to have_attached_files(be_original_file, be_thumbnail_file) + files = Hyrax.custom_queries.find_files(file_set: reloaded_file_set) + expect(files).to match(a_collection_containing_exactly(be_original_file, be_thumbnail_file)) expect(reloaded_file_set.title).to eq ["image.png"] expect(reloaded_file_set.label).to eq "image.png" expect(reloaded_file_set.file_ids) From 2e2e7145005c7987964810c5780dbd9a99d6a491 Mon Sep 17 00:00:00 2001 From: Daniel Pierce Date: Wed, 23 Mar 2022 12:57:03 -0400 Subject: [PATCH 2/2] use simpler matcher Co-authored-by: Chris Colvard --- spec/jobs/valkyrie_ingest_job_spec.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/spec/jobs/valkyrie_ingest_job_spec.rb b/spec/jobs/valkyrie_ingest_job_spec.rb index 57e38c6ba4..d3f033b03f 100644 --- a/spec/jobs/valkyrie_ingest_job_spec.rb +++ b/spec/jobs/valkyrie_ingest_job_spec.rb @@ -87,7 +87,7 @@ reloaded_file_set = Hyrax.query_service.find_by(id: file_set.id) files = Hyrax.custom_queries.find_files(file_set: reloaded_file_set) - expect(files).to match(a_collection_containing_exactly(be_original_file, be_thumbnail_file)) + expect(files).to contain_exactly(be_original_file, be_thumbnail_file) expect(reloaded_file_set.title).to eq ["image.png"] expect(reloaded_file_set.label).to eq "image.png" expect(reloaded_file_set.file_ids)