hydra-collections 2.0.3 → 2.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f6e1f62bb76da1eeb957dbebbf2ab9fbf713ddea
-  data.tar.gz: cd34402c757b5de010ec1b70222e1da46fad1ac3
+  metadata.gz: 0848c18173f62f89254d85e85b584440db5c9360
+  data.tar.gz: f1f144ffa8fbc44c61ab2ad810c89ce8e7b18f38
 SHA512:
-  metadata.gz: 84d26804dad9ca6907b2ae84b1e4bbace3c65be9b795655e9511f91dc979a9521f9c646fc2188a22b30345bfe1542b9a19cf7532f43f77a3f093e0213f6b8f7f
-  data.tar.gz: 44176bea487fdeff2da52cb9b24bac2e0fe1ca3e92dae75b6297476cf39ae11a97dd058c84015b95b0a263ff18ec69d0253c5e3f0e28211dbfca0782cf3083d6
+  metadata.gz: 025f951414c29038af78092e552353de53181095da0f5fe6c16831a4a12e7d6e8c6de5fb30f68cab3f75e44bae2ee95d830c13a6455821339dd800332de82031
+  data.tar.gz: 7825b8ed470364197333795a2edd070df64a4935734864721a4914cf82970df572db73142fb33e031f8594045656ccc8b84754a9fe86647fff941b8ee9145a1e

data/.travis.yml

@@ -1,18 +1,14 @@
 language: ruby
 rvm:
   - 2.1
-gemfile:
-  - gemfiles/rails3.gemfile
-  - gemfiles/rails4.gemfile
+  - 2.0
 env:
   global:
   - NOKOGIRI_USE_SYSTEM_LIBRARIES=true
 notifications:
   email:
     recipients:
-      - "michael@psu.edu"
-      - "cam156@psu.edu"
-      - "dmc186@psu.edu"
+      - "ul-dlt-hydra@lists.psu.edu"
     on_success: "change"
     on_failure: "always"
   irc:
@@ -20,4 +16,4 @@ notifications:
       - "irc.freenode.org#scholarsphere"
       - "irc.freenode.org#projecthydra"
     template:
-      - "%{repository}//%{branch}@%{commit} by %{author}: %{message} - %{build_url}"
+      - "%{repository}//%{branch}@%{commit} by %{author}: %{message} - %{build_url}"

data/Changelog.md

@@ -1,6 +1,30 @@
+# 2.0.4
+
+* Updating dependencies
+* Refactoring collection membership methods
+* More thorough testing of relationships in Solr
+* Update to Rspec 3
+
+# 2.0.3
+
+* Pin to Rspec 2.99
+* Made compatible with hydra-head 7.1
+
+# 2.0.2
+
+* Javascript is turbolinks-capable
+
+# 2.0.1
+
+* Fixes to searching and RDF datastreams
+
+# 2.0.0
+
+* Made compatible with hydra-head 7
+
 # 1.3.2
 
-Fixes delete button behavior
+* Fixes delete button behavior
 
 # 1.2.0.rc1
 

data/Gemfile

@@ -5,8 +5,9 @@ gemspec
 
 group :development, :test do
   gem 'sqlite3'
-  gem "factory_girl_rails", "~> 4.1.0"
+  gem "factory_girl_rails"
   gem 'devise'
-  gem 'capybara', '~>1.1.3'
+  gem 'capybara'
   gem 'jettywrapper'
+  gem 'byebug', require: false
 end

data/app/controllers/concerns/hydra/collections_controller_behavior.rb

@@ -60,10 +60,7 @@ module Hydra
         
     def create
       @collection.apply_depositor_metadata(current_user.user_key)
-      unless batch.empty?
-        params[:collection][:members]="add"
-        process_member_changes
-      end
+      add_members_to_collection unless batch.empty?
       if @collection.save
         after_create
       else
@@ -98,7 +95,6 @@ module Hydra
       end
     end
     
-    
     def after_destroy (id)
       respond_to do |format|
         format.html { redirect_to catalog_index_path, notice: 'Collection was successfully deleted.' }
@@ -114,12 +110,12 @@ module Hydra
     end
     
     def destroy
-       if @collection.destroy
-          after_destroy(params[:id])
-       else
-         after_destroy_error(params[:id])
-       end
-     end
+      if @collection.destroy
+         after_destroy(params[:id])
+      else
+        after_destroy_error(params[:id])
+      end
+    end
     
     protected
 
@@ -136,37 +132,38 @@ module Hydra
     end
 
     def process_member_changes
