hydra-collections 3.0.0.beta2 → 3.0.0.beta3

data/{app/controllers/concerns → lib}/hydra/collections/selects_collections.rb

@@ -1,8 +1,12 @@
+require 'blacklight/catalog'
+
 module Hydra::Collections::SelectsCollections
+
+  extend ActiveSupport::Autoload
   extend ActiveSupport::Concern
  
   def access_levels
-    { read: [:read, :edit], edit: [:edit] }
+    {read:[:read,:edit],edit:[:edit]}
   end 
 
   # add one of the following methods as a before filter on any page that shows the form_for_select_collection
@@ -28,10 +32,11 @@ module Hydra::Collections::SelectsCollections
     
     # 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})
+    (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?
@@ -43,7 +48,7 @@ module Hydra::Collections::SelectsCollections
       
   def add_collection_filter(solr_parameters, user_parameters)
     solr_parameters[:fq] ||= []
-    solr_parameters[:fq] << "#{Solrizer.solr_name("has_model", :symbol)}:Collection"
+    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

data/lib/hydra/collections/solr_document_behavior.rb

@@ -1,3 +1,18 @@
+# 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.
+
+# -*- encoding : utf-8 -*-
 module Hydra
   module Collections
     module SolrDocumentBehavior

data/lib/hydra/collections/version.rb

@@ -1,5 +1,5 @@
 module Hydra
   module Collections
-    VERSION = "3.0.0.beta2"
+    VERSION = "3.0.0.beta3"
   end
 end

data/spec/controllers/catalog_controller_spec.rb

@@ -1,26 +1,40 @@
+# 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'
 
 include Rails.application.routes.url_helpers
 
 describe CatalogController, :type => :controller do
-
   before do
     allow(controller).to receive(:has_access?).and_return(true)
     @user = FactoryGirl.find_or_create(:user)
-    @collection = Collection.new title: "Test"
+    @collection = Collection.new title:"Test"
     @collection.apply_depositor_metadata(@user.user_key)
     @collection.read_groups = ["public"]
-    @collection.save!
+    @collection.save
   end
 
   after do
-    @collection.destroy
+    @user.delete
+    @collection.delete
   end
   
-  routes { Rails.application.routes }
   
   describe '#index' do
     it 'should assign @user_collections' do
+      @routes = Rails.application.routes
       get :index
       expect(assigns(:user_collections)).to be_kind_of(Array)
       expect(assigns(:user_collections).index{|d| d.id == @collection.id}).not_to be_nil

data/spec/controllers/collections_controller_spec.rb

@@ -1,42 +1,33 @@
 require 'spec_helper'
 
 describe CollectionsController, :type => :controller do
-  let(:collections) { Hydra::Collections::Engine.routes.url_helpers }
-
   before(:all) do
     CollectionsController.configure_blacklight do |config|
       config.default_solr_params = {:qf => 'label_tesim'}
     end
 
+    @user = FactoryGirl.find_or_create(:user)
+
     class GenericFile < ActiveFedora::Base
       include Hydra::Collections::Collectible
 
-      property :title, predicate: ::RDF::DC.title
-
-      # Hack until https://github.com/no-reply/ActiveTriples/pull/37 is merged
-      def title_with_first
-        title_without_first.first
-      end
-      alias_method_chain :title, :first
-
-      # use this until https://github.com/projecthydra/active_fedora/issues/457 is resolved
-      def to_param
-        id
-      end
 
+      attr_accessor :title
       def to_solr(solr_doc={})
-        super.tap do |solr_doc|
-          solr_doc = index_collection_ids(solr_doc)
-          solr_doc["label_tesim"] = self.title
-        end
+        super
+        solr_doc = index_collection_pids(solr_doc)
+        solr_doc["label_tesim"] = self.title
+        solr_doc
       end
     end
   end
-
   after(:all) do
+    @user.destroy
+    GenericFile.destroy_all
+    Collection.destroy_all
     Object.send(:remove_const, :GenericFile)
   end
-
+  
   before do
     allow(controller).to receive(:has_access?).and_return(true)
 
@@ -51,17 +42,22 @@ describe CollectionsController, :type => :controller do
       get :new
       expect(assigns(:collection)).to be_kind_of(Collection)
     end
+    it "should pass through batch ids if provided and stick them in the form" do
+      skip "Couldn't get have_selector working before I had to move on.  - MZ"
+      get :new, batch_document_ids: ["test2", "test88"]
+      expect(response).to have_selector("p[class='foo']")
+    end
   end
-
+  
   describe '#create' do
     it "should create a Collection" do
-      expect {
-        post :create, collection: {title: "My First Collection ", description: "The Description\r\n\r\nand more"}
-      }.to change { Collection.count }.by(1)
+      old_count = Collection.count
+      post :create, collection: {title: "My First Collection ", description: "The Description\r\n\r\nand more"}
+      expect(Collection.count).to eq(old_count+1)
       expect(assigns[:collection].title).to eq("My First Collection ")
       expect(assigns[:collection].description).to eq("The Description\r\n\r\nand more")
       expect(assigns[:collection].depositor).to eq(@user.user_key)
-      expect(response).to redirect_to collections.collection_path(assigns[:collection])
+      expect(response).to redirect_to Hydra::Collections::Engine.routes.url_helpers.collection_path(assigns[:collection].id)
     end
     it "should add docs to collection if batch ids provided" do
       @asset1 = ActiveFedora::Base.create!
@@ -77,12 +73,12 @@ describe CollectionsController, :type => :controller do
     it "should add one doc to collection if batch ids provided and add the collection id to the document in the colledction" do
       @asset1 = GenericFile.create!
       post :create, batch_document_ids: [@asset1], collection: {title: "My Secong Collection ", description: "The Description\r\n\r\nand more"}
-      expect(assigns[:collection].members).to eq [@asset1]
-      asset_results = blacklight_solr.get "select", params:{fq:["id:\"#{@asset1.id}\""],fl:['id',Solrizer.solr_name(:collection)]}
+      expect(assigns[:collection].members).to eq([@asset1])
+      asset_results = blacklight_solr.get "select", params:{fq:["id:\"#{@asset1.pid}\""],fl:['id',Solrizer.solr_name(:collection)]}
       expect(asset_results["response"]["numFound"]).to eq(1)
       doc = asset_results["response"]["docs"].first
-      expect(doc["id"]).to eq(@asset1.id)
-      afterupdate = GenericFile.find(@asset1.id)
+      expect(doc["id"]).to eq(@asset1.pid)
+      afterupdate = GenericFile.find(@asset1.pid)
       expect(doc[Solrizer.solr_name(:collection)]).to eq(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
@@ -90,11 +86,11 @@ describe CollectionsController, :type => :controller do
       @asset2 = GenericFile.create!
       post :create, batch_document_ids: [@asset1,@asset2], collection: {title: "My Secong Collection ", description: "The Description\r\n\r\nand more"}
       expect(assigns[:collection].members).to eq([@asset1,@asset2])
-      asset_results = blacklight_solr.get "select", params:{fq:["id:\"#{@asset1.id}\""],fl:['id',Solrizer.solr_name(:collection)]}
+      asset_results = blacklight_solr.get "select", params:{fq:["id:\"#{@asset1.pid}\""],fl:['id',Solrizer.solr_name(:collection)]}
       expect(asset_results["response"]["numFound"]).to eq(1)
       doc = asset_results["response"]["docs"].first
-      expect(doc["id"]).to eq(@asset1.id)
-      afterupdate = GenericFile.find(@asset1.id)
+      expect(doc["id"]).to eq(@asset1.pid)
+      afterupdate = GenericFile.find(@asset1.pid)
       expect(doc[Solrizer.solr_name(:collection)]).to eq(afterupdate.to_solr[Solrizer.solr_name(:collection)])
     end
   end
@@ -110,91 +106,86 @@ describe CollectionsController, :type => :controller do
       allow(controller).to receive(:authorize!).and_return(true)
       expect(controller).to receive(:authorize!).at_least(:once)
     end
-
     it "should update collection metadata" do
-      put :update, id: @collection.id, collection: { title: "New Title", description: "New Description" }
-      expect(response).to redirect_to collections.collection_path(@collection)
+      put :update, id: @collection.id, collection: {title: "New Title", description: "New Description"}
+      expect(response).to redirect_to Hydra::Collections::Engine.routes.url_helpers.collection_path(@collection.id)
       expect(assigns[:collection].title).to eq("New Title")
       expect(assigns[:collection].description).to eq("New Description")
     end
 
     it "should call after_update" do
        expect(controller).to receive(:after_update).and_call_original
-       put :update, id: @collection.id, collection: { title: "New Title", description: "New Description" }
+       put :update, id: @collection.id, collection: {title: "New Title", description: "New Description"}
     end
-
-    context "when there are existing members in the collection" do
-      it "should support adding batches of members" do
-        @collection.members << @asset1
-        @collection.save
-        put :update, id: @collection.id, collection: { members:"add" }, batch_document_ids: [@asset2, @asset3]
-        expect(response).to redirect_to collections.collection_path(@collection)
-        expect(assigns[:collection].members).to match_array [@asset2, @asset3, @asset1]
-      end
-
-      it "should support removing batches of members" do
-        @collection.members = [@asset1, @asset2, @asset3]
-        @collection.save
-        put :update, id: @collection.id, collection: { members: "remove" }, batch_document_ids: [@asset1, @asset3]
-        expect(response).to redirect_to collections.collection_path(@collection)
-        expect(assigns[:collection].members).to eq([@asset2])
-      end
+    it "should support adding batches of members" do
+      @collection.members << @asset1
+      @collection.save
+      put :update, id: @collection.id, collection: {members:"add"}, batch_document_ids:[@asset2, @asset3]
+      expect(response).to redirect_to Hydra::Collections::Engine.routes.url_helpers.collection_path(@collection.id)
+      expect(assigns[:collection].members.sort! { |a,b| a.pid <=> b.pid }).to eq([@asset2, @asset3, @asset1].sort! { |a,b| a.pid <=> b.pid })
+    end
+    it "should support removing batches of members" do
+      @collection.members = [@asset1, @asset2, @asset3]
+      @collection.save
+      put :update, id: @collection.id, collection: {members:"remove"}, batch_document_ids:[@asset1, @asset3]
+      expect(response).to redirect_to Hydra::Collections::Engine.routes.url_helpers.collection_path(@collection.id)
+      expect(assigns[:collection].members).to eq([@asset2])
     end
-
     it "should support setting members array" do
-      put :update, id: @collection.id, collection: { members: "add" }, batch_document_ids: [@asset2, @asset3, @asset1]
-      expect(response).to redirect_to collections.collection_path(@collection)
-      expect(assigns[:collection].members).to match_array [@asset2, @asset3, @asset1]
+      put :update, id: @collection.id, collection: {members:"add"}, batch_document_ids:[@asset2, @asset3, @asset1]
+      expect(response).to redirect_to Hydra::Collections::Engine.routes.url_helpers.collection_path(@collection.id)
+      expect(assigns[:collection].members.sort! { |a,b| a.pid <=> b.pid }).to eq([@asset2, @asset3, @asset1].sort! { |a,b| a.pid <=> b.pid })
+    end
+    it "should support setting members array" do
+      put :update, id: @collection.id, collection: {members:"add"}, batch_document_ids:[@asset2, @asset3, @asset1]
+      expect(response).to redirect_to Hydra::Collections::Engine.routes.url_helpers.collection_path(@collection.id)
+      expect(assigns[:collection].members.sort! { |a,b| a.pid <=> b.pid }).to eq([@asset2, @asset3, @asset1].sort! { |a,b| a.pid <=> b.pid })
     end
-
     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]
-      expect(assigns[:collection].members).to match_array [@asset2, @asset3]
-
+      solr_doc_before_add = ActiveFedora::SolrInstanceLoader.new(ActiveFedora::Base, @asset2.pid).send(:solr_doc)
+      expect(solr_doc_before_add[Solrizer.solr_name(:collection)]).to be_nil
+      put :update, id: @collection.id, collection: {members:"add"}, batch_document_ids:[@asset2, @asset3]
+      expect(assigns[:collection].members.sort! { |a,b| a.pid <=> b.pid }).to eq([@asset2, @asset3].sort! { |a,b| a.pid <=> b.pid })
       ## Check that member lists collection in its solr doc
       @asset2.reload
-      expect(@asset2.to_solr[Solrizer.solr_name(:collection)]).to eq [@collection.id]
+      expect(@asset2.to_solr[Solrizer.solr_name(:collection)]).to eq([@collection.pid])
       ## Check that member was re-indexed with collection info
-      asset_results = blacklight_solr.get "select", params:{fq:["id:\"#{@asset2.id}\""],fl:['id',Solrizer.solr_name(:collection)]}
+      asset_results = blacklight_solr.get "select", params:{fq:["id:\"#{@asset2.pid}\""],fl:['id',Solrizer.solr_name(:collection)]}
       doc = asset_results["response"]["docs"].first
-      expect(doc["id"]).to eq(@asset2.id)
-      expect(doc[Solrizer.solr_name(:collection)]).to eq [@collection.id]
+      expect(doc["id"]).to eq(@asset2.pid)
+      expect(doc[Solrizer.solr_name(:collection)]).to eq([@collection.pid])
+      solr_doc_after_add = ActiveFedora::SolrInstanceLoader.new(ActiveFedora::Base, @asset2.pid).send(:solr_doc)
+      expect(solr_doc_after_add[Solrizer.solr_name(:collection)]).to eq([@collection.pid])
 
       # Remove from collection (un-sets collection on members)
-      put :update, id: @collection, collection: { members:"remove" }, batch_document_ids: [@asset2]
-      expect(assigns[:collection].members).to_not include(@asset2)
-
+      solr_doc_before_remove = ActiveFedora::SolrInstanceLoader.new(ActiveFedora::Base, @asset2.pid).send(:solr_doc)
+      expect(solr_doc_before_remove[Solrizer.solr_name(:collection)]).to eq([@collection.pid])
+      put :update, id: @collection.id, collection: {members:"remove"}, batch_document_ids:[@asset2]
+      expect(assigns[:collection].members).not_to include(@asset2)
       ## Check that member no longer lists collection in its solr doc
       @asset2.reload
       expect(@asset2.to_solr[Solrizer.solr_name(:collection)]).to eq([])
-
       ## Check that member was re-indexed without collection info
-      asset_results = blacklight_solr.get "select", params:{fq:["id:\"#{@asset2.id}\""],fl:['id',Solrizer.solr_name(:collection)]}
+      asset_results = blacklight_solr.get "select", params:{fq:["id:\"#{@asset2.pid}\""],fl:['id',Solrizer.solr_name(:collection)]}
       doc = asset_results["response"]["docs"].first
-      expect(doc["id"]).to eq(@asset2.id)
+      expect(doc["id"]).to eq(@asset2.pid)
       expect(doc[Solrizer.solr_name(:collection)]).to be_nil
+      solr_doc_after_remove = ActiveFedora::SolrInstanceLoader.new(ActiveFedora::Base, @asset2.pid).send(:solr_doc)
+      expect(solr_doc_after_remove[Solrizer.solr_name(:collection)]).to be_nil
     end
-
-    context "when moving members between collections" do
-      before do
-        @collection.members = [@asset1, @asset2, @asset3]
-        @collection.save
-      end
-      let(:collection2) do
-        Collection.new.tap do |col|
-          col.apply_depositor_metadata(@user.user_key)
-          col.save
-        end
-      end
-
-      it "moves the members" do
-        put :update, id: @collection, collection: {members: "move"}, 
-          destination_collection_id: collection2, batch_document_ids: [@asset2, @asset3]
-        expect(@collection.reload.members).to eq [@asset1]
-        expect(collection2.reload.members).to match_array [@asset2, @asset3]
-      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]
+      expect(::Collection.find(@collection.pid).members).to eq([@asset1])
+      expect(::Collection.find(@collection2.pid).members).to eq([@asset2, @asset3])
     end
