hydra-collections 1.0.0 → 1.1.0

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

@@ -1,6 +1,6 @@
 <%#= button_to label, ,  :class=>"btn btn-primary collection-remove", 'data-behavior'=>'hydra-collections-remove', members:"delete", batch_document_ids:[document.id] %>
 
-<%= form_for @collection, url:collections.collection_path(@collection.id), :method=>:put do |f| %>
+<%= form_for @collection, url:collections.collection_path(@collection.id), :method=>:put, as:'collection' do |f| %>
   <%= single_item_action_remove_form_fields(f,document) %>
   <%= f.submit label, :class => "btn btn-primary collection-remove" %>
 <% end %>

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

@@ -23,14 +23,10 @@
     <%= f.text_area :description %>
   </div>
   
-  <%- unless params[:batch_document_ids].nil? || params[:batch_document_ids].empty? %>
-    <%- params[:batch_document_ids].each do |batch_item| %>
-      <input type="hidden" name="batch_document_ids[]" value="<%= batch_item %>"/>
-    <%- end %>
-  <%- end %>
+  <%= hidden_collection_members %>
   
   <div class="actions">
     <%= f.submit %>
   </div>
 <% end %>
-</div>
+</div>

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

@@ -0,0 +1,21 @@
+<% if user_collections.nil?%>
+<b>  Make sure you have included Hydra::Collections::SelectsCollections in your controller for this page and 
+  added a before filter with one of the find_collections variations depending on your access level: find_collections, find_collections_with_read_access, find_collections_with_edit_access
+</b> 
+<% elsif user_collections.blank? %>
+<b> You do not have access to any existing collections please create a collection. </b>  
+<% else %>
+  Please Select your collection to add you files to:
+  <%= form_tag(collections.collection_path(@collection), :method => "put") do %>
+    <input type="hidden" name="test" value="val" />
+    <%= hash_as_hidden_fields({:collection =>{members:"move"}}) %>
+    <div class="collection-list">
+      <ul>
+      <% user_collections.each do |collection| %>
+        <li> <%= radio_button_tag(:destination_collection_id, collection.id, false, :class => "collection-selector") %><%= label_tag(:collection, collection.title) %> </li>
+      <% end %>
+      </ul>
+    </div>
+    <%= button_to "Move to Selected Collection", collections.collections_path, :method=>:put, :class=>"btn btn-primary collection-update submits-batches", 'data-behavior'=>'hydra-collections', :id=>'hydra-collection-move' %>
+  <% end %>
+<% end %>

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

@@ -3,4 +3,4 @@
   <%# action - collection action: add or remove %>
   <%# document - current document %>
   <%= form.hidden_field :members, :value => action %>
-  <%= hidden_field :batch_document_ids, '',{value:document.id, multiple:true} %>
+  <%= hidden_field :batch_document_ids, '', {value:document.id} %>

data/gemfiles/rails3.gemfile

@@ -0,0 +1,6 @@
+source 'https://rubygems.org'
+
+# Please see hydra-batch-edit.gemspec for dependency information.
+gemspec :path=>"../"
+
+gem 'rails', "~> 3.2"

data/gemfiles/rails4.gemfile

@@ -0,0 +1,6 @@
+source 'https://rubygems.org'
+
+# Please see hydra-batch-edit.gemspec for dependency information.
+gemspec :path=>"../"
+
+gem 'rails', '~> 4.0.0'

data/hydra-collections.gemspec

@@ -24,4 +24,5 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "bundler", "~> 1.3"
   spec.add_development_dependency "rake"
   spec.add_development_dependency "rspec-rails"
+  spec.add_development_dependency "sass-rails", "< 5", ">= 3.2"
 end

data/lib/hydra/collections/collectible.rb

@@ -6,7 +6,7 @@ module Hydra::Collections::Collectible
   
   included do
     #after_solrize << :index_collection_pids
-    has_many :collections, property: :has_collection_member
+    has_many :collections, property: :has_collection_member, :class_name => "ActiveFedora::Base"
   end
 
   # Add this method to your solrization logic (ie. in to_solr) in order to populate the 'collection' facet 

data/lib/hydra/collections/selects_collections.rb

@@ -17,7 +17,8 @@ module Hydra::Collections::SelectsCollections
   def find_collections_with_edit_access
     find_collections(:edit)
   end
