curation_concerns 1.5.0 → 1.6.0

data/app/models/concerns/curation_concerns/work_behavior.rb

@@ -37,7 +37,7 @@ module CurationConcerns::WorkBehavior
 
   def to_s
     if title.present?
-      Array.wrap(title).join(' | ')
+      title.join(' | ')
     else
       'No Title'
     end

data/app/presenters/curation_concerns/work_show_presenter.rb

@@ -38,7 +38,8 @@ module CurationConcerns
     # Metadata Methods
     delegate :title, :date_created, :date_modified, :date_uploaded, :description,
              :creator, :contributor, :subject, :publisher, :language, :embargo_release_date,
-             :lease_expiration_date, :rights, :source, :thumbnail_id, to: :solr_document
+             :lease_expiration_date, :rights, :source, :thumbnail_id, :representative_id,
+             to: :solr_document
 
     # @return [Array<FileSetPresenter>] presenters for the orderd_members that are FileSets
     def file_set_presenters

data/app/renderers/curation_concerns/renderers/external_link_attribute_renderer.rb

@@ -0,0 +1,13 @@
+module CurationConcerns
+  module Renderers
+    class ExternalLinkAttributeRenderer < AttributeRenderer
+      private
+
+        def li_value(value)
+          auto_link(value) do |link|
+            "<span class='glyphicon glyphicon-new-window'></span>&nbsp;#{link}"
+          end
+        end
+    end
+  end
+end

data/app/search_builders/curation_concerns/admin_set_search_builder.rb

@@ -5,9 +5,9 @@ module CurationConcerns
       super(context)
     end
 
-    # This overrides the filter_models in FilterByType
-    def filter_models(solr_parameters)
-      solr_parameters[:fq] << ActiveFedora::SolrQueryBuilder.construct_query_for_rel(has_model: ::AdminSet.to_class_uri)
+    # This overrides the models in FilterByType
+    def models
+      [::AdminSet]
     end
 
     # Overrides Hydra::AccessControlsEnforcement

data/app/search_builders/curation_concerns/collection_search_builder.rb

@@ -1,16 +1,18 @@
 module CurationConcerns
   class CollectionSearchBuilder < ::SearchBuilder
+    include FilterByType
     # Defines which search_params_logic should be used when searching for Collections
     self.default_processor_chain = [:default_solr_parameters, :add_query_to_solr,
-                                    :add_access_controls_to_solr_params, :add_collection_filter, :some_rows, :sort_by_title]
+                                    :add_access_controls_to_solr_params, :filter_models,
+                                    :some_rows, :sort_by_title]
 
     def some_rows(solr_parameters)
       solr_parameters[:rows] = '100'
     end
 
-    def add_collection_filter(solr_parameters)
-      solr_parameters[:fq] ||= []
-      solr_parameters[:fq] << ActiveFedora::SolrQueryBuilder.construct_query_for_rel(has_model: ::Collection.to_class_uri)
+    # This overrides FilterByType and ensures we only match on collections.
+    def only_collections?
+      true
     end
 
     # Sort results by title if no query was supplied.

data/app/search_builders/curation_concerns/file_set_search_builder.rb

@@ -2,9 +2,9 @@ module CurationConcerns
   class FileSetSearchBuilder < ::SearchBuilder
     include CurationConcerns::SingleResult
 
-    # This overrides the filter_models in FilterByType
-    def filter_models(solr_parameters)
-      solr_parameters[:fq] << ActiveFedora::SolrQueryBuilder.construct_query_for_rel(has_model: ::FileSet.to_class_uri)
+    # This overrides the models in FilterByType
+    def models
+      [::FileSet]
     end
   end
 end

data/app/search_builders/curation_concerns/filter_by_type.rb

@@ -9,7 +9,7 @@ module CurationConcerns
     # Add queries that excludes everything except for works and collections
     def filter_models(solr_parameters)
       solr_parameters[:fq] ||= []