-      unless params[:collection].nil?
-        change_members = []
-        batch.each do |pid|
-          change_members << ActiveFedora::Base.find(pid, :cast=>true)
-        end
+      case params[:collection][:members]
+        when "add" then add_members_to_collection
+        when "remove" then remove_members_from_collection
+        when "move" then move_members_between_collections
+        when Array then assign_batch_to_collection
+      end
+    end
 
-        case params[:collection][:members]
-          when "add"
-            change_members.each do |member|
-              @collection.members << member
-              #@collection.add_relationship(:has_collection_member, "info:fedora/#{pid}")
-            end
-          when "remove"
-            change_members.each do |member|
-              @collection.members.delete(member)
-            end
-          when "move"
-            @destination_collection = ::Collection.find(params[:destination_collection_id])
-            change_members.each do |member|
-              @collection.members.delete(member)
-              @destination_collection.members << member
-            end
-            @destination_collection.save
-            flash[:notice] = "Successfully moved #{change_members.count} files to #{@destination_collection.title} Collection."
-          when Array
-            @collection.members.replace(change_members)
-          #@collection.clear_relationship(:has_collection_member)
-          #params[:collection][:members].each do |pid|
-          #  @collection.add_relationship(:has_collection_member, "info:fedora/#{pid}")
-          #end
-        end
+    def add_members_to_collection collection = nil
+      collection ||= @collection
+      collection.members(true)
+      collection.member_ids = batch.concat(collection.member_ids)
+    end
+
+    def remove_members_from_collection
+      @collection.members(true)
+      @collection.member_ids = (@collection.member_ids - batch)
+    end
+
+    def assign_batch_to_collection
+      @collection.members(true)
+      @collection.member_ids = batch
+    end
+
+    def move_members_between_collections
+      destination_collection = ::Collection.find(params[:destination_collection_id])
+      remove_members_from_collection
+      add_members_to_collection(destination_collection)
+      if destination_collection.save
+        flash[:notice] = "Successfully moved #{batch.count} files to #{destination_collection.title} Collection."
+      else
+        flash[:error] = "An error occured. Files were not moved to #{destination_collection.title} Collection."
       end
     end
     

data/app/models/concerns/hydra/collection.rb

@@ -11,7 +11,7 @@ module Hydra
       has_metadata "descMetadata", type: Hydra::CollectionRdfDatastream
       has_metadata "properties", type: Hydra::Datastream::Properties
 
-      has_and_belongs_to_many :members, :property => :has_collection_member, :class_name => "ActiveFedora::Base" , :after_remove => :remove_member
+      has_and_belongs_to_many :members, :property => :has_collection_member, :class_name => "ActiveFedora::Base" , :after_remove => :update_member
 
       has_attributes :depositor, datastream: :properties, multiple: false
       
@@ -25,10 +25,9 @@ module Hydra
       before_create :set_date_uploaded
       before_save :set_date_modified
 
-      after_save :local_update_members
-      after_create :create_member_index
+      after_save :update_all_members
 
-      before_destroy :remove_all_members
+      before_destroy :update_all_members
     end
 
     def terms_for_editing
@@ -39,9 +38,13 @@ module Hydra
       self.descMetadata.class.config.keys.map{|v| v.to_sym}
     end
 
-    def remove_member(member)
-      #member.collections.delete self if member.respond_to?(:collections)
-      member.reload.update_index
+    def update_all_members
+      self.members.collect { |m| update_member(m) }
+    end
+
+    # TODO: Use solr atomic updates to accelerate this process
+    def update_member member
+      member.update_index
     end
 
     private
@@ -54,34 +57,6 @@ module Hydra
       self.date_modified = Date.today
     end
 
-    # cause the members to index the relationship
-    def local_update_members
-      if self.respond_to?(:members)
-        self.members.each do |member|
-          member.reload.update_index
-        end
-      end
-    end
-
-    def create_member_index
-      self.members.each do |member|
-        member.to_solr  # not sure why this to_solr is needed but it caused the removal and update to work
-        if member.respond_to?(:collections)
-          member.collections << self
-          member.update_index
-          member.collections << self if self.members.size == 1  #again who konw why but this allows on asset to be added
-        end
-      end
-    end
-
-    def remove_all_members
-      self.members.each do |member|
-        member.to_solr  # not sure why this to_solr is needed but it caused the removal and update to work
-        member.collections.delete(self) if member.respond_to?(:collections)
-        member.update_index
-      end
-    end
-
- end
+  end
 
 end