-    
+  
+  # 
   def find_collections (access_level='')
     # need to know the user if there is an access level applied otherwise we are just doing public collections
     authenticate_user! unless access_level.blank?
@@ -26,13 +27,17 @@ module Hydra::Collections::SelectsCollections
     original_permissions = discovery_permissions 
     self.class.send(:define_method, "discovery_permissions")  { access_levels[access_level] } unless access_level.blank?
  
-    # add the collection filter to the solr logic for this query
-    orig_solr_search_params_logic = self.class.solr_search_params_logic
-    self.class.solr_search_params_logic += [:add_collection_filter]
+    # Blacklight doesn't let you explicitly pass your own solr_search_params_logic when running searches -- 
+    # You have to set the controller's solr_search_params_logic class attribute. So this method temporarily sets solr_search_params_logic to collection_search_params_logic then switches it back.
     
+    # temporarily set solr_search_params_logic to collection_search_params_logic
+    orig_solr_search_params_logic = self.class.solr_search_params_logic
+    # self.class.solr_search_params_logic += [:add_collection_filter]
+    self.class.solr_search_params_logic = collection_search_params_logic
+    logger.debug "Collection Search logic: "+ self.class.solr_search_params_logic.inspect
     # run the solr query to find the collections
     (resp, doc_list) = get_search_results(:q => '', :rows=>100)
-
+    
     #reset to original solr logic
     self.class.send(:define_method, "discovery_permissions")  { original_permissions } unless access_level.blank?
     self.class.solr_search_params_logic = orig_solr_search_params_logic
@@ -46,4 +51,11 @@ module Hydra::Collections::SelectsCollections
     solr_parameters[:fq] << "#{Solrizer.solr_name("has_model", :symbol)}:\"info:fedora/afmodel:Collection\""
   end
   
+  # Defines which solr_search_params_logic should be used when searching for Collections
+  def collection_search_params_logic
+    base_logic = [:default_solr_parameters, :add_query_to_solr, :add_access_controls_to_solr_params]
+    base_logic += [:add_collection_filter]
+    base_logic
+  end
+  
 end

data/lib/hydra/collections/version.rb

@@ -1,5 +1,5 @@
 module Hydra
   module Collections
-    VERSION = "1.0.0"
+    VERSION = "1.1.0"
   end
 end

data/lib/hydra/datastreams/collection_rdf_datastream.rb

@@ -67,12 +67,5 @@ module Hydra
       end
       map.related_url(:to => "seeAlso", :in => RDF::RDFS)
     end
-    begin
-      LocalAuthority.register_vocabulary(self, "subject", "lc_subjects")
-      LocalAuthority.register_vocabulary(self, "language", "lexvo_languages")
-      LocalAuthority.register_vocabulary(self, "tag", "lc_genres")
-    rescue
-      puts "tables for vocabularies missing"
-    end
   end
 end

data/lib/hydra-collections.rb

@@ -1,8 +1,21 @@
-require "hydra/collections"
-require "hydra/collections_controller_behavior"
-require "hydra/collection"
-require "bundler/setup"
-require "blacklight"
 require "hydra/head"
-require "active_fedora"
-require "hydra/collections/selects_collections"
+
+module Hydra
+  module Collections
+    extend ActiveSupport::Autoload
+    autoload :Version
+    autoload :Collectible
+    autoload :SearchService
+    autoload :AcceptsBatches
+    autoload :SelectsCollections
+    autoload :SolrDocumentBehavior
+    class Engine < ::Rails::Engine
+      engine_name "collections"
+      config.autoload_paths += %W(
+        #{config.root}/app/controllers/concerns
+        #{config.root}/app/models/concerns
+      )
+    end
+  end
+end
+

data/spec/controllers/accepts_batches_spec.rb

@@ -13,10 +13,10 @@ describe AcceptsBatchesController do
     end
     describe ":all" do
       before do
-        doc1 = stub(:id=>123)
-        doc2 = stub(:id=>456)
+        doc1 = double(:id=>123)
+        doc2 = double(:id=>456)
         Hydra::Collections::SearchService.any_instance.should_receive(:last_search_documents).and_return([doc1, doc2])
-        controller.stub(:current_user=>stub(:user_key=>'vanessa'))
+        controller.stub(current_user: double(user_key: 'vanessa'))
       end
       it "should add every document in the current resultset to the batch" do
         controller.params["batch_document_ids"] = "all"
