curation_concerns 1.7.8 → 2.0.0.rc1

data/spec/features/collection_spec.rb

@@ -73,10 +73,15 @@ feature 'collection' do
 
   describe 'show collection' do
     let!(:collection) do
-      create(:collection, user: user, description: ['collection description'], members: [gw1, gw2])
+      create(:collection, user: user, description: ['collection description'])
     end
 
     before do
+      [gw1, gw2].each do |gw|
+        gw.member_of_collections = [collection]
+        gw.save
+      end
+
       sign_in user
       visit search_path_for_my_collections
     end
@@ -120,9 +125,14 @@ feature 'collection' do
 
   describe 'edit collection' do
     let!(:collection) do
-      create(:collection, user: user, description: ['collection description'], members: [gw1, gw2])
+      create(:collection, user: user, description: ['collection description'])
     end
     before do
+      [gw1, gw2].each do |gw|
+        gw.member_of_collections = [collection]
+        gw.save!
+      end
+
       sign_in user
       visit search_path_for_my_collections
     end
@@ -174,6 +184,8 @@ feature 'collection' do
       within("#document_#{gw1.id}") do
         click_link('Remove From Collection')
       end
+
+      visit collection_path collection.id
       expect(page).to have_content 'Test collection title'
       expect(page).to have_content 'collection description'
       expect(page).not_to have_content(gw1.title.first)
@@ -190,6 +202,8 @@ feature 'collection' do
       within("#document_#{gw1.id}") do
         click_link('Remove From Collection')
       end
+
+      visit collection_path collection.id
       expect(page).to have_content 'Test collection title'
       expect(page).to have_content 'collection description'
       expect(page).not_to have_content(gw1.title.first)
@@ -216,14 +230,15 @@ feature 'collection' do
   end
 
   describe 'show pages of a collection' do
-    let(:generic_works) do
-      (0..12).map { create(:generic_work, user: user) }
-    end
     let!(:collection) do
-      create(:collection, user: user, description: ['collection description'], members: generic_works)
+      create(:collection, user: user, description: ['collection description'])
     end
 
     before do
+      12.times do
+        create(:generic_work, user: user, member_of_collections: [collection])
+      end
+
       sign_in user
       visit search_path_for_my_collections
     end

data/spec/features/create_child_work_spec.rb

@@ -6,12 +6,12 @@ feature 'Creating a new child Work', :workflow do
   let!(:sipity_entity) do
     create(:sipity_entity, proxy_for_global_id: parent.to_global_id.to_s)
   end
-  let(:redlock_client_stub) do # stub out redis connection
+  let(:redlock_client_stub) { # stub out redis connection
     client = double('redlock client')
     allow(client).to receive(:lock).and_yield(true)
     allow(Redlock::Client).to receive(:new).and_return(client)
     client
-  end
+  }
   let!(:parent) { create(:generic_work, user: user, title: ["Parent First"]) }
 
   before do
@@ -64,19 +64,5 @@ feature 'Creating a new child Work', :workflow do
 
       expect(curation_concern.reload.in_works_ids.length).to eq 2
     end
-
-    context "with a parent that doesn't belong to this user" do
-      let(:new_user) { create(:user) }
-      let(:new_parent) { create(:generic_work, user: new_user) }
-      it "fails to update" do
-        visit "/concern/parent/#{parent.id}/generic_works/#{curation_concern.id}/edit"
-        first("input#generic_work_in_works_ids", visible: false).set new_parent.id
-        first("input#parent_id", visible: false).set new_parent.id
-        click_on "Update Generic work"
-
-        expect(new_parent.reload.ordered_members.to_a.length).to eq 0
-        expect(page).to have_content "Works can only be related to each other if user has ability to edit both."
-      end
-    end
   end
 end

data/spec/features/create_work_spec.rb

@@ -12,6 +12,9 @@ feature 'Creating a new Work', :workflow do
   }
 
   before do
+    col = Collection.new title: ['Test Collection']
+    col.apply_depositor_metadata user.user_key
+    col.save!
     sign_in user
 
     # stub out characterization. Travis doesn't have fits installed, and it's not relevant to the test.