-      solr_parameters[:fq] << '{!terms f=has_model_ssim}' + (work_clauses + collection_clauses).join(',')
+      solr_parameters[:fq] << "{!terms f=has_model_ssim}#{models_to_solr_clause}"
     end
 
     protected
@@ -22,8 +22,19 @@ module CurationConcerns
         generic_type_field.include?('Work')
       end
 
+      # Override this method if you want to filter for a different set of models.
+      # @return [Array<Class>] a list of classes to include
+      def models
+        work_classes + collection_classes
+      end
+
     private
 
+      def models_to_solr_clause
+        # to_class_uri is deprecated in AF 11
+        [ActiveFedora::Base.respond_to?(:to_rdf_representation) ? models.map(&:to_rdf_representation) : models.map(&:to_class_uri)].join(',')
+      end
+
       def generic_type_field
         Array.wrap(blacklight_params.fetch(:f, {}).fetch(:generic_type_sim, []))
       end
@@ -35,14 +46,15 @@ module CurationConcerns
         CurationConcerns.config.curation_concerns
       end
 
-      def work_clauses
+      def work_classes
         return [] if only_collections?
-        work_types.map(&:to_class_uri)
+        work_types
       end
 
-      def collection_clauses
+      def collection_classes
         return [] if only_works?
-        [::Collection.to_class_uri]
+        # to_class_uri is deprecated in AF 11
+        [::Collection]
       end
   end
 end

data/app/search_builders/curation_concerns/member_search_builder.rb

@@ -6,12 +6,16 @@ module CurationConcerns
     # Defines which search_params_logic should be used when searching for Collection members
     self.default_processor_chain += [:include_collection_ids]
 
-    delegate :collection, to: :scope
-
     # include filters into the query to only include the collection memebers
     def include_collection_ids(solr_parameters)
       solr_parameters[:fq] ||= []
-      solr_parameters[:fq] << "{!join from=#{from_field} to=id}id:#{collection.id}"
+      solr_parameters[:fq] << "{!join from=#{from_field} to=id}id:#{collection_id}"
     end
+
+    protected
+
+      def collection_id
+        blacklight_params.fetch('id')
+      end
   end
 end

data/app/search_builders/curation_concerns/single_result.rb

@@ -7,7 +7,7 @@ module CurationConcerns
     end
 
     def find_one(solr_parameters)
-      solr_parameters[:fq] << "_query_:\"{!field f=id}#{blacklight_params.fetch(:id)}\""
+      solr_parameters[:fq] << "{!raw f=id}#{blacklight_params.fetch(:id)}"
     end
   end
 end

data/app/services/curation_concerns/admin_set_service.rb

@@ -14,13 +14,11 @@ module CurationConcerns
       end
     end
 
-    private
-
-      # @param [Symbol] access :read or :edit
-      def search_results(access)
-        builder = AdminSetSearchBuilder.new(context, access)
-        response = context.repository.search(builder)
-        response.documents
-      end
+    # @param [Symbol] access :read or :edit
+    def search_results(access)
+      builder = AdminSetSearchBuilder.new(context, access)
+      response = context.repository.search(builder)
+      response.documents
+    end
   end
 end

data/app/services/curation_concerns/indexes_thumbnails.rb

@@ -20,7 +20,6 @@ module CurationConcerns
     # @params [Hash] solr_document the solr document to add the field to
     def index_thumbnails(solr_document)
       solr_document[thumbnail_field] = thumbnail_path
-      solr_document[Solrizer.solr_name('thumbnail_id', :symbol)] = object.thumbnail_id
     end
 
     # Returns the value for the thumbnail path to put into the solr document

data/app/services/curation_concerns/license_service.rb

@@ -4,5 +4,13 @@ module CurationConcerns
     def initialize
       super('licenses')
     end
+
+    def include_current_value(value, _index, render_options, html_options)
+      unless value.blank? || active?(value)
+        html_options[:class] << ' force-select'
+        render_options += [[label(value), value]]
+      end
+      [render_options, html_options]
+    end
   end
 end

