diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb index afa1ef7d0b..19d8ab74e6 100644 --- a/spec/spec_helper.rb +++ b/spec/spec_helper.rb @@ -259,6 +259,10 @@ def clean_active_fedora_repository config.profile_examples = 10 + config.before(:example, :active_fedora) do + skip("Don't test Wings") if Hyrax.config.disable_wings + end + config.before(:example, :clean_repo) do clean_active_fedora_repository unless Hyrax.config.disable_wings Hyrax::RedisEventStore.instance.then(&:flushdb) @@ -331,7 +335,9 @@ def clean_active_fedora_repository .to receive(:metadata_adapter) .and_return(Valkyrie::MetadataAdapter.find(adapter_name)) - if adapter_name != :wings_adapter + if adapter_name == :wings_adapter + skip("Don't test Wings when it is dasabled") if Hyrax.config.disable_wings + else allow(Hyrax.config).to receive(:disable_wings).and_return(true) hide_const("Wings") # disable_wings=true removes the Wings constant end diff --git a/spec/wings/active_fedora_converter_spec.rb b/spec/wings/active_fedora_converter_spec.rb index 8f4f4d274e..3137a73f0f 100644 --- a/spec/wings/active_fedora_converter_spec.rb +++ b/spec/wings/active_fedora_converter_spec.rb @@ -3,7 +3,7 @@ require 'wings' require 'wings/active_fedora_converter' -RSpec.describe Wings::ActiveFedoraConverter, :clean_repo do +RSpec.describe Wings::ActiveFedoraConverter, :active_fedora, :clean_repo do subject(:converter) { described_class.new(resource: resource) } let(:attributes) { { id: id } } let(:id) { 'moomin_id' } diff --git a/spec/wings/attribute_transformer_spec.rb b/spec/wings/attribute_transformer_spec.rb index 8cc071e365..66e0c2f90e 100644 --- a/spec/wings/attribute_transformer_spec.rb +++ b/spec/wings/attribute_transformer_spec.rb @@ -1,7 +1,7 @@ # frozen_string_literal: true require 'wings/attribute_transformer' -RSpec.describe Wings::AttributeTransformer do +RSpec.describe Wings::AttributeTransformer, :active_fedora do let(:id) { 'moomin123' } let(:work) { GenericWork.new(id: id, **attributes) } diff --git a/spec/wings/hydra/works/services/add_file_to_file_set_spec.rb b/spec/wings/hydra/works/services/add_file_to_file_set_spec.rb index 3d31fb02f0..a886c67990 100644 --- a/spec/wings/hydra/works/services/add_file_to_file_set_spec.rb +++ b/spec/wings/hydra/works/services/add_file_to_file_set_spec.rb @@ -2,7 +2,7 @@ require 'wings_helper' require 'wings/hydra/works/services/add_file_to_file_set' -RSpec.describe Wings::Works::AddFileToFileSet, :clean_repo do +RSpec.describe Wings::Works::AddFileToFileSet, :active_fedora, :clean_repo do let(:af_file_set) { create(:file_set, id: 'fileset_id') } let!(:file_set) { af_file_set.valkyrie_resource } diff --git a/spec/wings/model_transformer_spec.rb b/spec/wings/model_transformer_spec.rb index ae881ce2cc..312d36510f 100644 --- a/spec/wings/model_transformer_spec.rb +++ b/spec/wings/model_transformer_spec.rb @@ -2,7 +2,7 @@ require 'wings_helper' require 'wings/model_transformer' -RSpec.describe Wings::ModelTransformer, :clean_repo do +RSpec.describe Wings::ModelTransformer, :active_fedora, :clean_repo do subject(:factory) { described_class.new(pcdm_object: pcdm_object) } let(:pcdm_object) { work } let(:adapter) { Valkyrie::MetadataAdapter.find(:memory) } diff --git a/spec/wings/orm_converter_spec.rb b/spec/wings/orm_converter_spec.rb index b3d286ef29..e1258c8d38 100644 --- a/spec/wings/orm_converter_spec.rb +++ b/spec/wings/orm_converter_spec.rb @@ -2,7 +2,7 @@ require 'wings_helper' require 'wings/orm_converter' -RSpec.describe Wings::OrmConverter do +RSpec.describe Wings::OrmConverter, :active_fedora do describe '.to_valkyrie_resource_class' do context 'when given a ActiveFedora class (eg. a constant that responds to #properties)' do context 'for the returned object (e.g. a class)' do diff --git a/spec/wings/services/custom_queries/find_access_control_spec.rb b/spec/wings/services/custom_queries/find_access_control_spec.rb index bc6b27fbfe..fb92a6e9bc 100644 --- a/spec/wings/services/custom_queries/find_access_control_spec.rb +++ b/spec/wings/services/custom_queries/find_access_control_spec.rb @@ -2,7 +2,7 @@ require 'wings_helper' require 'wings/services/custom_queries/find_access_control' -RSpec.describe Wings::CustomQueries::FindAccessControl do +RSpec.describe Wings::CustomQueries::FindAccessControl, :active_fedora do subject(:query_handler) { described_class.new(query_service: query_service) } let(:adapter) { Valkyrie::MetadataAdapter.find(:wings_adapter) } let(:persister) { adapter.persister } diff --git a/spec/wings/services/custom_queries/find_collections_by_type_spec.rb b/spec/wings/services/custom_queries/find_collections_by_type_spec.rb index 1b0e7f563e..f2c969e53e 100644 --- a/spec/wings/services/custom_queries/find_collections_by_type_spec.rb +++ b/spec/wings/services/custom_queries/find_collections_by_type_spec.rb @@ -2,7 +2,7 @@ require 'wings_helper' require 'wings/services/custom_queries/find_collections_by_type' -RSpec.describe Wings::CustomQueries::FindCollectionsByType, :clean_repo do +RSpec.describe Wings::CustomQueries::FindCollectionsByType, :active_fedora, :clean_repo do subject(:query_handler) { described_class.new(query_service: query_service) } let(:collection_type) { FactoryBot.create(:collection_type) } let(:type_gid) { collection_type.to_global_id } diff --git a/spec/wings/services/custom_queries/find_file_metadata_spec.rb b/spec/wings/services/custom_queries/find_file_metadata_spec.rb index ac70a7f302..d4b998c727 100644 --- a/spec/wings/services/custom_queries/find_file_metadata_spec.rb +++ b/spec/wings/services/custom_queries/find_file_metadata_spec.rb @@ -3,7 +3,7 @@ require 'wings/hydra/works/services/add_file_to_file_set' require 'wings/services/custom_queries/find_file_metadata' -RSpec.describe Wings::CustomQueries::FindFileMetadata, :clean_repo do +RSpec.describe Wings::CustomQueries::FindFileMetadata, :active_fedora, :clean_repo do subject(:query_handler) { described_class.new(query_service: query_service) } let(:query_service) { Hyrax.query_service } let(:af_file_id1) { 'file1' } diff --git a/spec/wings/services/custom_queries/find_many_by_alternate_ids_spec.rb b/spec/wings/services/custom_queries/find_many_by_alternate_ids_spec.rb index f249b7b54e..c2f0b3b809 100644 --- a/spec/wings/services/custom_queries/find_many_by_alternate_ids_spec.rb +++ b/spec/wings/services/custom_queries/find_many_by_alternate_ids_spec.rb @@ -2,7 +2,7 @@ require 'wings_helper' require 'wings/services/custom_queries/find_many_by_alternate_ids' -RSpec.describe Wings::CustomQueries::FindManyByAlternateIds do +RSpec.describe Wings::CustomQueries::FindManyByAlternateIds, :active_fedora do let(:query_service) { Hyrax.query_service } let(:work1) { create(:public_work) } diff --git a/spec/wings/transformer_value_mapper_spec.rb b/spec/wings/transformer_value_mapper_spec.rb index 587b877e4d..37fee4dc45 100644 --- a/spec/wings/transformer_value_mapper_spec.rb +++ b/spec/wings/transformer_value_mapper_spec.rb @@ -2,7 +2,7 @@ require 'spec_helper' require 'wings/transformer_value_mapper' -RSpec.describe Wings::TransformerValueMapper do +RSpec.describe Wings::TransformerValueMapper, :active_fedora do subject(:mapper) { described_class.for(value) } let(:value) { 'a value' } let(:uri) { RDF::URI('http://example.com/moomin') } diff --git a/spec/wings/valkyrie/persister_spec.rb b/spec/wings/valkyrie/persister_spec.rb index d5bfa15b87..6b16b95ce1 100644 --- a/spec/wings/valkyrie/persister_spec.rb +++ b/spec/wings/valkyrie/persister_spec.rb @@ -3,7 +3,7 @@ require 'valkyrie/specs/shared_specs' require 'wings' -RSpec.describe Wings::Valkyrie::Persister do +RSpec.describe Wings::Valkyrie::Persister, :active_fedora do subject(:persister) { described_class.new(adapter: adapter) } let(:adapter) { Wings::Valkyrie::MetadataAdapter.new } let(:query_service) { adapter.query_service } diff --git a/spec/wings/valkyrie/query_service_spec.rb b/spec/wings/valkyrie/query_service_spec.rb index 729fa26403..d620ff56cd 100644 --- a/spec/wings/valkyrie/query_service_spec.rb +++ b/spec/wings/valkyrie/query_service_spec.rb @@ -3,7 +3,7 @@ require 'valkyrie/specs/shared_specs' require 'wings' -RSpec.describe Wings::Valkyrie::QueryService, :clean_repo do +RSpec.describe Wings::Valkyrie::QueryService, :active_fedora, :clean_repo do before do module Hyrax::Test module QueryService diff --git a/spec/wings/valkyrie/resource_factory_spec.rb b/spec/wings/valkyrie/resource_factory_spec.rb index ddef911ec9..0a33f59552 100644 --- a/spec/wings/valkyrie/resource_factory_spec.rb +++ b/spec/wings/valkyrie/resource_factory_spec.rb @@ -2,7 +2,7 @@ require 'spec_helper' require 'wings' -RSpec.describe Wings::Valkyrie::ResourceFactory do +RSpec.describe Wings::Valkyrie::ResourceFactory, :active_fedora do subject(:factory) { described_class.new(adapter: adapter) } let(:adapter) { Valkyrie::Persistence::Memory::MetadataAdapter.new } let(:work) { GenericWork.new } diff --git a/spec/wings/valkyrie/storage_spec.rb b/spec/wings/valkyrie/storage_spec.rb index a4eba55ac5..119de87f2b 100644 --- a/spec/wings/valkyrie/storage_spec.rb +++ b/spec/wings/valkyrie/storage_spec.rb @@ -3,7 +3,7 @@ require 'hyrax/specs/shared_specs/valkyrie_storage_versions' require 'valkyrie/specs/shared_specs' -RSpec.describe Wings::Valkyrie::Storage, :clean_repo do +RSpec.describe Wings::Valkyrie::Storage, :active_fedora, :clean_repo do subject(:storage_adapter) { described_class.new } let(:file) { fixture_file_upload('/world.png', 'image/png') }