@@ -29,6 +32,7 @@ feature 'Creating a new Work', :workflow do
       select 'Attribution 3.0 United States', from: 'generic_work[rights][]'
       attach_file('Upload a file', fixture_file_path('files/image.png'))
       choose('generic_work_visibility_open')
+      select 'Test Collection', from: 'generic_work[member_of_collection_ids][]'
       click_on('Create Generic work')
     end
 
@@ -40,19 +44,8 @@ feature 'Creating a new Work', :workflow do
       expect(page).to have_link 'image.png'
     end
 
-    title = 'Genealogies of the American West'
-    click_link 'Add a Collection'
-    fill_in('Title', with: title)
-    click_button('Create Collection')
-    click_on('Add files from your dashboard')
-    find('#facet-human_readable_type_sim').click_link('Generic Work')
-
-    # Works can be added to collections
-    within('.modal.fade', match: :first) do
-      select title, from: 'id'
-      click_on('Add to collection')
+    within '.member_of_collections' do
+      expect(page).to have_link 'Test Collection'
     end
-    expect(page).to have_content('Collection was successfully updated.')
-    expect(page).to have_content(work_title)
   end
 end

data/spec/features/work_generator_spec.rb

@@ -53,14 +53,5 @@ feature 'Creating a new Work', :workflow do
     title = 'Genealogies of the American West'
     click_link 'Add a Collection'
     fill_in('Title', with: title)
-    click_button('Create Collection')
-    click_on('Add files from your dashboard')
-    find('#facet-human_readable_type_sim').click_link('Catapult')
-    within('.modal.fade', match: :first) do
-      select title, from: 'id'
-      click_on('Add to collection')
-    end
-    expect(page).to have_content('Collection was successfully updated.')
-    expect(page).to have_content(catapult_title)
   end
 end

data/spec/forms/work_form_spec.rb

@@ -22,14 +22,6 @@ describe CurationConcerns::Forms::WorkForm do
   let(:ability) { nil }
   let(:form) { PirateShipForm.new(curation_concern, ability) }
 
-  describe "#version" do
-    before do
-      allow(curation_concern).to receive(:etag).and_return('123456')
-    end
-    subject { form.version }
-    it { is_expected.to eq '123456' }
-  end
-
   describe "#select_files" do
     let(:curation_concern) { create(:work_with_one_file) }
     let(:title) { curation_concern.file_sets.first.title.first }

data/spec/indexers/collection_indexer_spec.rb

@@ -3,10 +3,22 @@ require 'spec_helper'
 describe CurationConcerns::CollectionIndexer do
   let(:indexer) { described_class.new(collection) }
   let(:collection) { build(:collection) }
+  let(:col1id) { 'col1' }
+  let(:col2id) { 'col2' }
+  let(:col1title) { 'col1 title' }
+  let(:col2title) { 'col2 title' }
+  let(:col1) { double('collection') }
+  let(:col2) { double('collection') }
 
   describe "#generate_solr_document" do
     before do
       allow(collection).to receive(:bytes).and_return(1000)
+      allow(collection).to receive(:in_collections).and_return([col1, col2])
+      allow(col1).to receive(:id).and_return(col1id)
+      allow(col2).to receive(:id).and_return(col2id)
+      allow(col1).to receive(:first_title).and_return(col1title)
+      allow(col2).to receive(:first_title).and_return(col2title)
+
       allow(CurationConcerns::ThumbnailPathService).to receive(:call).and_return("/downloads/1234?file=thumbnail")
     end
     subject { indexer.generate_solr_document }
@@ -15,6 +27,8 @@ describe CurationConcerns::CollectionIndexer do
       expect(subject.fetch('generic_type_sim')).to eq ["Collection"]
       expect(subject.fetch('bytes_lts')).to eq(1000)
       expect(subject.fetch('thumbnail_path_ss')).to eq "/downloads/1234?file=thumbnail"
+      expect(subject.fetch('member_of_collection_ids_ssim')).to eq [col1id, col2id]
+      expect(subject.fetch('member_of_collections_ssim')).to eq [col1title, col2title]
     end
   end
 end

data/spec/models/collection_spec.rb