@@ -69,4 +69,4 @@ describe AcceptsBatchesController do
 
 
   
-end
+end

data/spec/controllers/collections_controller_spec.rb

@@ -1,22 +1,9 @@
-# Copyright © 2012 The Pennsylvania State University
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
 require 'spec_helper'
 
 describe CollectionsController do
   before(:all) do
     @user = FactoryGirl.find_or_create(:user)
+#    CollectionsController.config.default_solr_params = {:qf => 'title_tesim'}
     class GenericFile < ActiveFedora::Base
       include Hydra::Collections::Collectible
 
@@ -88,7 +75,6 @@ describe CollectionsController do
       doc = asset_results["response"]["docs"].first
       doc["id"].should == @asset1.pid
       afterupdate = GenericFile.find(@asset1.pid)
-      puts doc
       doc[Solrizer.solr_name(:collection)].should == afterupdate.to_solr[Solrizer.solr_name(:collection)]
     end
     it "should add docs to collection if batch ids provided and add the collection id to the documents int he colledction" do
@@ -101,7 +87,6 @@ describe CollectionsController do
       doc = asset_results["response"]["docs"].first
       doc["id"].should == @asset1.pid
       afterupdate = GenericFile.find(@asset1.pid)
-      puts doc
       doc[Solrizer.solr_name(:collection)].should == afterupdate.to_solr[Solrizer.solr_name(:collection)]
     end
   end
@@ -152,26 +137,42 @@ describe CollectionsController do
       response.should redirect_to Hydra::Collections::Engine.routes.url_helpers.collection_path(@collection.id)
       assigns[:collection].members.sort! { |a,b| a.pid <=> b.pid }.should == [@asset2, @asset3, @asset1].sort! { |a,b| a.pid <=> b.pid }
     end
-    it "should set collection on members" do
-      @collection.members << @asset1
-      @collection.save
+    it "should set/un-set collection on members" do
+      # Add to collection (sets collection on members)
       put :update, id: @collection.id, collection: {members:"add"}, batch_document_ids:[@asset2, @asset3]
-      response.should redirect_to Hydra::Collections::Engine.routes.url_helpers.collection_path(@collection.id)
-      assigns[:collection].members.sort! { |a,b| a.pid <=> b.pid }.should == [@asset2, @asset3, @asset1].sort! { |a,b| a.pid <=> b.pid }
+      assigns[:collection].members.sort! { |a,b| a.pid <=> b.pid }.should == [@asset2, @asset3].sort! { |a,b| a.pid <=> b.pid }
+      ## Check that member lists collection in its solr doc
+      @asset2.reload
+      @asset2.to_solr[Solrizer.solr_name(:collection)].should == [@collection.pid]
+      ## Check that member was re-indexed with collection info
       asset_results = Blacklight.solr.get "select", params:{fq:["id:\"#{@asset2.pid}\""],fl:['id',Solrizer.solr_name(:collection)]}
-      asset_results["response"]["numFound"].should == 1
       doc = asset_results["response"]["docs"].first
       doc["id"].should == @asset2.pid
-      afterupdate = GenericFile.find(@asset2.pid)
-      doc[Solrizer.solr_name(:collection)].should == afterupdate.to_solr[Solrizer.solr_name(:collection)]
+      doc[Solrizer.solr_name(:collection)].should == [@collection.pid]
+  
+      # Remove from collection (un-sets collection on members)
       put :update, id: @collection.id, collection: {members:"remove"}, batch_document_ids:[@asset2]
+      assigns[:collection].members.should_not include(@asset2)
+      ## Check that member no longer lists collection in its solr doc
+      @asset2.reload
+      @asset2.to_solr[Solrizer.solr_name(:collection)].should == []
+      ## Check that member was re-indexed without collection info
       asset_results = Blacklight.solr.get "select", params:{fq:["id:\"#{@asset2.pid}\""],fl:['id',Solrizer.solr_name(:collection)]}
-      asset_results["response"]["numFound"].should == 1
       doc = asset_results["response"]["docs"].first
       doc["id"].should == @asset2.pid
-      afterupdate = GenericFile.find(@asset2.pid)
       doc[Solrizer.solr_name(:collection)].should be_nil
     end