data/app/services/curation_concerns/working_directory.rb

@@ -1,10 +1,12 @@
 module CurationConcerns
-  module WorkingDirectory
+  class WorkingDirectory
     class << self
       # @param [String] repository_file_id identifier for Hydra::PCDM::File
       # @param [String] id the identifier of the FileSet
+      # @param [String, NilClass] filepath path to existing cached copy of the file
       # @return [String] path of the working file
-      def find_or_retrieve(repository_file_id, id)
+      def find_or_retrieve(repository_file_id, id, filepath = nil)
+        return filepath if filepath && File.exist?(filepath)
         repository_file = Hydra::PCDM::File.find(repository_file_id)
         working_path = full_filename(id, repository_file.original_name)
         if File.exist?(working_path)

data/app/views/collections/_search_form.html.erb

@@ -1,7 +1,7 @@
   <%= form_for presenter, method: :get, class: "well form-search" do |f| %>
-      <label class="sr-only">Search Collection <%= presenter.title %></label>
+      <label class="sr-only"><%= t('curation_concerns.collections.search_form.label', title: presenter.to_s) %></label>
       <div class="input-group">
-        <%= text_field_tag :cq, params[:cq], class: "collection-query form-control", placeholder: "Search Collection", size: '30', type: "search", id: "collection_search" %>
+        <%= text_field_tag :cq, params[:cq], class: "collection-query form-control", placeholder: t('curation_concerns.collections.search_form.placeholder'), size: '30', type: "search", id: "collection_search" %>
         <div class="input-group-btn">
           <button type="submit" class="btn btn-primary" id="collection_submit"><i class="glyphicon glyphicon-search"></i> Go</button>
         </div>

data/app/views/curation_concerns/base/_file_manager_actions.html.erb

@@ -1,4 +1,5 @@
   <div class="actions form-horizontal panel panel-default">
     <%= button_tag "Save", class: "btn btn-primary disabled", data: { action: "save-actions" }%>
+    <%= button_tag "Sort alphabetically", class: "btn btn-primary", data: { action: "alpha-sort-action" }%>
   </div>
   <%= render "file_manager_resource_form" %>

data/app/views/curation_concerns/base/_file_manager_member_resource_options.html.erb

@@ -3,4 +3,8 @@
           <%= radio_button_tag "thumbnail_id", node.id, @presenter.thumbnail_id == node.id, id: "thumbnail_id_#{node.id}", class: "radio_buttons" %>
           <%= label_tag "thumbnail_id_#{node.id}", "Thumbnail" %>
         </span>
+        <span class="radio">
+          <%= radio_button_tag "representative_id", node.id, @presenter.representative_id == node.id, id: "representative_id_#{node.id}", class: "radio_buttons" %>
+          <%= label_tag "representative_id_#{node.id}", "Representative Media" %>
+        </span>
       </div>

data/app/views/curation_concerns/base/_file_manager_resource_form.html.erb

@@ -1,5 +1,6 @@
 <div class="resource-form-container">
   <%= simple_form_for [main_app, @presenter], remote: true, html: { id: 'resource-form', 'data-type': 'json' } do |f| %>
     <%= f.input :thumbnail_id, as: :hidden, input_html: { data: {member_link: 'thumbnail_id'}} %>
+    <%= f.input :representative_id, as: :hidden, input_html: { data: {member_link: 'representative_id'}} %>
   <% end %>
 </div>

data/app/views/curation_concerns/base/_form_rights.html.erb

@@ -9,10 +9,11 @@
         <a href="http://creativecommons.org/licenses/" target="_blank">Here's some help</a> if you don't know which license to choose.
       </p>
 
+      <% license_service = CurationConcerns::LicenseService.new %>
       <%= f.input :rights, as: :multi_value_select,
-        collection: CurationConcerns::LicenseService.new.select_active_options,
+        collection: license_service.select_active_options,
         include_blank: true,
