diff --git a/spec/models/concerns/hyrax/solr_document_behavior_spec.rb b/spec/models/concerns/hyrax/solr_document_behavior_spec.rb index b4801c19d2..d619e7cb09 100644 --- a/spec/models/concerns/hyrax/solr_document_behavior_spec.rb +++ b/spec/models/concerns/hyrax/solr_document_behavior_spec.rb @@ -167,8 +167,7 @@ end it 'gives the global id for the valkyrie class' do - model_name = Hyrax.config.use_valkyrie? ? 'Hyrax::ValkyrieGlobalIdProxy' : 'Monograph' - expect(solr_document.to_model.to_global_id.to_s).to end_with("#{model_name}/123") + expect(solr_document.to_model.to_global_id.to_s).to end_with('Hyrax::ValkyrieGlobalIdProxy/123') end end end diff --git a/spec/models/sipity_spec.rb b/spec/models/sipity_spec.rb index 00fbebcf65..82fe4e1843 100644 --- a/spec/models/sipity_spec.rb +++ b/spec/models/sipity_spec.rb @@ -46,11 +46,8 @@ context "with a SolrDocument" do let(:object) { SolrDocument.new(id: '9999', has_model_ssim: ["GenericWork"]) } let(:workflow_state) { create(:workflow_state) } - let(:proxy_for_global_id) do - Hyrax.config.use_valkyrie? ? 'Hyrax::ValkyrieGlobalIdProxy' : 'GenericWork' - end let!(:entity) do - Sipity::Entity.create(proxy_for_global_id: "gid://#{GlobalID.app}/#{proxy_for_global_id}/9999", + Sipity::Entity.create(proxy_for_global_id: "gid://#{GlobalID.app}/GenericWork/9999", workflow_state: workflow_state, workflow: workflow_state.workflow) end