data/hydra-collections.gemspec

@@ -23,5 +23,5 @@ Gem::Specification.new do |spec|
 
   spec.add_development_dependency "bundler", "~> 1.3"
   spec.add_development_dependency "rake"
-  spec.add_development_dependency "rspec-rails", '~> 2.99'
+  spec.add_development_dependency "rspec-rails"
 end

data/lib/hydra/collections/version.rb

@@ -1,5 +1,5 @@
 module Hydra
   module Collections
-    VERSION = "2.0.3"
+    VERSION = "2.0.4"
   end
 end

data/spec/controllers/accepts_batches_spec.rb

@@ -4,23 +4,24 @@ class AcceptsBatchesController < ApplicationController
   include Hydra::Collections::AcceptsBatches
 end
 
-describe AcceptsBatchesController do
+describe AcceptsBatchesController, :type => :controller do
 
   describe "batch" do
     it "should accept batch from parameters" do
       controller.params["batch_document_ids"] = ["abc", "xyz"]
-      controller.batch.should == ["abc", "xyz"]
+      expect(controller.batch).to eq(["abc", "xyz"])
     end
     describe ":all" do
+      let(:current_user) { double(user_key: 'vanessa') }
       before do
         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: double(user_key: 'vanessa'))
+        expect_any_instance_of(Hydra::Collections::SearchService).to receive(:last_search_documents).and_return([doc1, doc2])
+        allow(controller).to receive(:current_user).and_return(current_user)
       end
       it "should add every document in the current resultset to the batch" do
         controller.params["batch_document_ids"] = "all"
-        controller.batch.should == [123, 456]
+        expect(controller.batch).to eq([123, 456])
       end
     end
   end
@@ -32,39 +33,36 @@ describe AcceptsBatchesController do
       subject.batch = @allowed + @disallowed
     end
     it "using filter_docs_with_access!" do
-      @allowed.each {|doc_id| subject.should_receive(:can?).with(:foo, doc_id).and_return(true)}
-      @disallowed.each {|doc_id| subject.should_receive(:can?).with(:foo, doc_id).and_return(false)}
+      @allowed.each {|doc_id| expect(subject).to receive(:can?).with(:foo, doc_id).and_return(true)}
+      @disallowed.each {|doc_id| expect(subject).to receive(:can?).with(:foo, doc_id).and_return(false)}
       subject.send(:filter_docs_with_access!, :foo)
-      subject.batch.should
-      flash[:notice].should == "You do not have permission to edit the documents: #{@disallowed.join(', ')}"
+      expect(flash[:notice]).to eq("You do not have permission to edit the documents: #{@disallowed.join(', ')}")
     end
     it "using filter_docs_with_edit_access!" do
-      @allowed.each {|doc_id| subject.should_receive(:can?).with(:edit, doc_id).and_return(true)}
-      @disallowed.each {|doc_id| subject.should_receive(:can?).with(:edit, doc_id).and_return(false)}
+      @allowed.each {|doc_id| expect(subject).to receive(:can?).with(:edit, doc_id).and_return(true)}
+      @disallowed.each {|doc_id| expect(subject).to receive(:can?).with(:edit, doc_id).and_return(false)}
       subject.send(:filter_docs_with_edit_access!)
-      subject.batch.should
-      flash[:notice].should == "You do not have permission to edit the documents: #{@disallowed.join(', ')}"
+      expect(flash[:notice]).to eq("You do not have permission to edit the documents: #{@disallowed.join(', ')}")
     end
     it "using filter_docs_with_read_access!" do
-      @allowed.each {|doc_id| subject.should_receive(:can?).with(:read, doc_id).and_return(true)}
-      @disallowed.each {|doc_id| subject.should_receive(:can?).with(:read, doc_id).and_return(false)}
+      @allowed.each {|doc_id| expect(subject).to receive(:can?).with(:read, doc_id).and_return(true)}
+      @disallowed.each {|doc_id| expect(subject).to receive(:can?).with(:read, doc_id).and_return(false)}
       subject.send(:filter_docs_with_read_access!)
-      subject.batch.should
-      flash[:notice].should == "You do not have permission to edit the documents: #{@disallowed.join(', ')}"
+      expect(flash[:notice]).to eq("You do not have permission to edit the documents: #{@disallowed.join(', ')}")
     end
     it "and be sassy if you didn't select anything" do
       subject.batch = []
       subject.send(:filter_docs_with_read_access!)