+    
+    it "should allow moving members between collections" do
+      @collection.members = [@asset1, @asset2, @asset3]
+      @collection.save
+      @collection2 = Collection.new
+      @collection2.apply_depositor_metadata(@user.user_key)
+      @collection2.save
+      put :update, id: @collection.id, collection: {members:"move"}, destination_collection_id:@collection2.pid, batch_document_ids:[@asset2, @asset3]
+      ::Collection.find(@collection.pid).members.should == [@asset1]
+      ::Collection.find(@collection2.pid).members.should == [@asset2, @asset3]
+    end
 
   end
 
@@ -218,7 +219,7 @@ describe CollectionsController do
     end
   end
 
-  describe "#show" do
+  describe "with a number of assets #show" do
     before do
       @asset1 = GenericFile.create!(title: "First of the Assets")
       @asset2 = GenericFile.create!(title: "Second of the Assets")
@@ -249,6 +250,14 @@ describe CollectionsController do
       ids.should include @asset3.pid
       ids.should_not include @asset4.pid
     end
+
+    it "when the collection is empty it should show no assets" do
+      get :show, id: Collection.create(title: "Empty collection").id
+      assigns[:collection].title.should ==  "Empty collection"
+      assigns[:member_docs].should be_empty
+    end
+
+    # NOTE: This test depends on title_tesim being in the qf in solrconfig.xml
     it "should query the collections" do
       get :show, id: @collection.id, cq:"\"#{@asset1.title}\""
       assigns[:collection].title.should == @collection.title
@@ -257,6 +266,8 @@ describe CollectionsController do
       ids.should_not include @asset2.pid
       ids.should_not include @asset3.pid
     end
+
+    # NOTE: This test depends on title_tesim being in the qf in solrconfig.xml
     it "should query the collections and show only the collection assets" do
       @asset4 = GenericFile.create!(title: "#{@asset1.id} #{@asset1.title}")
       @asset5 = GenericFile.create!(title: "#{@asset1.title}")
@@ -269,6 +280,14 @@ describe CollectionsController do
       ids.should_not include @asset4.pid
       ids.should_not include @asset5.pid
     end
+
+    it "should query the collections with rows" do
+      get :show, id: @collection.id, rows:"2"
+      assigns[:collection].title.should == @collection.title
+      ids = assigns[:member_docs].map {|d| d.id}
+      ids.count.should == 2
+    end
+
   end
 
 end

data/spec/controllers/other_collections_controller_spec.rb

@@ -0,0 +1,74 @@
+require 'spec_helper'
+
+class OtherCollectionsController < ApplicationController
+  include Hydra::CollectionsControllerBehavior
+
+  def show
+    super
+    redirect_to root_path
+  end
+
+end
+
+class OtherCollection < ActiveFedora::Base
+  include Hydra::Collection
+  include Hydra::Collections::Collectible
+end
+class Member < ActiveFedora::Base
+  include Hydra::Collections::Collectible
+  attr_accessor :title
+
+end
+
+# make sure a collection by another name still assigns the @collection variable
+describe OtherCollectionsController do
+  before(:all) do
+    @user = FactoryGirl.find_or_create(:user)
+  end
+  after(:all) do
+    @user.destroy
+    Member.destroy_all
+    OtherCollection.destroy_all
+    Object.send(:remove_const, :Member)
+    Object.send(:remove_const, :OtherCollection)
+    Object.send(:remove_const, :OtherCollectionsController)
+
+  end
+  
+  before do
+    controller.stub(:has_access?).and_return(true)
+
+    @user = FactoryGirl.find_or_create(:user)
+    sign_in @user
+    User.any_instance.stub(:groups).and_return([])
+    controller.stub(:clear_session_user) ## Don't clear out the authenticated session
+  end
+
+  describe "#show" do
+    let(:asset1) {Member.create!(title: "First of the Assets")}
+    let(:asset2) {Member.create!(title: "Second of the Assets")}
+    let(:asset3) {Member.create!(title: "Third of the Assets")}
+    let(:collection) {OtherCollection.new}
+
+    before do
+      collection.title = "My collection"
+      collection.apply_depositor_metadata(@user.user_key)
+      collection.members = [asset1,asset2,asset3]
+      collection.save
+      controller.stub(:apply_gated_search)
+    end
+    after do
+      Rails.application.reload_routes!
+    end
+    it "should show the collections" do
+      routes.draw { resources :other_collections, except: :index }
+      get :show, id: collection.id
+      assigns[:collection].title.should == collection.title
+      ids = assigns[:member_docs].map {|d| d.id}
+      ids.should include asset1.pid
+      ids.should include asset2.pid
+      ids.should include asset3.pid
+    end
+  end
+
+end