+
   end
 
   describe "#destroy" do
@@ -220,15 +211,15 @@ describe CollectionsController, :type => :controller do
         @collection.save
         @asset1 = @asset1.reload
         @asset1.update_index
-        expect(@asset1.collections).to eq [@collection]
-        asset_results = blacklight_solr.get "select", params:{fq:["id:\"#{@asset1.id}\""],fl:['id',Solrizer.solr_name(:collection)]}
+        expect(@asset1.collections).to eq([@collection])
+        asset_results = blacklight_solr.get "select", params:{fq:["id:\"#{@asset1.pid}\""],fl:['id',Solrizer.solr_name(:collection)]}
         expect(asset_results["response"]["numFound"]).to eq(1)
         doc = asset_results["response"]["docs"].first
-        expect(doc[Solrizer.solr_name(:collection)]).to eq([@collection.id])
+        expect(doc[Solrizer.solr_name(:collection)]).to eq([@collection.pid])
 
-        delete :destroy, id: @collection
+        delete :destroy, id: @collection.id
         expect(@asset1.reload.collections).to eq([])
-        asset_results = blacklight_solr.get "select", params:{fq:["id:\"#{@asset1.id}\""],fl:['id',Solrizer.solr_name(:collection)]}
+        asset_results = blacklight_solr.get "select", params:{fq:["id:\"#{@asset1.pid}\""],fl:['id',Solrizer.solr_name(:collection)]}
         expect(asset_results["response"]["numFound"]).to eq(1)
         doc = asset_results["response"]["docs"].first
         expect(doc[Solrizer.solr_name(:collection)]).to be_nil