-        item_helper: method(:include_current_value),
+        item_helper: license_service.method(:include_current_value),
         input_html: { class: 'form-control' } %>
     </fieldset>
   </div>

data/config/locales/curation_concerns.en.yml

@@ -6,6 +6,10 @@ en:
       index:
         type_tabs:
           all: All
+    collections:
+      search_form:
+        placeholder: "Search Collection"
+        label: "Search Collection %{title}"
     division:
       name: "Your Division at Institution"
       homepage_url: "#"

data/curation_concerns.gemspec

@@ -30,7 +30,7 @@ Gem::Specification.new do |spec|
   spec.add_dependency 'sprockets-es6'
   spec.add_dependency 'kaminari_route_prefix', '~> 0.0.1'
   spec.add_dependency 'active_attr'
-  spec.add_dependency 'hydra-works', '>= 0.12.0'
+  spec.add_dependency 'hydra-works', '>= 0.14.0'
   spec.add_dependency 'active_fedora-noid', '~> 2.0.0.beta1'
   spec.add_dependency 'qa', '~> 0.5'
   spec.add_dependency 'redlock', '~> 0.1.2'
@@ -41,12 +41,12 @@ Gem::Specification.new do |spec|
   spec.add_dependency 'browse-everything', '~> 0.10'
   spec.add_dependency 'clipboard-rails', '~> 1.5'
 
-  spec.add_development_dependency 'solr_wrapper', '~> 0.13', '>= 0.13.1'
+  spec.add_development_dependency 'solr_wrapper', '~> 0.16'
   spec.add_development_dependency 'fcrepo_wrapper', '~> 0.1'
   spec.add_development_dependency 'devise', '>= 3.0', '< 5'
   spec.add_development_dependency "bundler", "~> 1.6"
   spec.add_development_dependency "rake"
-  spec.add_development_dependency "engine_cart", "~> 0.9"
+  spec.add_development_dependency "engine_cart", "~> 1.0"
   spec.add_development_dependency "sqlite3"
   spec.add_development_dependency "rspec-its"
   spec.add_development_dependency "rspec-rails"

data/lib/curation_concerns/version.rb

@@ -1,3 +1,3 @@
 module CurationConcerns
-  VERSION = '1.5.0'.freeze
+  VERSION = '1.6.0'.freeze
 end

data/lib/generators/curation_concerns/models_generator.rb

@@ -38,14 +38,22 @@ This generator makes the following changes to your application:
 
   def create_collection
     copy_file 'app/models/collection.rb', 'app/models/collection.rb'
+    copy_file 'spec/models/collection_spec.rb', 'spec/models/collection_spec.rb' if rspec_installed?
   end
 
   def create_file_set
     copy_file 'app/models/file_set.rb', 'app/models/file_set.rb'
+    copy_file 'spec/models/file_set_spec.rb', 'spec/models/file_set_spec.rb' if rspec_installed?
   end
 
   # Adds clamav initializtion
   def clamav
     generate 'curation_concerns:clamav'
   end
+
+  private
+
+    def rspec_installed?
+      defined?(RSpec) && defined?(RSpec::Rails)
+    end
 end

data/lib/generators/curation_concerns/templates/spec/models/collection_spec.rb

@@ -0,0 +1,7 @@
+require 'rails_helper'
+
+describe Collection do
+  it "has tests" do
+    skip "Add your tests here"
+  end
+end

data/lib/generators/curation_concerns/templates/spec/models/file_set_spec.rb

@@ -0,0 +1,7 @@
+require 'rails_helper'
+
+describe FileSet do
+  it "has tests" do
+    skip "Add your tests here"
+  end
+end

data/spec/actors/curation_concerns/file_actor_spec.rb

@@ -9,11 +9,25 @@ describe CurationConcerns::Actors::FileActor do
   let(:relation) { create(:file_set) }
   let(:actor) { described_class.new(file_set, 'remastered', user) }
   let(:uploaded_file) { fixture_file_upload('/world.png', 'image/png') }