@@ -55,55 +55,19 @@ describe Collection, type: :model do
     end
   end
 
-  describe "#members" do
+  describe "#members_objects" do
+    before do
+      subject.save
+    end
     it "is empty by default" do
-      expect(subject.members).to be_empty
+      expect(subject.member_objects).to match_array []
     end
 
     context "adding members" do
-      context "using assignment" do
-        subject { described_class.create!(title: ['Some title'], members: [gf1, gf2]) { |c| c.apply_depositor_metadata(user) } }
-
-        it "has many files" do
-          expect(subject.reload.members).to match_array [gf1, gf2]
-        end
-      end
-
-      context "using append" do
-        before do
-          subject.members = [gf1]
-          subject.save
-        end
-        it "allows new files to be added" do
-          subject.reload
-          subject.members << gf2
-          subject.save
-          expect(subject.reload.members).to match_array [gf1, gf2]
-        end
-
-        it "allows multiple files to be added" do
-          subject.reload
-          subject.add_members [gf2.id, gf3.id]
-          subject.save
-          expect(subject.reload.members).to match_array [gf1, gf2, gf3]
-        end
-      end
-    end
-
-    context "removing members" do
-      before do
-        subject.members = [gf1, gf2]
-        subject.save!
-      end
-
-      it "allows files to be removed" do
-        # force the "in_collections" to be cached:
-        expect(gf1.in_collections).to eq [subject]
-
-        # We need to ensure that deleting causes the collection to be flushed.
-        subject.reload.members.delete(gf1)
+      it "allows multiple files to be added" do
+        subject.add_member_objects [gf1.id, gf2.id, gf3.id]
         subject.save
-        expect(subject.reload.members).to eq [gf2]
+        expect(subject.reload.member_objects).to match_array [gf1, gf2, gf3]
       end
     end
   end
@@ -150,16 +114,15 @@ describe Collection, type: :model do
     end
 
     let(:member) { Member.create }
-    let(:collection) { OtherCollection.new }
+    let(:collection) { OtherCollection.create }
 
     before do
-      collection.members << member
-      collection.save
+      collection.add_member_objects member.id
     end
 
     it "have members that know about the collection" do
       member.reload
-      expect(member.in_collections).to eq [collection]
+      expect(member.member_of_collections).to eq [collection]
     end
   end
 end

data/spec/models/curation_concerns/work_behavior_spec.rb

@@ -19,9 +19,9 @@ describe CurationConcerns::WorkBehavior do
   end
   describe '#to_s' do
     it 'uses the provided titles' do
-      # The title property would return the terms in random order, so stub the behavior:
-      allow(subject).to receive(:title).and_return(%w(Hello World))
-      expect(subject.to_s).to eq('Hello | World')
+      subject.title = %w(Hello World)
+      expect(subject.to_s).to include 'Hello'
+      expect(subject.to_s).to include 'World'
     end
   end
 

data/spec/models/file_set_spec.rb

@@ -448,8 +448,9 @@ describe FileSet do
   describe '#to_s' do
     it 'uses the provided titles' do
       # The title property would return the terms in random order, so stub the behavior:
-      allow(subject).to receive(:title).and_return(%w(Hello World))
-      expect(subject.to_s).to eq('Hello | World')
+      subject.title = %w(Hello World)
+      expect(subject.to_s).to include 'Hello'
+      expect(subject.to_s).to include 'World'
     end
 
     it 'falls back on label if no titles are given' do

data/spec/presenters/curation_concerns/work_show_presenter_spec.rb

@@ -81,16 +81,6 @@ describe CurationConcerns::WorkShowPresenter do
       expect(presenter.file_set_presenters.map(&:id)).to eq obj.ordered_member_ids
     end
 
-    context "solr query" do
-      before do
-        expect(ActiveFedora::SolrService).to receive(:query).twice.with(anything, hash_including(rows: 10_000)).and_return([])
-      end
-
-      it "requests >10 rows" do
-        presenter.file_set_presenters
-      end
-    end
-
     context "when some of the members are not file sets" do
       let(:another_work) { create(:work) }
       before do
@@ -102,34 +92,38 @@ describe CurationConcerns::WorkShowPresenter do
         expect(presenter.file_set_presenters.map(&:id)).not_to include another_work.id
       end
     end
