curation_concerns 0.10.0 → 0.11.0.rc1

data/lib/curation_concerns.rb

@@ -2,6 +2,7 @@ require 'curation_concerns/version'
 require 'curation_concerns/engine'
 require 'curation_concerns/configuration'
 require 'blacklight_advanced_search'
+require 'kaminari_route_prefix'
 
 module CurationConcerns
 end

data/lib/generators/curation_concerns/assets_generator.rb

@@ -0,0 +1,16 @@
+require 'rails/generators'
+
+module CurationConcerns
+  class Assets < Rails::Generators::Base
+    source_root File.expand_path('../templates', __FILE__)
+
+    def remove_blacklight_scss
+      remove_file 'app/assets/stylesheets/blacklight.css.scss'
+    end
+
+    def assets
+      copy_file 'curation_concerns.scss', 'app/assets/stylesheets/curation_concerns.scss'
+      copy_file 'curation_concerns.js', 'app/assets/javascripts/curation_concerns.js'
+    end
+  end
+end

data/lib/generators/curation_concerns/install_generator.rb

@@ -5,6 +5,8 @@ module CurationConcerns
     source_root File.expand_path('../templates', __FILE__)
 
     argument :model_name, type: :string, default: 'user'
+    class_option :'skip-assets', type: :boolean, default: false, desc: "Skip generating javascript and css assets into the application"
+
     desc 'This generator makes the following changes to your application:
    1. Runs installers for blacklight & hydra-head (which also install & configure devise)
    2. Runs curation_concerns:models:install
@@ -38,20 +40,12 @@ module CurationConcerns
                 "include CurationConcerns::ThemedLayoutController\n  with_themed_layout '1_column'\n"
     end
 
-    # def insert_builder
-    #   insert_into_file 'app/models/search_builder.rb', after: /include Blacklight::Solr::SearchBuilderBehavior/ do
-    #     # First line should be generated by Hydra. projecthydra/hydra-head#255
-    #     "\n  include Hydra::AccessControlsEnforcement" +
-    #     "\n  include CurationConcerns::SearchBuilder\n"
-    #   end
-    # end
-
-    def remove_blacklight_scss
-      remove_file 'app/assets/stylesheets/blacklight.css.scss'
+    def insert_builder
+      insert_into_file 'app/models/search_builder.rb', after: /include Hydra::AccessControlsEnforcement/ do
+        "\n  include CurationConcerns::SearchFilters\n"
+      end
     end
 
-    # END Blacklight stuff
-
     def inject_routes
       # Remove root route that was added by blacklight generator
       gsub_file 'config/routes.rb', /root (:to =>|to:) "catalog#index"/, ''
@@ -92,8 +86,7 @@ module CurationConcerns
     end
 
     def assets
-      copy_file 'curation_concerns.scss', 'app/assets/stylesheets/curation_concerns.scss'
-      copy_file 'curation_concerns.js', 'app/assets/javascripts/curation_concerns.js'
+      generate 'curation_concerns:assets' unless options[:'skip-assets']
     end
 
     def add_helper

data/lib/generators/curation_concerns/templates/catalog_controller.rb

@@ -1,12 +1,12 @@
 class CatalogController < ApplicationController
   include CurationConcerns::CatalogController
   configure_blacklight do |config|
-    config.search_builder_class = CurationConcerns::SearchBuilder
+    # config.search_builder_class = ::SearchBuilder
     ## Default parameters to send to solr for all search-like requests. See also SolrHelper#solr_search_params
     config.default_solr_params = {
-      qf: search_config['qf'],
-      qt: search_config['qt'],
-      rows: search_config['rows']
+      qf: %w(title_tesim name_tesim),
+      qt: 'search',
+      rows: 10
     }
 
     # solr field configuration for search results/index views

data/lib/generators/curation_concerns/work/templates/controller.rb.erb