@@ -245,40 +236,71 @@ describe CollectionsController, :type => :controller do
       @asset1 = GenericFile.create!(title: "First of the Assets")
       @asset2 = GenericFile.create!(title: "Second of the Assets")
       @asset3 = GenericFile.create!(title: "Third of the Assets")
-      @collection = Collection.new(id:"abc123")
+      @collection = Collection.new(pid:"abc:123")
       @collection.title = "My collection"
       @collection.apply_depositor_metadata(@user.user_key)
-      @collection.members = [@asset1, @asset2, @asset3]
-      @collection.save!
-      expect(controller).to receive(:authorize!).and_return(true)
+      @collection.members = [@asset1,@asset2,@asset3]
+      @collection.save
+      allow(controller).to receive(:authorize!).and_return(true)
       allow(controller).to receive(:apply_gated_search)
     end
-
+    it "should show the collections" do
+      get :show, id: @collection.id
+      expect(assigns[:collection].title).to eq(@collection.title)
+      ids = assigns[:member_docs].map {|d| d.id}
+      expect(ids).to include @asset1.pid
+      expect(ids).to include @asset2.pid
+      expect(ids).to include @asset3.pid
+    end
+    context "when items have been added and removed" do
+      it "should return the items that are in the collection and not return items that have been removed" do
+        asset4 = GenericFile.create!(title: "Fourth of the Assets")
+        put :update, id: @collection.id, collection: {members:"remove"}, batch_document_ids:[@asset2.pid]
+        controller.batch = nil
+        put :update, id: @collection.id, collection: {members:"add"}, batch_document_ids:[asset4.pid]
+        get :show, id: @collection.id
+        ids = assigns[:member_docs].map(&:id)
+        expect(ids).to include @asset1.pid, @asset3.pid, asset4.pid
+        expect(ids).to_not include @asset2.pid
+      end
+    end
     describe "additional collections" do
       before do
         @asset4 = GenericFile.create!(title: "#{@asset1.id}")