-      flash[:notice].should == "Select something first"
+      expect(flash[:notice]).to eq("Select something first")
     end
     
   end
     
   it "should check for empty" do
     controller.batch = ["77826928", "94120425"]
-    controller.check_for_empty_batch?.should == false
+    expect(controller.check_for_empty_batch?).to eq(false)
     controller.batch = []
-    controller.check_for_empty_batch?.should == true
+    expect(controller.check_for_empty_batch?).to eq(true)
   end
 
 

data/spec/controllers/catalog_controller_spec.rb

@@ -16,9 +16,9 @@ require 'spec_helper'
 
 include Rails.application.routes.url_helpers
 
-describe CatalogController do
+describe CatalogController, :type => :controller do
   before do
-    controller.stub(:has_access?).and_return(true)
+    allow(controller).to receive(:has_access?).and_return(true)
     @user = FactoryGirl.find_or_create(:user)
     @collection = Collection.new title:"Test"
     @collection.apply_depositor_metadata(@user.user_key)
@@ -37,7 +37,7 @@ describe CatalogController do
       @routes = Rails.application.routes
       get :index
       expect(assigns(:user_collections)).to be_kind_of(Array)
-      assigns(:user_collections).index{|d| d.id == @collection.id}.should_not be_nil
+      expect(assigns(:user_collections).index{|d| d.id == @collection.id}).not_to be_nil
     end
   end
   

data/spec/controllers/collections_controller_spec.rb

@@ -1,6 +1,6 @@
 require 'spec_helper'
 
-describe CollectionsController do
+describe CollectionsController, :type => :controller do
   before(:all) do
     @user = FactoryGirl.find_or_create(:user)
 #    CollectionsController.config.default_solr_params = {:qf => 'title_tesim'}
@@ -25,12 +25,12 @@ describe CollectionsController do
   end
   
   before do
-    controller.stub(:has_access?).and_return(true)
+    allow(controller).to receive(: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
+    allow_any_instance_of(User).to receive(:groups).and_return([])
+    allow(controller).to receive(:clear_session_user) ## Don't clear out the authenticated session
   end
 
   describe '#new' do
@@ -39,9 +39,9 @@ describe CollectionsController do
       expect(assigns(:collection)).to be_kind_of(Collection)
     end
     it "should pass through batch ids if provided and stick them in the form" do
-      pending "Couldn't get have_selector working before I had to move on.  - MZ"
+      skip "Couldn't get have_selector working before I had to move on.  - MZ"
       get :new, batch_document_ids: ["test2", "test88"]
-      response.should have_selector("p[class='foo']")
+      expect(response).to have_selector("p[class='foo']")
     end
   end
   
@@ -49,45 +49,45 @@ describe CollectionsController do
     it "should create a Collection" do
       old_count = Collection.count
       post :create, collection: {title: "My First Collection ", description: "The Description\r\n\r\nand more"}
-      Collection.count.should == old_count+1
-      assigns[:collection].title.should == "My First Collection "
-      assigns[:collection].description.should == "The Description\r\n\r\nand more"
-      assigns[:collection].depositor.should == @user.user_key
-      response.should redirect_to Hydra::Collections::Engine.routes.url_helpers.collection_path(assigns[:collection].id)
+      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 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!
       @asset2 = ActiveFedora::Base.create!
       post :create, batch_document_ids: [@asset1, @asset2], collection: {title: "My Secong Collection ", description: "The Description\r\n\r\nand more"}
-      assigns[:collection].members.should == [@asset1, @asset2]
+      expect(assigns[:collection].members).to eq([@asset1, @asset2])
     end
     it "should call after_create" do
-       controller.should_receive(:after_create).and_call_original
+       expect(controller).to receive(:after_create).and_call_original
        post :create, collection: {title: "My First Collection ", description: "The Description\r\n\r\nand more"}
     end
 
     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"}
-      assigns[:collection].members.should == [@asset1]
+      expect(assigns[:collection].members).to eq([@asset1])
       asset_results = blacklight_solr.get "select", params:{fq:["id:\"#{@asset1.pid}\""],fl:['id',Solrizer.solr_name(:collection)]}
-      asset_results["response"]["numFound"].should == 1
+      expect(asset_results["response"]["numFound"]).to eq(1)
       doc = asset_results["response"]["docs"].first
-      doc["id"].should == @asset1.pid
+      expect(doc["id"]).to eq(@asset1.pid)
       afterupdate = GenericFile.find(@asset1.pid)
-      doc[Solrizer.solr_name(:collection)].should == afterupdate.to_solr[Solrizer.solr_name(:collection)]
+      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
       @asset1 = GenericFile.create!
       @asset2 = GenericFile.create!
       post :create, batch_document_ids: [@asset1,@asset2], collection: {title: "My Secong Collection ", description: "The Description\r\n\r\nand more"}
-      assigns[:collection].members.should == [@asset1,@asset2]
+      expect(assigns[:collection].members).to eq([@asset1,@asset2])
       asset_results = blacklight_solr.get "select", params:{fq:["id:\"#{@asset1.pid}\""],fl:['id',Solrizer.solr_name(:collection)]}
-      asset_results["response"]["numFound"].should == 1
+      expect(asset_results["response"]["numFound"]).to eq(1)
       doc = asset_results["response"]["docs"].first
-      doc["id"].should == @asset1.pid
+      expect(doc["id"]).to eq(@asset1.pid)
       afterupdate = GenericFile.find(@asset1.pid)
-      doc[Solrizer.solr_name(:collection)].should == afterupdate.to_solr[Solrizer.solr_name(:collection)]
+      expect(doc[Solrizer.solr_name(:collection)]).to eq(afterupdate.to_solr[Solrizer.solr_name(:collection)])
     end
   end
 
@@ -99,68 +99,76 @@ describe CollectionsController do
       @asset1 = GenericFile.create!
       @asset2 = GenericFile.create!
       @asset3 = GenericFile.create!
-      controller.stub(:authorize!).and_return(true)
-      controller.should_receive(:authorize!).at_least(:once)
+      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"}
-      response.should redirect_to Hydra::Collections::Engine.routes.url_helpers.collection_path(@collection.id)
-      assigns[:collection].title.should == "New Title"
-      assigns[:collection].description.should == "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
-       controller.should_receive(:after_update).and_call_original
+       expect(controller).to receive(:after_update).and_call_original
        put :update, id: @collection.id, collection: {title: "New Title", description: "New Description"}
     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]