@@ -3,5 +3,5 @@
 
 class CurationConcerns::<%= class_name.pluralize %>Controller < ApplicationController
   include CurationConcerns::CurationConcernController
-  set_curation_concern_type <%= class_name %>
+  self.curation_concern_type = <%= class_name %>
 end

data/lib/generators/curation_concerns/work/templates/feature_spec.rb.erb

@@ -0,0 +1,26 @@
+# Generated via
+#  `rails generate curation_concerns:work <%= class_name %>`
+require 'rails_helper'
+include Warden::Test::Helpers
+
+feature 'Create a <%= class_name %>' do
+  context 'a logged in user' do
+    let(:user_attributes) do
+      { <%= Devise.authentication_keys.first %>: 'test@example.com' }
+    end
+    let(:user) do
+      User.new(user_attributes) { |u| u.save(validate: false) }
+    end
+
+    before do
+      login_as user
+    end
+
+    scenario do
+      visit new_curation_concerns_<%= file_name %>_path
+      fill_in 'Title', with: 'Test <%= class_name %>'
+      click_button 'Create <%= class_name %>'
+      expect(page).to have_content 'Test <%= class_name %>'
+    end
+  end
+end

data/lib/generators/curation_concerns/work/work_generator.rb

@@ -45,6 +45,11 @@ class CurationConcerns::WorkGenerator < Rails::Generators::NamedBase
     template('form_spec.rb.erb', "spec/forms/curation_concerns/#{file_name}_form_spec.rb")
   end
 
+  def create_feature_spec
+    return unless rspec_installed?
+    template('feature_spec.rb.erb', "spec/features/create_#{file_name}_spec.rb")
+  end
+
   def create_controller
     template('controller.rb.erb', "app/controllers/curation_concerns/#{plural_file_name}_controller.rb")
   end

data/spec/actors/curation_concerns/file_actor_spec.rb

@@ -11,7 +11,7 @@ describe CurationConcerns::FileActor do
   describe '#ingest_file' do
     it 'calls ingest file job' do
       expect(CharacterizeJob).to receive(:perform_later)
-      expect(IngestFileJob).to receive(:perform_later).with(file_set.id, /world\.png$/, 'image/png', user.user_key, 'remastered')
+      expect(IngestFileJob).to receive(:perform_later).with(file_set, /world\.png$/, 'image/png', user.user_key, 'remastered')
       actor.ingest_file(uploaded_file)
     end
   end

data/spec/actors/curation_concerns/file_set_actor_spec.rb

@@ -22,7 +22,7 @@ describe CurationConcerns::FileSetActor do
 
     before do
       expect(CharacterizeJob).to receive(:perform_later)
-      expect(IngestFileJob).to receive(:perform_later).with(file_set.id, /world\.png$/, 'image/png', user.user_key, 'original_file')
+      expect(IngestFileJob).to receive(:perform_later).with(file_set, /world\.png$/, 'image/png', user.user_key, 'original_file')
       allow(actor).to receive(:acquire_lock_for).and_yield
       actor.create_metadata(work)
       actor.create_content(uploaded_file)
@@ -68,14 +68,14 @@ describe CurationConcerns::FileSetActor do
   describe '#create_content' do
     it 'calls ingest file job' do
       expect(CharacterizeJob).to receive(:perform_later)
-      expect(IngestFileJob).to receive(:perform_later).with(file_set.id, /world\.png$/, 'image/png', user.user_key, 'original_file')
+      expect(IngestFileJob).to receive(:perform_later).with(file_set, /world\.png$/, 'image/png', user.user_key, 'original_file')
       actor.create_content(uploaded_file)
     end
 
     context 'when an alternative relationship is specified' do
       it 'calls ingest file job' do
         expect(CharacterizeJob).to receive(:perform_later)