+  let(:ingest_options) { { mime_type: 'image/png', relation: 'remastered', filename: 'world.png' } }
+  let(:working_file) { CurationConcerns::WorkingDirectory.copy_file_to_working_directory(uploaded_file, file_set.id) }
 
   describe '#ingest_file' do
-    it 'calls ingest file job' do
-      expect(IngestFileJob).to receive(:perform_later).with(file_set, /world\.png$/, 'image/png', user, 'remastered')
-      actor.ingest_file(uploaded_file)
+    context "when the file is available locally" do
+      it 'calls ingest file job' do
+        expect(IngestFileJob).to receive(:perform_later).with(file_set, uploaded_file.path, user, ingest_options)
+        expect(CurationConcerns::WorkingDirectory).not_to receive(:copy_file_to_working_directory)
+        actor.ingest_file(uploaded_file)
+      end
+    end
+    context "when the file is not available locally" do
+      before do
+        allow(actor).to receive(:working_file).with(uploaded_file).and_return(working_file)
+      end
+      it 'calls ingest file job' do
+        expect(IngestFileJob).to receive(:perform_later).with(file_set, /world\.png$/, user, ingest_options)
+        actor.ingest_file(uploaded_file)
+      end
     end
   end
 

data/spec/actors/curation_concerns/file_set_actor_spec.rb

@@ -4,11 +4,12 @@ require 'redlock'
 describe CurationConcerns::Actors::FileSetActor do
   include ActionDispatch::TestProcess
 
-  let(:user)          { create(:user) }
-  let(:uploaded_file) { fixture_file_upload('/world.png', 'image/png') }
-  let(:local_file)    { File.open(File.join(fixture_path, 'world.png')) }
-  let(:file_set)      { create(:file_set, content: local_file) }
-  let(:actor)         { described_class.new(file_set, user) }
+  let(:user)           { create(:user) }
+  let(:uploaded_file)  { fixture_file_upload('/world.png', 'image/png') }
+  let(:local_file)     { File.open(File.join(fixture_path, 'world.png')) }
+  let(:file_set)       { create(:file_set, content: local_file) }
+  let(:actor)          { described_class.new(file_set, user) }
+  let(:ingest_options) { { mime_type: 'image/png', relation: 'original_file', filename: 'world.png' } }
 
   describe 'creating metadata and content' do
     let(:upload_set_id) { nil }
@@ -21,7 +22,7 @@ describe CurationConcerns::Actors::FileSetActor do
     end
 
     before do
-      expect(IngestFileJob).to receive(:perform_later).with(file_set, /world\.png$/, 'image/png', user, 'original_file')
+      expect(IngestFileJob).to receive(:perform_later).with(file_set, /world\.png/, user, ingest_options)
       allow(actor).to receive(:acquire_lock_for).and_yield
       actor.create_metadata(work)
       actor.create_content(uploaded_file)
@@ -66,13 +67,14 @@ describe CurationConcerns::Actors::FileSetActor do
 
   describe '#create_content' do
     it 'calls ingest file job' do
-      expect(IngestFileJob).to receive(:perform_later).with(file_set, /world\.png$/, 'image/png', user, 'original_file')
+      expect(IngestFileJob).to receive(:perform_later).with(file_set, /world\.png/, user, ingest_options)
       actor.create_content(uploaded_file)
     end
 
     context 'when an alternative relationship is specified' do
+      let(:ingest_options) { { mime_type: 'image/png', relation: 'remastered', filename: 'world.png' } }
       it 'calls ingest file job' do
-        expect(IngestFileJob).to receive(:perform_later).with(file_set, /world\.png$/, 'image/png', user, 'remastered')
+        expect(IngestFileJob).to receive(:perform_later).with(file_set, /world\.png/, user, ingest_options)
         actor.create_content(uploaded_file, 'remastered')
       end
     end
@@ -285,4 +287,28 @@ describe CurationConcerns::Actors::FileSetActor do
       end
     end
   end
