Skip to content

Commit

Permalink
Merge pull request #6544 from samvera/adjusts_custom_queries_navigato…
Browse files Browse the repository at this point in the history 
…rs_child_works_navigator_spec

Moves test that checks AF objects with Valkyrie Ids, then Valkyrizes it in original location.
  • Loading branch information
@dlpierce
dlpierce authored Dec 14, 2023
2 parents 9201056 + 92ec634 commit 81ece91
Show file tree
Hide file tree
Showing 2 changed files with 104 additions and 39 deletions.
63 changes: 24 additions & 39 deletions spec/services/hyrax/custom_queries/navigators/child_works_navigator_spec.rb
View file
Original file line number Diff line number Diff line change
@@ -1,79 +1,64 @@
# frozen_string_literal: true
RSpec.describe Hyrax::CustomQueries::Navigators::ChildWorksNavigator, :clean_repo do
subject(:factory) { Wings::ModelTransformer.new(pcdm_object: pcdm_object) }

let(:resource) { subject.build }
let(:custom_query_service) { Hyrax.custom_queries }

let(:collection1) { build(:collection, id: 'col1', title: ['Collection 1']) }
let(:collection2) { build(:collection, id: 'col2', title: ['Child Collection 1']) }
let(:collection3) { build(:collection, id: 'col3', title: ['Child Collection 2']) }
let(:work1) { build(:work, id: 'wk1', title: ['Work 1']) }
let(:work2) { build(:work, id: 'wk2', title: ['Child Work 1']) }
let(:work3) { build(:work, id: 'wk3', title: ['Child Work 2']) }
let(:fileset1) { build(:file_set, id: 'fs1', title: ['Child File Set 1']) }
let(:fileset2) { build(:file_set, id: 'fs2', title: ['Child File Set 2']) }
let(:collection1) { valkyrie_create(:hyrax_collection, title: ['Collection 1']) }
let(:collection2) { valkyrie_create(:hyrax_collection, title: ['Child Collection 1']) }
let(:collection3) { valkyrie_create(:hyrax_collection, title: ['Child Collection 2']) }
let(:work1) { valkyrie_create(:hyrax_work, title: ['Work 1']) }
let(:work2) { valkyrie_create(:hyrax_work, title: ['Child Work 1']) }
let(:work3) { valkyrie_create(:hyrax_work, title: ['Child Work 2']) }
let(:fileset1) { valkyrie_create(:hyrax_file_set, title: ['Child File Set 1']) }
let(:fileset2) { valkyrie_create(:hyrax_file_set, title: ['Child File Set 2']) }

describe '#find_child_works' do
context 'on a collection' do
let(:pcdm_object) { collection1 }
let(:collection1_resource) { resource }

before do
collection1.members = [collection2, collection3, work2, work1]
collection1.save!
collection1.member_ids = [collection2.id, collection3.id, work2.id, work1.id]
Hyrax.persister.save(resource: collection1)
end

it 'returns only child works as Valkyrie resources' do
child_works = custom_query_service.find_child_works(resource: collection1_resource)
expect(child_works.map(&:id)).to match_valkyrie_ids_with_active_fedora_ids([work2.id, work1.id])
child_works = custom_query_service.find_child_works(resource: collection1)
expect(child_works.map(&:id)).to match_array([work2.id, work1.id])
end
end

context 'on a work' do
let(:pcdm_object) { work1 }
let(:work1_resource) { resource }

before do
work1.members = [work2, work3, fileset1, fileset2]
work1.save!
work1.member_ids = [work2.id, work3.id, fileset1.id, fileset2.id]
Hyrax.persister.save(resource: work1)
end

it 'returns only child works as Valkyrie resources' do
child_works = custom_query_service.find_child_works(resource: work1_resource)
expect(child_works.map(&:id)).to match_valkyrie_ids_with_active_fedora_ids([work2.id, work3.id])
child_works = custom_query_service.find_child_works(resource: work1)
expect(child_works.map(&:id)).to match_array([work2.id, work3.id])
end
end
end

describe '#find_child_work_ids' do
context 'on a collection' do
let(:pcdm_object) { collection1 }
let(:collection1_resource) { resource }

before do
collection1.members = [collection2, collection3, work2, work1]
collection1.save!
collection1.member_ids = [collection2.id, collection3.id, work2.id, work1.id]
Hyrax.persister.save(resource: collection1)
end