-        expect(IngestFileJob).to receive(:perform_later).with(file_set.id, /world\.png$/, 'image/png', user.user_key, 'remastered')
+        expect(IngestFileJob).to receive(:perform_later).with(file_set, /world\.png$/, 'image/png', user.user_key, 'remastered')
         actor.create_content(uploaded_file, 'remastered')
       end
     end
@@ -106,6 +106,7 @@ describe CurationConcerns::FileSetActor do
       before do
         allow(CharacterizeJob).to receive(:perform_later)
         allow(file_set).to receive(:label).and_return(short_name)
+        # TODO: we should allow/expect call to IngestJob
         actor.create_content(fixture_file_upload(file))
       end
 

data/spec/controllers/curation_concerns/file_sets_controller_spec.rb

@@ -71,6 +71,19 @@ describe CurationConcerns::FileSetsController do
           expect(response.body).to include('Error occurred while creating a FileSet.')
         end
       end
+
+      context 'when the file is not created' do
+        before do
+          allow(controller.send(:actor)).to receive(:create_metadata)
+          allow(controller.send(:actor)).to receive(:create_content).with(file).and_return(false)
+        end
+
+        it 'errors out of create after on continuous rsolr error' do
+          xhr :post, :create, parent_id: parent, file_set: { files: [file] },
+                              permission: { group: { 'public' => 'read' } }, terms_of_service: '1'
+          expect(response.body).to include('Error creating generic file image.png')
+        end
+      end
     end
 
     describe 'destroy' do
@@ -152,7 +165,7 @@ describe CurationConcerns::FileSetsController do
       context 'updating file content' do
         it 'is successful' do
           expect(IngestFileJob).to receive(:perform_later)
-          expect(CharacterizeJob).to receive(:perform_later).with(file_set.id, kind_of(String))
+          expect(CharacterizeJob).to receive(:perform_later).with(file_set, kind_of(String))
           post :update, id: file_set, file_set: { files: [file] }
           expect(response).to redirect_to main_app.curation_concerns_file_set_path(file_set)
         end

data/spec/controllers/curation_concerns/permissions_controller_spec.rb

@@ -17,7 +17,7 @@ describe CurationConcerns::PermissionsController do
     let(:generic_work) { create(:generic_work, user: user) }
 
     it 'adds a worker to the queue' do
-      expect(VisibilityCopyJob).to receive(:perform_later).with(generic_work.id)
+      expect(VisibilityCopyJob).to receive(:perform_later).with(generic_work)
       post :copy, id: generic_work
       expect(response).to redirect_to main_app.curation_concerns_generic_work_path(generic_work)
       expect(flash[:notice]).to eq 'Updating file permissions. This may take a few minutes. You may want to refresh your browser or return to this record later to see the updated file permissions.'

data/spec/features/add_file_spec.rb

@@ -1,6 +1,6 @@
 require 'spec_helper'
 
-describe 'Add an attached file' do
+feature 'Add an attached file' do
   let(:user) { create(:user) }
   let!(:work) { create(:work, user: user) }
 

data/spec/features/collection_spec.rb

@@ -1,17 +1,7 @@
 require 'spec_helper'
 include CurationConcerns::SearchPathsHelper
 
-describe 'collection' do
-  def create_collection(title, description)
-    click_link 'Add a Collection'
-    fill_in('Title', with: title)
-    fill_in('collection_description', with: description)
-    click_button('Create Collection')
-    expect(page).to have_content 'Items in this Collection'
-    expect(page).to have_content title
-    expect(page).to have_content description
-  end
-
+feature 'collection' do
   let(:title1) { 'Test Collection 1' }
   let(:description1) { 'Description for collection 1 we are testing.' }
   let(:title2) { 'Test Collection 2' }

data/spec/features/create_work_spec.rb

@@ -1,7 +1,7 @@
 require 'spec_helper'
 require 'redlock'
 