+
+    describe "getting presenters from factory" do
+      let(:attributes) { {} }
+      let(:presenter_class) { double }
+      before do
+        allow(presenter).to receive(:composite_presenter_class).and_return(presenter_class)
+        allow(presenter).to receive(:ordered_ids).and_return(['12', '33'])
+        allow(presenter).to receive(:file_set_ids).and_return(['33', '12'])
+      end
+
+      it "uses the set class" do
+        expect(CurationConcerns::PresenterFactory).to receive(:build_presenters)
+          .with(['12', '33'], presenter_class, ability, request)
+        presenter.file_set_presenters
+      end
+    end
   end
 
   describe "#representative_presenter" do
     let(:obj) { create(:work_with_representative_file) }
     let(:attributes) { obj.to_solr }
+    let(:presenter_class) { double }
+    before do
+      allow(presenter).to receive(:composite_presenter_class).and_return(presenter_class)
+    end
     it "has a representative" do
       expect(CurationConcerns::PresenterFactory).to receive(:build_presenters)
-        .with([obj.members[0].id], CurationConcerns::CompositePresenterFactory, ability, request).and_return ["abc"]
+        .with([obj.members[0].id], presenter_class, ability, request).and_return ["abc"]
       expect(presenter.representative_presenter).to eq("abc")
     end
   end
 
-  describe "#collection_presenters" do
-    let(:collection) { create(:collection) }
-    let(:obj) { create(:work) }
-    let(:attributes) { obj.to_solr }
-
-    before do
-      collection.members << obj
-      collection.save!
-      obj.save!
-    end
-
-    it "filters out members that are not file sets" do
-      expect(presenter.collection_presenters.map(&:id)).to eq [collection.id]
-    end
-  end
-
   describe '#page_title' do
     subject { presenter.page_title }
     it { is_expected.to eq 'foo' }

data/spec/services/curation_concerns/workflow/grant_edit_to_depositor_spec.rb

@@ -2,6 +2,7 @@ require 'spec_helper'
 
 RSpec.describe CurationConcerns::Workflow::GrantEditToDepositor do
   let(:depositor) { create(:user) }
+  let(:work) { create(:work_without_access, depositor: depositor.user_key) }
   let(:user) { User.new }
 
   describe ".call" do
@@ -11,21 +12,9 @@ RSpec.describe CurationConcerns::Workflow::GrantEditToDepositor do
                            user: user)
     end
 
-    context "with no additional editors" do
-      let(:work) { create(:work_without_access, depositor: depositor.user_key) }
-      it "adds edit access" do
-        expect { subject }.to change { work.edit_users }.from([]).to([depositor.user_key])
-        expect(work).to be_valid
-      end
-    end
-
-    context "with an additional editor" do
-      let(:editor) { create(:user) }
-      let(:work) { create(:work_without_access, depositor: depositor.user_key, edit_users: [editor.user_key]) }
-      it "adds edit access" do
-        expect { subject }.to change { work.edit_users }.from([editor.user_key]).to([editor.user_key, depositor.user_key])
-        expect(work).to be_valid
-      end
+    it "adds edit access " do
+      expect { subject }.to change { work.edit_users }.from([]).to([depositor.user_key])
+      expect(work).to be_valid
     end
   end
 end

data/spec/services/curation_concerns/workflow/permission_query_spec.rb

@@ -165,18 +165,12 @@ module CurationConcerns
           subject { described_class.scope_processing_agents_for(user: nil) }
           it { is_expected.to eq([]) }
         end
-
         context 'when user is persisted' do
           let(:user) { create(:user) }
-          before do
-            allow(user).to receive(:groups).and_return(['librarians'])
-          end
-
           subject { described_class.scope_processing_agents_for(user: user) }
-
           it 'will equal [kind_of(Sipity::Agent)]' do
             is_expected.to contain_exactly(PowerConverter.convert_to_sipity_agent(user),
-                                           PowerConverter.convert_to_sipity_agent(Group.new('librarians')))
+                                           PowerConverter.convert_to_sipity_agent(Group.new('registered')))
           end
         end
       end