samvera · no-reply · Mar 21, 2024 · Mar 20, 2024
diff --git a/hyrax.gemspec b/hyrax.gemspec
@@ -18,13 +18,7 @@ SUMMARY
   spec.homepage      = "http://github.com/samvera/hyrax"
 
   spec.files         = `git ls-files`.split($OUTPUT_RECORD_SEPARATOR).reject do |f|
-    f == 'bin/rails' ||
-      # We want for downstream implementations to be able to leverage the various Hyrax factories.
-      # As such we need them to be available in the .gem file.  See `./lib/hyrax/spec/factories.rb`
-      # for more details.
-      (File.dirname(f) =~ %r{\A"?spec\/?} &&
-        File.dirname(f) !~ %r{\A"?spec\/(factories|assets|support)\/?}
-      )
+    f == 'bin/rails' || File.dirname(f) =~ %r{\A"?spec\/?}
   end
   spec.executables   = spec.files.grep(%r{^bin/}).map { |f| File.basename(f) }
   spec.name          = "hyrax"

diff --git a/spec/factories/access_control.rb → .../shared_specs/factories/access_control.rb b/spec/factories/access_control.rb → .../shared_specs/factories/access_control.rb
diff --git a/spec/factories/admin_sets.rb → ...pecs/shared_specs/factories/admin_sets.rb b/spec/factories/admin_sets.rb → ...pecs/shared_specs/factories/admin_sets.rb
diff --git a/spec/factories/admin_sets_lw.rb → ...s/shared_specs/factories/admin_sets_lw.rb b/spec/factories/admin_sets_lw.rb → ...s/shared_specs/factories/admin_sets_lw.rb
diff --git a/spec/factories/administrative_sets.rb → ...ed_specs/factories/administrative_sets.rb b/spec/factories/administrative_sets.rb → ...ed_specs/factories/administrative_sets.rb
diff --git a/spec/factories/api_items.rb → ...specs/shared_specs/factories/api_items.rb b/spec/factories/api_items.rb → ...specs/shared_specs/factories/api_items.rb
diff --git a/spec/factories/collection_branding_infos.rb → ...cs/factories/collection_branding_infos.rb b/spec/factories/collection_branding_infos.rb → ...cs/factories/collection_branding_infos.rb
diff --git a/...factories/collection_type_participants.rb → ...factories/collection_type_participants.rb b/...factories/collection_type_participants.rb → ...factories/collection_type_participants.rb
diff --git a/spec/factories/collection_types.rb → ...hared_specs/factories/collection_types.rb b/spec/factories/collection_types.rb → ...hared_specs/factories/collection_types.rb
diff --git a/spec/factories/collections.rb → ...ecs/shared_specs/factories/collections.rb b/spec/factories/collections.rb → ...ecs/shared_specs/factories/collections.rb
diff --git a/spec/factories/collections_factory.rb → ...ed_specs/factories/collections_factory.rb b/spec/factories/collections_factory.rb → ...ed_specs/factories/collections_factory.rb
diff --git a/spec/factories/content_blocks.rb → .../shared_specs/factories/content_blocks.rb b/spec/factories/content_blocks.rb → .../shared_specs/factories/content_blocks.rb
diff --git a/spec/factories/counter_metrics.rb → ...shared_specs/factories/counter_metrics.rb b/spec/factories/counter_metrics.rb → ...shared_specs/factories/counter_metrics.rb
diff --git a/spec/factories/featured_works.rb → .../shared_specs/factories/featured_works.rb b/spec/factories/featured_works.rb → .../shared_specs/factories/featured_works.rb
diff --git a/spec/factories/file_sets.rb → ...specs/shared_specs/factories/file_sets.rb b/spec/factories/file_sets.rb → ...specs/shared_specs/factories/file_sets.rb
diff --git a/spec/factories/generic_works.rb → ...s/shared_specs/factories/generic_works.rb b/spec/factories/generic_works.rb → ...s/shared_specs/factories/generic_works.rb
diff --git a/spec/factories/hyrax_collection.rb → ...hared_specs/factories/hyrax_collection.rb b/spec/factories/hyrax_collection.rb → ...hared_specs/factories/hyrax_collection.rb
diff --git a/spec/factories/hyrax_default_admin_set.rb → ...pecs/factories/hyrax_default_admin_set.rb b/spec/factories/hyrax_default_admin_set.rb → ...pecs/factories/hyrax_default_admin_set.rb
diff --git a/spec/factories/hyrax_embargo.rb → ...s/shared_specs/factories/hyrax_embargo.rb b/spec/factories/hyrax_embargo.rb → ...s/shared_specs/factories/hyrax_embargo.rb
diff --git a/spec/factories/hyrax_file_metadata.rb → ...ed_specs/factories/hyrax_file_metadata.rb b/spec/factories/hyrax_file_metadata.rb → ...ed_specs/factories/hyrax_file_metadata.rb
diff --git a/spec/factories/hyrax_file_set.rb → .../shared_specs/factories/hyrax_file_set.rb b/spec/factories/hyrax_file_set.rb → .../shared_specs/factories/hyrax_file_set.rb
diff --git a/spec/factories/hyrax_lease.rb → ...ecs/shared_specs/factories/hyrax_lease.rb b/spec/factories/hyrax_lease.rb → ...ecs/shared_specs/factories/hyrax_lease.rb
diff --git a/spec/factories/hyrax_resource.rb → .../shared_specs/factories/hyrax_resource.rb b/spec/factories/hyrax_resource.rb → .../shared_specs/factories/hyrax_resource.rb
diff --git a/spec/factories/hyrax_work.rb → ...pecs/shared_specs/factories/hyrax_work.rb b/spec/factories/hyrax_work.rb → ...pecs/shared_specs/factories/hyrax_work.rb
diff --git a/spec/factories/object_id.rb → ...specs/shared_specs/factories/object_id.rb b/spec/factories/object_id.rb → ...specs/shared_specs/factories/object_id.rb
diff --git a/spec/factories/operations.rb → ...pecs/shared_specs/factories/operations.rb b/spec/factories/operations.rb → ...pecs/shared_specs/factories/operations.rb
diff --git a/spec/factories/permission.rb → ...pecs/shared_specs/factories/permission.rb b/spec/factories/permission.rb → ...pecs/shared_specs/factories/permission.rb
diff --git a/...factories/permission_template_accesses.rb → ...factories/permission_template_accesses.rb b/...factories/permission_template_accesses.rb → ...factories/permission_template_accesses.rb
diff --git a/spec/factories/permission_templates.rb → ...d_specs/factories/permission_templates.rb b/spec/factories/permission_templates.rb → ...d_specs/factories/permission_templates.rb
diff --git a/spec/factories/proxy_deposit_requests.rb → ...specs/factories/proxy_deposit_requests.rb b/spec/factories/proxy_deposit_requests.rb → ...specs/factories/proxy_deposit_requests.rb
diff --git a/spec/factories/single_use_links.rb → ...hared_specs/factories/single_use_links.rb b/spec/factories/single_use_links.rb → ...hared_specs/factories/single_use_links.rb
diff --git a/spec/factories/sipity_entities.rb → ...shared_specs/factories/sipity_entities.rb b/spec/factories/sipity_entities.rb → ...shared_specs/factories/sipity_entities.rb
diff --git a/spec/factories/uploaded_files.rb → .../shared_specs/factories/uploaded_files.rb b/spec/factories/uploaded_files.rb → .../shared_specs/factories/uploaded_files.rb
diff --git a/spec/factories/users.rb → ...rax/specs/shared_specs/factories/users.rb b/spec/factories/users.rb → ...rax/specs/shared_specs/factories/users.rb
diff --git a/spec/factories/workflow_actions.rb → ...hared_specs/factories/workflow_actions.rb b/spec/factories/workflow_actions.rb → ...hared_specs/factories/workflow_actions.rb
diff --git a/spec/factories/workflow_states.rb → ...shared_specs/factories/workflow_states.rb b/spec/factories/workflow_states.rb → ...shared_specs/factories/workflow_states.rb
diff --git a/spec/factories/workflows.rb → ...specs/shared_specs/factories/workflows.rb b/spec/factories/workflows.rb → ...specs/shared_specs/factories/workflows.rb
diff --git a/spec/factories/README.md b/spec/factories/README.md
@@ -0,0 +1 @@
+Where have all the factories gone?  See [./lib/hyrax/specs/shared_specs/factories/](./lib/hyrax/specs/shared_specs/factories/).
diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb
@@ -99,7 +99,7 @@ def to_rdf_representation
 require 'hyrax/specs/shared_specs/factories/strategies/valkyrie_resource'
 FactoryBot.register_strategy(:valkyrie_create, ValkyrieCreateStrategy)
 FactoryBot.register_strategy(:json, JsonStrategy)
-FactoryBot.definition_file_paths = [File.expand_path("../factories", __FILE__)]
+FactoryBot.definition_file_paths = [File.expand_path("../../lib/hyrax/specs/shared_specs/factories", __FILE__)]
 FactoryBot.find_definitions
 require 'rspec/mocks'
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1 @@
		Where have all the factories gone? See [./lib/hyrax/specs/shared_specs/factories/](./lib/hyrax/specs/shared_specs/factories/).