-        @collection2 = Collection.new(id: "abc1234")
+        @collection2 = Collection.new(pid:"abc:1234")
         @collection2.title = "Other collection"
         @collection2.apply_depositor_metadata(@user.user_key)
         @collection2.members = [@asset4]
         @collection2.save
+        @asset4 = @asset4.reload
+        expect(@asset4.collections).to eq([@collection2])
       end
 
       it "should show only the collections assets" do
-        get :show, id: @collection
-        expect(assigns[:collection].title).to eq @collection.title
-        expect(assigns[:member_docs].map(&:id)).to match_array [@asset1.id, @asset2.id, @asset3.id]
-      end
+        get :show, id: @collection.pid
+        expect(assigns[:collection].title).to eq(@collection.title)
+        ids = assigns[:member_docs].map {|d| d.id}
+        expect(ids).to include @asset1.pid
+        expect(ids).to include @asset2.pid
+        expect(ids).to include @asset3.pid
+        expect(ids).not_to include @asset4.pid
 
+      end
       it "should show only the other collections assets" do
-        get :show, id: @collection2
-        expect(assigns[:collection].title).to eq @collection2.title
-        expect(assigns[:member_docs].map(&:id)).to match_array [@asset4.id]
+
+        get :show, id: @collection2.pid
+        expect(assigns[:collection].title).to eq(@collection2.title)
+        ids = assigns[:member_docs].map {|d| d.id}
+        expect(ids).not_to include @asset1.pid
+        expect(ids).not_to include @asset2.pid
+        expect(ids).not_to include @asset3.pid
+        expect(ids).to include @asset4.pid
+
       end
     end
 
     it "when the collection is empty it should show no assets" do