data/spec/controllers/selects_collections_spec.rb

@@ -14,6 +14,17 @@ end
 
 describe SelectsCollectionsController do
 
+  describe "#find_collections" do
+    it "should override solr_search_params_logic to use collection_search_params_logic, then switch it back" do
+      # Looks like we can only test this indirectly b/c blacklight doesn't let you explicitly pass solr_search_params_logic when running searches -- you have to set the controller's solr_search_params_logic class attribute
+      original_solr_logic = subject.solr_search_params_logic
+      subject.collection_search_params_logic.should == [:default_solr_parameters, :add_query_to_solr, :add_access_controls_to_solr_params, :add_collection_filter]
+      subject.class.should_receive(:solr_search_params_logic=).with(subject.collection_search_params_logic)
+      subject.class.should_receive(:solr_search_params_logic=).with(original_solr_logic)
+      subject.find_collections
+    end
+  end
+  
   describe "Select Collections" do
     before (:all) do
       @user = FactoryGirl.find_or_create(:user)

data/spec/helpers/collections_helper_spec.rb

@@ -1,17 +1,3 @@
-# Copyright © 2013 The Pennsylvania State University
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
 require 'spec_helper'
 
 include Hydra::Collections::Engine.routes.url_helpers
@@ -19,32 +5,85 @@ include Hydra::Collections::Engine.routes.url_helpers
 describe CollectionsHelper do
   describe "button_for_create_collection" do
     it " should create a button to the collections new path" do
-      html = button_for_create_collection 
-      html.should have_selector("form[action='#{collections.new_collection_path}']")
-      html.should have_selector("input[type='submit']")
+      str = String.new(helper.button_for_create_collection)
+      doc = Nokogiri::HTML(str)
+      form = doc.xpath('//form').first
+      form.attr('action').should == "#{collections.new_collection_path}"
+      i = form.children.first.children.first
+      i.attr('type').should == 'submit'
     end
     it "should create a button with my text" do
-      html = button_for_create_collection "Create My Button"
-      html.should have_selector("input[value='Create My Button']")
+      str = String.new(helper.button_for_create_collection "Create My Button")
+      doc = Nokogiri::HTML(str)
+      form = doc.xpath('//form').first
+      form.attr('action').should == "#{collections.new_collection_path}"
+      i = form.children.first.children.first
+      i.attr('value').should == 'Create My Button'
     end
   end
-describe "button_for_delete_collection" do
-  before (:all) do
-    @collection = Collection.create title:"Test Public"
-  end
-  after (:all) do
-    @collection.delete
-  end
-  it " should create a button to the collections delete path" do
-    html = button_for_delete_collection @collection
-    html.should have_selector("form[action='#{collections.collection_path(@collection.pid)}']")
-    html.should have_selector("input[type='submit']")
-  end
-  it "should create a button with my text" do
-    html = button_for_delete_collection @collection,  "Delete My Button"
-    html.should have_selector("input[value='Delete My Button']")
+  describe "button_for_delete_collection" do
+    before (:all) do
+      @collection = Collection.create(title: "Test Public")
+    end
+    after (:all) do
+      @collection.delete
+    end
+    it " should create a button to the collections delete path" do
+      str = button_for_delete_collection @collection
+      doc = Nokogiri::HTML(str)
+      form = doc.xpath('//form').first
+      form.attr('action').should == "#{collections.collection_path(@collection.pid)}"
+      i = form.children.first.children[1]
+      i.attr('type').should == 'submit'
+    end
+    it "should create a button with my text" do
+      str = button_for_delete_collection @collection, "Delete My Button"
+      doc = Nokogiri::HTML(str)
+      form = doc.xpath('//form').first
+      form.attr('action').should == "#{collections.collection_path(@collection.pid)}"
+      i = form.children.first.children[1]
+      i.attr('value').should == "Delete My Button"
+    end
   end