-      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 }
+      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]
-      response.should redirect_to Hydra::Collections::Engine.routes.url_helpers.collection_path(@collection.id)
-      assigns[:collection].members.should == [@asset2]
+      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]
-      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 }
+      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]
-      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 }
+      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)
+      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]
-      assigns[:collection].members.sort! { |a,b| a.pid <=> b.pid }.should == [@asset2, @asset3].sort! { |a,b| a.pid <=> b.pid }
+      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
-      @asset2.to_solr[Solrizer.solr_name(:collection)].should == [@collection.pid]
+      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.pid}\""],fl:['id',Solrizer.solr_name(:collection)]}
       doc = asset_results["response"]["docs"].first
-      doc["id"].should == @asset2.pid
-      doc[Solrizer.solr_name(:collection)].should == [@collection.pid]
-  
+      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)
+      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]
-      assigns[:collection].members.should_not include(@asset2)
+      expect(assigns[:collection].members).not_to include(@asset2)
       ## Check that member no longer lists collection in its solr doc
       @asset2.reload
-      @asset2.to_solr[Solrizer.solr_name(:collection)].should == []
+      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.pid}\""],fl:['id',Solrizer.solr_name(:collection)]}
       doc = asset_results["response"]["docs"].first
-      doc["id"].should == @asset2.pid
-      doc[Solrizer.solr_name(:collection)].should be_nil
+      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
     
     it "should allow moving members between collections" do
@@ -170,8 +178,8 @@ describe CollectionsController do
       @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]
+      expect(::Collection.find(@collection.pid).members).to eq([@asset1])
+      expect(::Collection.find(@collection2.pid).members).to eq([@asset2, @asset3])
     end
 
   end
@@ -182,15 +190,15 @@ describe CollectionsController do
         @collection = Collection.new
         @collection.apply_depositor_metadata(@user.user_key)
         @collection.save
-        controller.should_receive(:authorize!).and_return(true)
+        expect(controller).to receive(:authorize!).and_return(true)
       end
       it "should delete collection" do
         delete :destroy, id: @collection.id
-        response.should redirect_to Rails.application.routes.url_helpers.catalog_index_path
-        flash[:notice].should == "Collection was successfully deleted."
+        expect(response).to redirect_to Rails.application.routes.url_helpers.catalog_index_path
+        expect(flash[:notice]).to eq("Collection was successfully deleted.")
       end
       it "should after_destroy" do
-        controller.should_receive(:after_destroy).and_call_original
+        expect(controller).to receive(:after_destroy).and_call_original
         delete :destroy, id: @collection.id
       end
       it "should call update members" do