-      get :show, id: Collection.create(title: "Empty collection")
+      get :show, id: Collection.create(title: "Empty collection").id
       expect(assigns[:collection].title).to eq("Empty collection")
       expect(assigns[:member_docs]).to be_empty
     end
@@ -286,27 +308,34 @@ describe CollectionsController, :type => :controller do
     # 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}\""
-      expect(assigns[:collection].title).to eq @collection.title
-      expect(assigns[:member_docs].map(&:id)).to match_array [@asset1.id]
+      expect(assigns[:collection].title).to eq(@collection.title)
+      ids = assigns[:member_docs].map {|d| d.id}
+      expect(ids).to include @asset1.pid
+      expect(ids).not_to include @asset2.pid
+      expect(ids).not_to include @asset3.pid
     end
 
-    context "When there are search matches that are not in the collection" do
-      before do
-        GenericFile.create!(title: "#{@asset1.id} #{@asset1.title}")
-        GenericFile.create!(title: @asset1.title)
-      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
-        get :show, id: @collection, cq: "\"#{@asset1.title}\""
-        expect(assigns[:collection].title).to eq @collection.title
-        expect(assigns[:member_docs].map(&:id)).to match_array [@asset1.id]
-      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}")
+      get :show, id: @collection.id, cq:"\"#{@asset1.title}\""
+      expect(assigns[:collection].title).to eq(@collection.title)
+      ids = assigns[:member_docs].map {|d| d.id}
+      expect(ids).to include @asset1.pid
+      expect(ids).not_to include @asset2.pid
+      expect(ids).not_to include @asset3.pid
+      expect(ids).not_to include @asset4.pid
+      expect(ids).not_to include @asset5.pid
     end
 
     it "should query the collections with rows" do
-      get :show, id: @collection, rows:"2"
-      expect(assigns[:collection].title).to eq @collection.title
-      expect(assigns[:member_docs].size).to eq 2
+      get :show, id: @collection.id, rows:"2"
+      expect(assigns[:collection].title).to eq(@collection.title)
+      ids = assigns[:member_docs].map {|d| d.id}
+      expect(ids.count).to eq(2)
     end
+
   end
+
 end