Use the `FileMetadata#type` not `FileSet#original_file_id` for use #4236

no-reply · 2020-01-31T02:10:21Z

FileSet's use "relation" should be controlled exclusively by the related
FileMetadata's #type property. Move toward removing the original_file_id and
other FileSet attributes by reworking the existing queries.

@samvera/hyrax-code-reviewers

Replaces hard-coded uses of the test adapter with configured ones. The adapter is still used across the board, but with more flexibility.

app/services/hyrax/custom_queries/navigators/find_files.rb

spec/services/hyrax/custom_queries/navigators/find_files_spec.rb

jeremyf

A few +1 comments, one point of clarification, and one possible blocker regarding spec name.

app/services/hyrax/custom_queries/navigators/find_files.rb

spec/services/hyrax/custom_queries/navigators/find_files_spec.rb

FileSet's use "relation" should be controlled exclusively by the related FileMetadata's `#type` property. Move toward removing the `original_file_id` and other `FileSet` attributes by reworking the existing queries.

From [CircleCI build 17168][1] for [PR #4326][2], we encountered an error in which we attempted to `+` together `nil` and a String object. This commit will prevent an application exception when we encounter that behavior. Below is log entry regarding the error. ```log ActionView::Template::Error: undefined method `+' for nil:NilClass # ./app/views/hyrax/homepage/_recent_document.html.erb:7 ``` **Is this appropriate?** I don't know. It looks as though we might want to treat this as in error. But, given some of the challenges we've had with our feature specs, I think I'd prefer that this erratic error not break the build. (Note: When this build broke, Ruby 2.4.7 and 2.6.2 builds of the same code worked) [1]:https://circleci.com/gh/samvera/hyrax/17168#tests/containers/5 [2]:#4236

jeremyf · 2020-01-31T19:22:03Z

This error looks weird given other Ruby builds work:

1) Hyrax::CollectionIndexer#generate_solr_document with block yields the document that includes our fields
     # ActiveFedora pattern must become extensible
     Failure/Error: expect { |b| indexer.generate_solr_document(&b) }.to yield_with_args(a_hash_including(doc))
     
       expected given block to yield with arguments, but yielded with unexpected arguments
       expected: [(a hash including {"generic_type_sim" => ["Collection"], "thumbnail_path_ss" => "/downloads/1234?file=thumbnail", "member_of_collection_ids_ssim" => ["col1", "col2"], "member_of_collections_ssim" => ["col1 title", "col2 title"], "visibility_ssi" => "restricted"})]
            got: [{"collection_type_gid_ssim"=>["gid://internal/hyrax-collectiontype/1"], "depositor_ssim"=>["user134@...020-01-31T19:10:52Z", "title_sim"=>["Collection Title 29"], "title_tesim"=>["Collection Title 29"]}]

From https://circleci.com/gh/samvera/hyrax/17173#tests/containers/2

From [CircleCI build 17168][1] for [PR #4326][2], we encountered an error in which we attempted to `+` together `nil` and a String object. This commit will prevent an application exception when we encounter that behavior. Below is log entry regarding the error. ```log ActionView::Template::Error: undefined method `+' for nil:NilClass # ./app/views/hyrax/homepage/_recent_document.html.erb:7 ``` **Is this appropriate?** I don't know. It looks as though we might want to treat this as in error. But, given some of the challenges we've had with our feature specs, I think I'd prefer that this erratic error not break the build. (Note: When this build broke, Ruby 2.4.7 and 2.6.2 builds of the same code worked) [1]:https://circleci.com/gh/samvera/hyrax/17168#tests/containers/5 [2]:#4236

Refactor file navigators specs to use test adapter by configuration

838cb01

Replaces hard-coded uses of the test adapter with configured ones. The adapter is still used across the board, but with more flexibility.