@@ -199,18 +207,18 @@ describe CollectionsController do
         @collection.save
         @asset1 = @asset1.reload
         @asset1.update_index
-        @asset1.collections.should == [@collection]
+        expect(@asset1.collections).to eq([@collection])
         asset_results = blacklight_solr.get "select", params:{fq:["id:\"#{@asset1.pid}\""],fl:['id',Solrizer.solr_name(:collection)]}
-        asset_results["response"]["numFound"].should == 1
+        expect(asset_results["response"]["numFound"]).to eq(1)
         doc = asset_results["response"]["docs"].first
-        doc[Solrizer.solr_name(:collection)].should == [@collection.pid]
+        expect(doc[Solrizer.solr_name(:collection)]).to eq([@collection.pid])
 
         delete :destroy, id: @collection.id
-        @asset1.reload.collections.should == []
+        expect(@asset1.reload.collections).to eq([])
         asset_results = blacklight_solr.get "select", params:{fq:["id:\"#{@asset1.pid}\""],fl:['id',Solrizer.solr_name(:collection)]}
-        asset_results["response"]["numFound"].should == 1
+        expect(asset_results["response"]["numFound"]).to eq(1)
         doc = asset_results["response"]["docs"].first
-        doc[Solrizer.solr_name(:collection)].should be_nil
+        expect(doc[Solrizer.solr_name(:collection)]).to be_nil
         @asset1.destroy
       end
     end
@@ -229,16 +237,28 @@ describe CollectionsController do
       @collection.apply_depositor_metadata(@user.user_key)
       @collection.members = [@asset1,@asset2,@asset3]
       @collection.save
-      controller.should_receive(:authorize!).and_return(true)
-      controller.stub(:apply_gated_search)
+      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
-      assigns[:collection].title.should == @collection.title
+      expect(assigns[:collection].title).to eq(@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
+      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
@@ -249,46 +269,46 @@ describe CollectionsController do
         @collection2.members = [@asset4]
         @collection2.save
         @asset4 = @asset4.reload
-        @asset4.collections.should == [@collection2]
+        expect(@asset4.collections).to eq([@collection2])
       end
 
       it "should show only the collections assets" do
         get :show, id: @collection.pid
-        assigns[:collection].title.should == @collection.title
+        expect(assigns[:collection].title).to eq(@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
-        ids.should_not include @asset4.pid
+        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.pid
-        assigns[:collection].title.should == @collection2.title
+        expect(assigns[:collection].title).to eq(@collection2.title)
         ids = assigns[:member_docs].map {|d| d.id}
-        ids.should_not include @asset1.pid
-        ids.should_not include @asset2.pid
-        ids.should_not include @asset3.pid
-        ids.should include @asset4.pid
+        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").id
-      assigns[:collection].title.should ==  "Empty collection"
-      assigns[:member_docs].should be_empty
+      expect(assigns[:collection].title).to eq("Empty collection")
+      expect(assigns[:member_docs]).to 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
+      expect(assigns[:collection].title).to eq(@collection.title)
       ids = assigns[:member_docs].map {|d| d.id}
-      ids.should include @asset1.pid
-      ids.should_not include @asset2.pid
-      ids.should_not include @asset3.pid
+      expect(ids).to include @asset1.pid
+      expect(ids).not_to include @asset2.pid
+      expect(ids).not_to include @asset3.pid
     end
 
     # NOTE: This test depends on title_tesim being in the qf in solrconfig.xml
@@ -296,20 +316,20 @@ describe CollectionsController do
       @asset4 = GenericFile.create!(title: "#{@asset1.id} #{@asset1.title}")
       @asset5 = GenericFile.create!(title: "#{@asset1.title}")
       get :show, id: @collection.id, cq:"\"#{@asset1.title}\""
-      assigns[:collection].title.should == @collection.title
+      expect(assigns[:collection].title).to eq(@collection.title)
       ids = assigns[:member_docs].map {|d| d.id}
-      ids.should include @asset1.pid
-      ids.should_not include @asset2.pid
-      ids.should_not include @asset3.pid
-      ids.should_not include @asset4.pid
-      ids.should_not include @asset5.pid
+      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.id, rows:"2"
-      assigns[:collection].title.should == @collection.title
+      expect(assigns[:collection].title).to eq(@collection.title)
       ids = assigns[:member_docs].map {|d| d.id}
-      ids.count.should == 2
+      expect(ids.count).to eq(2)
     end
 
   end