-end
+  describe "button_for_remove_from_collection" do
+    let(:item) { double(id: 'changeme:123') } 
+    before do
+      @collection = Collection.create
+    end
+
+    it "should generate a form that can remove the item" do
+      str = button_for_remove_from_collection item
+      doc = Nokogiri::HTML(str)
+      form = doc.xpath('//form').first
+      form.attr('action').should == "#{collections.collection_path(@collection.pid)}"
+      form.css('input#collection_members[type="hidden"][value="remove"]').should_not be_empty
+      form.css('input[type="hidden"][name="batch_document_ids[]"][value="changeme:123"]').should_not be_empty
+    end
+
+    describe "for a collection of another name" do
+      before(:all) do
+        class OtherCollection < ActiveFedora::Base
+          include Hydra::Collection
+          include Hydra::Collections::Collectible
+        end
+
+        @collection = OtherCollection.create
+      end
+      after(:all) do
+        Object.send(:remove_const, :OtherCollection)
+      end
+
+      it "should generate a form that can remove the item" do
+        str = button_for_remove_from_collection item
+        doc = Nokogiri::HTML(str)
+        form = doc.xpath('//form').first
+        form.attr('action').should == "#{collections.collection_path(@collection.pid)}"
+        form.css('input#collection_members[type="hidden"][value="remove"]').should_not be_empty
+        form.css('input[type="hidden"][name="batch_document_ids[]"][value="changeme:123"]').should_not be_empty
+      end
+
+    end
+  end 
   describe "button_for_remove_selected_from_collection" do
     before (:all) do
       @collection = Collection.create title:"Test Public"
@@ -53,13 +92,32 @@ end
       @collection.delete
     end
     it " should create a button to the collections delete path" do
-      html = button_for_remove_selected_from_collection @collection
-      html.should have_selector("form[action='#{collections.collection_path(@collection.pid)}']")
-      html.should have_selector("input[type='submit']")
+      str = button_for_remove_selected_from_collection @collection
+      doc = Nokogiri::HTML(str)
+      form = doc.xpath('//form').first
+      form.attr('action').should == "#{collections.collection_path(@collection.pid)}"
+      i = form.children[2]
+      i.attr('value').should == "remove"
+      i.attr('name').should == "collection[members]"
     end
     it "should create a button with my text" do
-      html = button_for_remove_selected_from_collection @collection, "Remove My Button"
-      html.should have_selector("input[value='Remove My Button']")
+      str = button_for_remove_selected_from_collection @collection, "Remove My Button"
+      doc = Nokogiri::HTML(str)
+      form = doc.xpath('//form').first
+      form.attr('action').should == "#{collections.collection_path(@collection.pid)}"
+      i = form.children[3]
+      i.attr('value').should == "Remove My Button"
+    end
+  end
+
+  describe "hidden_collection_members" do
+    before { helper.params[:batch_document_ids] = ['foo:12', 'foo:23'] }
+    it "should make hidden fields" do
+      doc = Nokogiri::HTML(hidden_collection_members)
+      inputs = doc.xpath('//input[@type="hidden"][@name="batch_document_ids[]"]')
+      inputs.length.should == 2
+      inputs[0].attr('value').should == 'foo:12'
+      inputs[1].attr('value').should == 'foo:23'
     end
   end
 

data/spec/helpers/collections_search_helper_spec.rb

@@ -1,43 +1,14 @@
-# Copyright © 2013 The Pennsylvania State University
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
 require 'spec_helper'
 
 describe CollectionsSearchHelper do
-  before do
-    @collection = Collection.create(title: "Title of Collection 1")
-    class CollectionWithMetadata < ActiveFedora::Base
-      include Hydra::Collection
-      def to_solr(solr_doc={})
-        super
-        solr_doc[Solrizer.solr_name(:title, :displayable)] = self.descMetadata.title
-        solr_doc
-      end
-    end
-    @collection_with_metadata = CollectionWithMetadata.create(title: "Title of Collection 2")
-  end
   describe "collection_name" do
+    let (:collection_without_title) { Collection.create() }
+    let (:collection_with_title) { Collection.create(title: "Title of Collection 2") }
     it "should return the pid if no title available" do
-      collection_name(@collection.pid).should == @collection.pid
+      collection_name(collection_without_title.pid).should == collection_without_title.pid
     end
     it "should return the title value associated with the given pid" do
-      collection_name(@collection_with_metadata.pid).should == "Title of Collection 2"
-    end
-  end
-  describe "display_value_for_facet" do
-    it "should look up collection_name when displaying collection facet" do
-      display_value_for_facet(Solrizer.solr_name(:collection, :facetable), @collection_with_metadata.pid).should == "Title of Collection 2"
+      collection_name(collection_with_title.pid).should == "Title of Collection 2"
     end
   end
-end
+end