+
+  describe '#revert_content' do
+    let(:file_set) { create(:file_set, user: user) }
+    let(:file1)    { "small_file.txt" }
+    let(:file2)    { "curation_concerns_generic_stub.txt" }
+    let(:version1) { "version1" }
+
+    before do
+      original_adapter = ActiveJob::Base.queue_adapter
+      ActiveJob::Base.queue_adapter = :inline
+      allow(CharacterizeJob).to receive(:perform_later)
+      actor.create_content(fixture_file_upload(file1))
+      actor.create_content(fixture_file_upload(file2))
+      ActiveJob::Base.queue_adapter = original_adapter
+      actor.file_set.reload
+    end
+
+    let(:restored_content) { file_set.reload.original_file }
+
+    it "restores the first versions's content and metadata" do
+      actor.revert_content(version1)
+      expect(restored_content.original_name).to eq file1
+    end
+  end
 end

data/spec/controllers/curation_concerns/collections_controller_spec.rb

@@ -76,10 +76,9 @@ describe CollectionsController do
   end
 
   describe '#index' do
-    before { sign_in user }
-    let!(:collection1) { create(:collection, title: ['Beta'], user: user) }
-    let!(:collection2) { create(:collection, title: ['Alpha'], user: user) }
-    let!(:generic_work) { create(:generic_work, user: user) }
+    let!(:collection1) { create(:collection, :public, title: ['Beta']) }
+    let!(:collection2) { create(:collection, :public, title: ['Alpha']) }
+    let!(:generic_work) { create(:generic_work, :public) }
 
     it 'shows a list of collections sorted alphabetically' do
       get :index

data/spec/controllers/selects_collections_controller_spec.rb

@@ -3,13 +3,18 @@ require "spec_helper"
 class SelectsCollectionsController < ApplicationController
   include Blacklight::Catalog
   include Hydra::Controller::ControllerBehavior
-  include CurationConcerns::SelectsCollections
+  Deprecation.silence CurationConcerns::SelectsCollections do
+    include CurationConcerns::SelectsCollections
+  end
 end
 
 describe SelectsCollectionsController, type: :controller do
   describe "#find_collections" do
     it "uses the search builder" do
-      expect(subject.collections_search_builder_class.default_processor_chain).to eq [:default_solr_parameters, :add_query_to_solr, :add_access_controls_to_solr_params, :add_collection_filter, :some_rows, :sort_by_title]
+      expect(subject.collections_search_builder_class.default_processor_chain).to eq [
+        :default_solr_parameters, :add_query_to_solr,
+        :add_access_controls_to_solr_params, :filter_models,
+        :some_rows, :sort_by_title]
       expect(CurationConcerns::CollectionSearchBuilder).to receive(:new).with(subject).and_call_original
       subject.find_collections
     end

data/spec/factories/generic_works.rb

@@ -13,7 +13,9 @@ FactoryGirl.define do
       work.apply_depositor_metadata(evaluator.user.user_key)
     end
 
-    factory :public_generic_work do
+    factory :public_generic_work, traits: [:public]
+
+    trait :public do
       visibility Hydra::AccessControls::AccessRight::VISIBILITY_TEXT_VALUE_PUBLIC
     end
 

data/spec/features/collection_spec.rb

@@ -86,6 +86,7 @@ feature 'collection' do
       within('#document_' + collection.id) do
         click_link('collection title')
       end
+      expect(page).to have_selector '.sr-only', text: 'Search Collection Test collection title', visible: false
       expect(page).to have_content 'Test collection title'
       expect(page).to have_content 'collection description'
       # Should have search results / contents listing
@@ -165,6 +166,7 @@ feature 'collection' do
       within("#document_#{collection.id}") do
         click_link('Edit Collection')
       end
+
       expect(page).to have_field 'collection_title', with: 'Test collection title'
       expect(page).to have_field 'collection_description', with: 'collection description'
       expect(page).to have_content(gw1.title.first)