-describe 'Creating a new Work' do
+feature 'Creating a new Work' do
   let(:user) { FactoryGirl.create(:user) }
 
   let(:redlock_client_stub) { # stub out redis connection

data/spec/features/embargo_spec.rb

@@ -1,6 +1,6 @@
 require 'spec_helper'
 
-describe 'embargo' do
+feature 'embargo' do
   let(:user) { FactoryGirl.create(:user) }
   before do
     sign_in user

data/spec/features/lease_spec.rb

@@ -1,6 +1,6 @@
 require 'spec_helper'
 
-describe 'leases' do
+feature 'leases' do
   let(:user) { FactoryGirl.create(:user) }
   before do
     sign_in user

data/spec/features/update_file_spec.rb

@@ -1,6 +1,6 @@
 require 'spec_helper'
 
-describe 'Editing attached files' do
+feature 'Editing attached files' do
   let(:user) { create(:user) }
   let!(:parent) { create(:work_with_one_file, user: user) }
   let!(:file_set) { parent.file_sets.first }

data/spec/features/work_generator_spec.rb

@@ -2,7 +2,7 @@ require 'spec_helper'
 require 'rails/generators'
 require 'redlock'
 
-describe 'Creating a new Work' do
+feature 'Creating a new Work' do
   let(:user) { FactoryGirl.create(:user) }
 
   let(:redlock_client_stub) { # stub out redis connection

data/spec/forms/work_form_spec.rb

@@ -116,4 +116,9 @@ describe CurationConcerns::Forms::WorkForm do
     subject { form.lease_expiration_date }
     it { is_expected.to eq curation_concern.lease_expiration_date }
   end
+
+  describe ".required_fields" do
+    subject { described_class.required_fields }
+    it { is_expected.to eq [:title] }
+  end
 end

data/spec/helpers/curation_concerns/collections_helper_spec.rb

@@ -32,17 +32,31 @@ describe CurationConcerns::CollectionsHelper do
   end
 
   describe '#collection_options_for_select' do
+    let(:user) { create(:user) }
+    let(:collection2) { double(id: '02870w10j') }
+    let(:doc1) { { "id" => "k930bx31t", "title_tesim" => ["One"] } }
+    let(:doc2) { { "id" => "02870w10j", "title_tesim" => ["Two"] } }
+    let(:doc3) { { "id" => "z029p500w", "title_tesim" => ["Three"] } }
+
     before do
       allow(helper).to receive(:current_user).and_return(user)
+      allow(ActiveFedora::SolrService).to receive(:query)
+        .with("_query_:\"{!field f=has_model_ssim}Collection\"",
+              fl: 'title_tesim id', rows: 1000)
+        .and_return([doc1, doc2, doc3])
     end
-    let(:user) { create(:user) }
-    let!(:collection1) { create(:collection, user: user, title: ['One']) }
-    let!(:collection2) { create(:collection, user: user, title: ['Two']) }
-    let!(:collection3) { create(:collection, user: user, title: ['Three']) }
+
     subject { helper.collection_options_for_select(collection2) }
 
     it 'excludes the passed in collection' do
-      expect(subject).to eq "<option value=\"#{collection1.id}\">One</option>\n<option value=\"#{collection3.id}\">Three</option>"
+      expect(subject).to eq "<option value=\"#{doc1['id']}\">One</option>\n<option value=\"#{doc3['id']}\">Three</option>"
+    end
+
+    context "when one of the documents doesn't have title_tesim" do
+      let(:doc1) { { "id" => "k930bx31t" } }
+      it 'puts the collections without titles last' do
+        expect(subject).to eq "<option value=\"#{doc3['id']}\">Three</option>\n<option value=\"#{doc1['id']}\"></option>"
+      end
     end
   end
 end

data/spec/indexers/collection_indexer_spec.rb

@@ -13,7 +13,7 @@ describe CurationConcerns::CollectionIndexer do
 
     it "has required fields" do
       expect(subject.fetch('generic_type_sim')).to eq ["Collection"]
-      expect(subject.fetch('bytes_is')).to eq(1000)
+      expect(subject.fetch('bytes_lts')).to eq(1000)
       expect(subject.fetch('thumbnail_path_ss')).to eq "/downloads/1234?file=thumbnail"
     end
   end

data/spec/javascripts/save_manager_spec.coffee

@@ -43,6 +43,7 @@ describe "FileManager Save Button", ->
         expect($("button.disabled").length).toEqual(1)
   describe "#persist", ->
     it "is called by clicking the save button", ->
+      Blacklight.activate();
       spyOn(save_manager, "persist").and.callThrough()
       save_manager.push_changed(handler)
 

data/spec/jobs/audit_job_spec.rb

@@ -11,7 +11,7 @@ describe AuditJob do
   end
   let(:file_id) { file.original_file.id }
 
-  let(:job) { described_class.perform_now(file.id, file_id, uri) }
+  let(:job) { described_class.perform_now(file, file_id, uri) }
 
   describe 'audit on content' do
     let(:uri) { file.original_file.uri }
@@ -46,15 +46,11 @@ describe AuditJob do
     end
 
     let(:job) do
-      described_class.new.tap do |j|
-        j.id = file.id
-        j.file_id = file_id
-        j.uri = uri
-      end
+      described_class.new
     end
 
     it 'does not prune failed audits' do
-      5.times { job.send(:run_audit) }
+      5.times { job.send(:run_audit, file, file_id, uri) }
       expect(ChecksumAuditLog.logs_for(file.id, file_id).map(&:pass)).to eq [0, 1, 0, 0, 1, 0, 1]
     end
   end

data/spec/jobs/characterize_job_spec.rb

@@ -6,13 +6,13 @@ describe CharacterizeJob do
   let(:filename) { double }
 
   before do
-    allow(ActiveFedora::Base).to receive(:find).with(file_set_id).and_return(file_set)
+    allow(FileSet).to receive(:find).with(file_set_id).and_return(file_set)
   end
 
   it 'runs Hydra::Works::CharacterizationService and creates a CreateDerivativesJob' do
     expect(Hydra::Works::CharacterizationService).to receive(:run).with(file_set, filename)
-    expect(file_set).to receive(:save)
-    expect(CreateDerivativesJob).to receive(:perform_later).with(file_set_id, filename)
-    described_class.perform_now file_set_id, filename
+    expect(file_set).to receive(:save!)
+    expect(CreateDerivativesJob).to receive(:perform_later).with(file_set, filename)
+    described_class.perform_now file_set, filename
   end
 end

data/spec/jobs/create_derivatives_job_spec.rb

@@ -6,7 +6,7 @@ describe CurationConcerns::CreateDerivativesJob do
   before do
     @ffmpeg_enabled = CurationConcerns.config.enable_ffmpeg
     CurationConcerns.config.enable_ffmpeg = true
-    allow(ActiveFedora::Base).to receive(:find).with(id).and_return(file_set)
+    allow(FileSet).to receive(:find).with(id).and_return(file_set)
     allow(file_set).to receive(:mime_type).and_return('audio/x-wav')
     allow(file_set).to receive(:id).and_return(id)
   end
@@ -21,7 +21,7 @@ describe CurationConcerns::CreateDerivativesJob do
     it 'calls create_derivatives and save on a file set' do
       expect(Hydra::Derivatives::AudioDerivatives).to receive(:create)
       expect(file_set).to receive(:update_index)
-      CreateDerivativesJob.perform_now(id, 'spec/fixtures/piano_note.wav')
+      CreateDerivativesJob.perform_now(file_set, 'spec/fixtures/piano_note.wav')
     end
   end
 
@@ -37,7 +37,7 @@ describe CurationConcerns::CreateDerivativesJob do
 
       it 'updates the index of the parent object' do
         expect(parent).to receive(:update_index)
-        CreateDerivativesJob.perform_now(id, 'spec/fixtures/piano_note.wav')
+        CreateDerivativesJob.perform_now(file_set, 'spec/fixtures/piano_note.wav')
       end
     end
 
@@ -46,7 +46,7 @@ describe CurationConcerns::CreateDerivativesJob do
 
       it "doesn't update the parent's index" do
         expect(parent).to_not receive(:update_index)
-        CreateDerivativesJob.perform_now(id, 'spec/fixtures/piano_note.wav')
+        CreateDerivativesJob.perform_now(file_set, 'spec/fixtures/piano_note.wav')
       end
     end
   end

data/spec/jobs/import_url_job_spec.rb

@@ -7,13 +7,12 @@ describe ImportUrlJob do
   let(:file_hash) { '/673467823498723948237462429793840923582' }
 
   let(:file_set) do
-    FileSet.new(import_url: "http://example.org#{file_hash}", label: file_path) do |f|
+    FileSet.new(import_url: "http://example.org#{file_hash}",
+                label: file_path) do |f|
       f.apply_depositor_metadata(user.user_key)
     end
   end
 
-  let(:file_set_id) { 'abc123' }
-
   let(:mock_response) do
     double('response').tap do |http_res|
       allow(http_res).to receive(:start).and_yield
@@ -24,8 +23,9 @@ describe ImportUrlJob do
 
   context 'after running the job' do
     let(:actor) { double }
+
     before do
-      allow(ActiveFedora::Base).to receive(:find).with(file_set_id).and_return(file_set)
+      file_set.id = 'abc123'
       allow(file_set).to receive(:reload)
       allow(CurationConcerns::FileSetActor).to receive(:new).with(file_set, user).and_return(actor)
     end
@@ -33,7 +33,7 @@ describe ImportUrlJob do
     it 'creates the content' do
       expect_any_instance_of(Net::HTTP).to receive(:request_get).with(file_hash).and_yield(mock_response)
       expect(actor).to receive(:create_content).and_return(true)
-      described_class.perform_now(file_set_id)
+      described_class.perform_now(file_set)
     end
   end
 
@@ -57,7 +57,7 @@ describe ImportUrlJob do
       file_set.update(title: ['File One'])
 
       # run the import job
-      described_class.perform_now(file_set_id)
+      described_class.perform_now(file_set)
 
       # import job should not override the title set another process
       file = FileSet.find(file_set_id)

data/spec/jobs/ingest_file_job_spec.rb

@@ -20,14 +20,14 @@ describe IngestFileJob do
       Object.send(:remove_const, :FileSetWithExtras)
     end
     it 'uses the provided relationship' do
-      described_class.perform_now(file_set.id, filename, 'image/png', 'bob', 'remastered')
+      described_class.perform_now(file_set, filename, 'image/png', 'bob', 'remastered')
       expect(file_set.reload.remastered.mime_type).to eq 'image/png'
     end
   end
 
   context 'when given a mime_type' do
     it 'uses the provided mime_type' do
-      described_class.perform_now(file_set.id, filename, 'image/png', 'bob')
+      described_class.perform_now(file_set, filename, 'image/png', 'bob')
       expect(file_set.reload.original_file.mime_type).to eq 'image/png'
     end
   end
@@ -38,7 +38,7 @@ describe IngestFileJob do
       # The parameter versioning: false instructs the machinery in Hydra::Works NOT to do versioning. So it can be handled later on.
       allow(CurationConcerns::VersioningService).to receive(:create)
       expect(Hydra::Works::AddFileToFileSet).to receive(:call).with(file_set, instance_of(::File), :original_file, versioning: false)
-      described_class.perform_now(file_set.id, filename, nil, 'bob')
+      described_class.perform_now(file_set, filename, nil, 'bob')
     end
   end
 
@@ -49,8 +49,8 @@ describe IngestFileJob do
     let(:user2) { create(:user) }
 
     before do
-      described_class.perform_now(file_set.id, file1, 'image/png', user.user_key)
-      described_class.perform_now(file_set.id, file2, 'text/plain', user2.user_key)
+      described_class.perform_now(file_set, file1, 'image/png', user.user_key)
+      described_class.perform_now(file_set, file2, 'text/plain', user2.user_key)
     end
 
     it 'has two versions' do
@@ -72,7 +72,7 @@ describe IngestFileJob do
     subject { CurationConcerns.config.callback }
     it 'runs with file_set and user arguments' do
       expect(subject).to receive(:run).with(:after_create_content, file_set, user)
-      described_class.perform_now(file_set.id, filename, 'image/png', user.user_key)
+      described_class.perform_now(file_set, filename, 'image/png', user.user_key)
     end
   end
 end

data/spec/jobs/visibility_copy_job_spec.rb

@@ -10,7 +10,7 @@ describe VisibilityCopyJob do
 
       work.visibility = Hydra::AccessControls::AccessRight::VISIBILITY_TEXT_VALUE_PUBLIC
       work.save
-      described_class.perform_now(work.id)
+      described_class.perform_now(work)
       work.reload.file_sets.each do |file|
         expect(file.visibility).to eq 'open'
       end
@@ -27,7 +27,7 @@ describe VisibilityCopyJob do
     end
 
     before do
-      described_class.perform_now(work.id)
+      described_class.perform_now(work)
       work.reload
     end
     let(:file) { work.file_sets.first }
@@ -48,7 +48,7 @@ describe VisibilityCopyJob do
     end
 
     before do
-      described_class.perform_now(work.id)
+      described_class.perform_now(work)
       work.reload
     end
     let(:file) { work.file_sets.first }

data/spec/models/file_set_spec.rb

@@ -613,4 +613,10 @@ describe FileSet do
       end
     end
   end
+
+  describe "#to_global_id" do
+    let(:file_set) { described_class.new(id: '123') }
+    subject { file_set.to_global_id }
+    it { is_expected.to be_kind_of GlobalID }
+  end
 end

data/spec/models/generic_work_spec.rb

@@ -56,4 +56,10 @@ describe GenericWork do
       }.to change { FileSet.count }.by(-2)
     end
   end
+
+  describe "#to_global_id" do
+    let(:work) { described_class.new(id: '123') }
+    subject { work.to_global_id }
+    it { is_expected.to be_kind_of GlobalID }
+  end
 end

data/spec/presenters/curation_concerns/work_show_presenter_spec.rb

@@ -56,8 +56,31 @@ describe CurationConcerns::WorkShowPresenter do
 
     it "displays them in order" do
       expect(obj.ordered_member_ids).not_to eq obj.member_ids
+      expect(Deprecation).to receive(:warn)
       expect(presenter.file_presenters.map(&:id)).to eq obj.ordered_member_ids
     end
+  end
+
+  describe "#file_set_presenters" do
+    let(:obj) { create(:work_with_ordered_files) }
+    let(:attributes) { obj.to_solr }
+
+    it "displays them in order" do
+      expect(obj.ordered_member_ids).not_to eq obj.member_ids
+      expect(presenter.file_set_presenters.map(&:id)).to eq obj.ordered_member_ids
+    end
+
+    context "when some of the members are not file sets" do
+      let(:another_work) { create(:work) }
+      before do
+        obj.ordered_members << another_work
+        obj.save!
+      end
+
+      it "filters out members that are not file sets" do
+        expect(presenter.file_set_presenters.map(&:id)).not_to include another_work.id
+      end
+    end
 
     describe "getting presenters from factory" do
       let(:attributes) { {} }
@@ -65,12 +88,13 @@ describe CurationConcerns::WorkShowPresenter do
       before do
         allow(presenter).to receive(:file_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)
-        presenter.file_presenters
+        presenter.file_set_presenters
       end
     end
   end