it 'returns Valkyrie ids for child works only' do
child_work_ids = custom_query_service.find_child_work_ids(resource: collection1_resource)
expect(child_work_ids).to match_valkyrie_ids_with_active_fedora_ids([work2.id, work1.id])
child_work_ids = custom_query_service.find_child_work_ids(resource: collection1)
expect(child_work_ids).to match_array([work2.id, work1.id])
end
end

context 'on a work' do
let(:pcdm_object) { work1 }
let(:work1_resource) { resource }

before do
work1.members = [work2, work3, fileset1, fileset2]
work1.save!
work1.member_ids = [work2.id, work3.id, fileset1.id, fileset2.id]
Hyrax.persister.save(resource: work1)
end

it 'returns Valkyrie ids for child works only' do
child_work_ids = custom_query_service.find_child_work_ids(resource: work1_resource)
expect(child_work_ids).to match_valkyrie_ids_with_active_fedora_ids([work2.id, work3.id])
child_work_ids = custom_query_service.find_child_work_ids(resource: work1)
expect(child_work_ids).to match_array([work2.id, work3.id])
end
end
end
Expand Down
80 changes: 80 additions & 0 deletions spec/wings/services/custom_queries/navigators/child_works_navigator_spec.rb
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,80 @@
# frozen_string_literal: true
RSpec.describe Hyrax::CustomQueries::Navigators::ChildWorksNavigator, :active_fedora, :clean_repo do
subject(:factory) { Wings::ModelTransformer.new(pcdm_object: pcdm_object) }

let(:resource) { subject.build }
let(:custom_query_service) { Hyrax.custom_queries }

let(:collection1) { build(:collection, id: 'col1', title: ['Collection 1']) }
let(:collection2) { build(:collection, id: 'col2', title: ['Child Collection 1']) }
let(:collection3) { build(:collection, id: 'col3', title: ['Child Collection 2']) }
let(:work1) { build(:work, id: 'wk1', title: ['Work 1']) }
let(:work2) { build(:work, id: 'wk2', title: ['Child Work 1']) }
let(:work3) { build(:work, id: 'wk3', title: ['Child Work 2']) }
let(:fileset1) { build(:file_set, id: 'fs1', title: ['Child File Set 1']) }
let(:fileset2) { build(:file_set, id: 'fs2', title: ['Child File Set 2']) }

describe '#find_child_works' do
context 'on a collection' do
let(:pcdm_object) { collection1 }
let(:collection1_resource) { resource }

before do
collection1.members = [collection2, collection3, work2, work1]
collection1.save!
end

it 'returns only child works as Valkyrie resources' do
child_works = custom_query_service.find_child_works(resource: collection1_resource)
expect(child_works.map(&:id)).to match_valkyrie_ids_with_active_fedora_ids([work2.id, work1.id])
end
end

context 'on a work' do
let(:pcdm_object) { work1 }
let(:work1_resource) { resource }

before do
work1.members = [work2, work3, fileset1, fileset2]
work1.save!
end

it 'returns only child works as Valkyrie resources' do
child_works = custom_query_service.find_child_works(resource: work1_resource)
expect(child_works.map(&:id)).to match_valkyrie_ids_with_active_fedora_ids([work2.id, work3.id])
end
end
end

describe '#find_child_work_ids' do
context 'on a collection' do
let(:pcdm_object) { collection1 }
let(:collection1_resource) { resource }

before do
collection1.members = [collection2, collection3, work2, work1]
collection1.save!
end

it 'returns Valkyrie ids for child works only' do
child_work_ids = custom_query_service.find_child_work_ids(resource: collection1_resource)
expect(child_work_ids).to match_valkyrie_ids_with_active_fedora_ids([work2.id, work1.id])
end
end

context 'on a work' do
let(:pcdm_object) { work1 }
let(:work1_resource) { resource }

before do
work1.members = [work2, work3, fileset1, fileset2]
work1.save!
end

it 'returns Valkyrie ids for child works only' do
child_work_ids = custom_query_service.find_child_work_ids(resource: work1_resource)
expect(child_work_ids).to match_valkyrie_ids_with_active_fedora_ids([work2.id, work3.id])
end
end
end
end

0 comments on commit 81ece91

Please sign in to comment.