data/spec/helpers/curation_concerns/collections_helper_spec.rb

@@ -40,9 +40,8 @@ describe CurationConcerns::CollectionsHelper do
 
     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)
+      allow(Collection).to receive(:search_with_conditions)
+        .with({}, fl: 'title_tesim id', rows: 1000)
         .and_return([doc1, doc2, doc3])
     end
 
@@ -59,4 +58,89 @@ describe CurationConcerns::CollectionsHelper do
       end
     end
   end
+
+  describe "has_collection_search_parameters?" do
+    subject { helper }
+
+    context "when cq is set" do
+      before { allow(helper).to receive(:params).and_return(cq: 'foo') }
+      it { is_expected.to have_collection_search_parameters }
+    end
+
+    context "when cq is not set" do
+      before { allow(helper).to receive(:params).and_return(cq: '') }
+      it { is_expected.not_to have_collection_search_parameters }
+    end
+  end
+
+  describe "button_for_remove_from_collection" do
+    let(:item) { double(id: 'changeme:123') }
+    let(:collection) { FactoryGirl.create(:collection) }
+
+    it "generates a form that can remove the item" do
+      str = button_for_remove_from_collection collection, item
+      doc = Nokogiri::HTML(str)
+      form = doc.xpath('//form').first
+      expect(form.attr('action')).to eq collection_path(collection)
+      expect(form.css('input#collection_members[type="hidden"][value="remove"]')).not_to be_empty
+      expect(form.css('input[type="hidden"][name="batch_document_ids[]"][value="changeme:123"]')).not_to be_empty
+    end
+
+    describe "for a collection of another name" do
+      before(:all) do
+        class OtherCollection < ActiveFedora::Base
+          include CurationConcerns::Collection
+          include Hydra::Works::WorkBehavior
+        end
+      end
+
+      let!(:collection) { OtherCollection.create! }
+
+      after(:all) do
+        Object.send(:remove_const, :OtherCollection)
+      end
+
+      it "generates a form that can remove the item" do
+        str = button_for_remove_from_collection collection, item
+        doc = Nokogiri::HTML(str)
+        form = doc.xpath('//form').first
+        expect(form.attr('action')).to eq collection_path(collection)
+        expect(form.css('input#collection_members[type="hidden"][value="remove"]')).not_to be_empty
+        expect(form.css('input[type="hidden"][name="batch_document_ids[]"][value="changeme:123"]')).not_to be_empty
+      end
+    end
+  end
+
+  describe "button_for_remove_selected_from_collection" do
+    let(:collection) { FactoryGirl.create(:collection) }
+
+    it "creates a button to the collections delete path" do
+      str = button_for_remove_selected_from_collection collection
+      doc = Nokogiri::HTML(str)
+      form = doc.xpath('//form').first
+      expect(form.attr('action')).to eq collection_path(collection)
+      i = form.xpath('.//input')[2]
+      expect(i.attr('value')).to eq("remove")
+      expect(i.attr('name')).to eq("collection[members]")
+    end
+
+    it "creates a button with my text" do
+      str = button_for_remove_selected_from_collection collection, "Remove My Button"
+      doc = Nokogiri::HTML(str)
+      form = doc.css('form').first
+      expect(form.attr('action')).to eq collection_path(collection)
+      expect(form.css('input[type="submit"]').attr('value').value).to eq "Remove My Button"
+    end
+  end
+
+  describe "hidden_collection_members" do
+    before { helper.params[:batch_document_ids] = ['foo:12', 'foo:23'] }
+    it "makes hidden fields" do
+      doc = Nokogiri::HTML(hidden_collection_members)
+      inputs = doc.xpath('//input[@type="hidden"][@name="batch_document_ids[]"]')
+      expect(inputs.length).to eq(2)
+      expect(inputs[0].attr('value')).to eq('foo:12')
+      expect(inputs[1].attr('value')).to eq('foo:23')
+    end
+  end
 end