hydra-collections 7.0.0 → 8.0.0

data/spec/controllers/catalog_controller_spec.rb

@@ -1,28 +1,20 @@
 require 'spec_helper'
 
 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.apply_depositor_metadata(@user.user_key)
-    @collection.read_groups = ["public"]
-    @collection.save!
   end
 
-  after do
-    @collection.destroy
-  end
-  
+  let(:user) { FactoryGirl.create(:user) }
+  let!(:collection) { FactoryGirl.create(:collection, user: user, read_groups: ['public']) }
+
   routes { Rails.application.routes }
-  
+
   describe '#index' do
-    it 'should assign @user_collections' do
+    it 'assigns @user_collections' do
       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
+      expect(assigns(:user_collections).map(&:id)).to include collection.id
     end
   end
-  
 end

data/spec/controllers/collections_controller_spec.rb

@@ -39,8 +39,8 @@ describe CollectionsController, :type => :controller do
   end
 
   describe "#index" do
-    let!(:collection1) { Collection.create(title: 'Beta') { |c| c.apply_depositor_metadata(user.user_key) } }
-    let!(:collection2) { Collection.create(title: 'Alpha') { |c| c.apply_depositor_metadata(user.user_key) } }
+    let!(:collection1) { FactoryGirl.create(:collection, title: ['Beta'], user: user) }
+    let!(:collection2) { FactoryGirl.create(:collection, title: ['Alpha'], user: user) }
     let!(:generic_file) { GenericWork.create }
 
     it "shows a list of collections sorted alphabetically" do
@@ -52,49 +52,60 @@ describe CollectionsController, :type => :controller do
   end
 
   describe '#new' do
-    it 'should assign @collection' do
+    it 'assigns @collection' do
       get :new
       expect(assigns(:collection)).to be_kind_of(Collection)
     end
   end
 
   describe '#create' do
-    it "should create a Collection" do
+    it "creates a Collection" do
       expect {
-        post :create, collection: {title: "My First Collection ", description: "The Description\r\n\r\nand more"}
+        post :create, collection: { title: ["My First Collection"],
+                                    description: ["The Description\r\n\r\nand more"] }
       }.to change { Collection.count }.by(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].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])
     end
-    it "should add docs to collection if batch ids provided" do
+
+    it "adds docs to collection if batch ids provided" do
       @asset1 = GenericWork.create!
       @asset2 = GenericWork.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])
+      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]
     end
-    it "should call after_create" do
+
+    it "calls after_create" do
        expect(controller).to receive(:after_create).and_call_original
-       post :create, collection: {title: "My First Collection ", description: "The Description\r\n\r\nand more"}
+       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
+    it "adds one doc to collection if batch ids provided and add the collection id to the document in the colledction" do
       @asset1 = GenericWork.create!
-      post :create, batch_document_ids: [@asset1], collection: {title: "My Secong Collection ", description: "The Description\r\n\r\nand more"}
+      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 = ActiveFedora::SolrService.instance.conn.get "select", params:{fq:["id:\"#{@asset1.id}\""],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)
+      expect(doc["id"]).to eq @asset1.id
       afterupdate = GenericWork.find(@asset1.id)
       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
+
+    it "adds docs to collection if batch ids provided and add the collection id to the documents int he colledction" do
       @asset1 = GenericWork.create!
       @asset2 = GenericWork.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])
+      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 = ActiveFedora::SolrService.instance.conn.get "select", params:{fq:["id:\"#{@asset1.id}\""],fl:['id',Solrizer.solr_name(:collection)]}
       expect(asset_results["response"]["numFound"]).to eq(1)
       doc = asset_results["response"]["docs"].first
@@ -105,8 +116,8 @@ describe CollectionsController, :type => :controller do
   end
 
   describe "#update" do
+    let(:collection) { FactoryGirl.create(:collection, user: user) }
     before do
-      @collection = Collection.create { |c| c.apply_depositor_metadata(user.user_key) }
       @asset1 = GenericWork.create!
       @asset2 = GenericWork.create!
       @asset3 = GenericWork.create!
@@ -114,16 +125,16 @@ describe CollectionsController, :type => :controller do
       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)
-      expect(assigns[:collection].title).to eq("New Title")
-      expect(assigns[:collection].description).to eq("New Description")
+    it "updates collection metadata" do
+      put :update, id: collection.id, collection: { title: ["New Title"], description: ["New Description"] }
+      expect(response).to redirect_to collections.collection_path(collection)
+      expect(assigns[:collection].title).to eq(["New Title"])
+      expect(assigns[:collection].description).to eq(["New Description"])
     end
 
-    it "should call after_update" do
+    it "calls 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 updating fails" do
@@ -131,49 +142,49 @@ describe CollectionsController, :type => :controller do
         allow_any_instance_of(Collection).to receive(:save).and_return(false)
       end
       it "should render edit succesfully" do
-        put :update, id: @collection.id, collection: { title: "New Title" }
+        put :update, id: collection.id, collection: { title: ["New Title"] }
         expect(response).to render_template "edit"
       end
     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, collection: { members:"add" }, batch_document_ids: [@asset2, @asset3]
-        expect(response).to redirect_to collections.collection_path(@collection)
+        collection.members << @asset1
+        collection.save!
+        put :update, id: collection, 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, collection: { members: "remove" }, batch_document_ids: [@asset1, @asset3]
-        expect(response).to redirect_to collections.collection_path(@collection)
+        collection.members = [@asset1, @asset2, @asset3]
+        collection.save!
+        put :update, id: collection, 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
     end
 
     it "should support setting members array" do
-      put :update, id: @collection, collection: { members: "add" }, batch_document_ids: [@asset2, @asset3, @asset1]
-      expect(response).to redirect_to collections.collection_path(@collection)
+      put :update, id: collection, 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]
     end
 
     it "should set/un-set collection on members" do
       # Add to collection (sets collection on members)
-      put :update, id: @collection, collection: { members: "add" }, batch_document_ids: [@asset2, @asset3]
+      put :update, id: collection, collection: { members: "add" }, batch_document_ids: [@asset2, @asset3]
       expect(assigns[:collection].members).to match_array [@asset2, @asset3]
 
       # Remove from collection (un-sets collection on members)
-      put :update, id: @collection, collection: { members:"remove" }, batch_document_ids: [@asset2]
+      put :update, id: collection, collection: { members:"remove" }, batch_document_ids: [@asset2]
       expect(assigns[:collection].members).to_not include(@asset2)
     end
 
     context "when moving members between collections" do
       before do
-        @collection.members = [@asset1, @asset2, @asset3]
-        @collection.save
+        collection.members = [@asset1, @asset2, @asset3]
+        collection.save!
       end
       let(:collection2) do
         Collection.create do |col|
@@ -182,9 +193,9 @@ describe CollectionsController, :type => :controller do
       end
 
       it "moves the members" do
-        put :update, id: @collection, collection: {members: "move"},
+        put :update, id: collection, collection: {members: "move"},
           destination_collection_id: collection2, batch_document_ids: [@asset2, @asset3]
-        expect(@collection.reload.members).to eq [@asset1]
+        expect(collection.reload.members).to eq [@asset1]
         expect(collection2.reload.members).to match_array [@asset2, @asset3]
       end
     end
@@ -192,34 +203,34 @@ describe CollectionsController, :type => :controller do
 
   describe "#destroy" do
     describe "valid collection" do
+      let!(:collection) { FactoryGirl.create(:collection, user: user) }
       before do
-        @collection = Collection.create { |c| c.apply_depositor_metadata(user.user_key) }
         expect(controller).to receive(:authorize!).and_return(true)
       end
 
       it "deletes the collection" do
-        delete :destroy, id: @collection
+        delete :destroy, id: collection
         expect(response).to redirect_to Rails.application.routes.url_helpers.search_catalog_path
         expect(flash[:notice]).to eq("Collection was successfully deleted.")
       end
 
       it "calls after_destroy" do
         expect(controller).to receive(:after_destroy).and_call_original
-        delete :destroy, id: @collection
+        delete :destroy, id: collection
       end
 
       it "updates members" do
         asset1 = GenericWork.create!
-        @collection.members << asset1
-        @collection.save!
-        expect(asset1.in_collections).to eq [@collection]
+        collection.members << asset1
+        collection.save!
+        expect(asset1.in_collections).to eq [collection]
 
-        delete :destroy, id: @collection
+        delete :destroy, id: collection
         expect(asset1.in_collections).to eq []
       end
     end
 
-    it "should not delete an invalid collection" do
+    it "does not delete an invalid collection" do
        expect {delete :destroy, id: 'zz:-1'}.to raise_error
     end
   end
@@ -230,11 +241,11 @@ describe CollectionsController, :type => :controller do
     end
 
     context "when there are no assets in the collection" do
-      let(:collection) { Collection.create(title: "Empty collection") }
+      let(:collection) { FactoryGirl.create(:collection) }
       it "shows no assets" do
         get :show, id: collection
         expect(response).to be_successful
-        expect(assigns[:collection].title).to eq("Empty collection")
+        expect(assigns[:collection]).to eq collection
         expect(assigns[:member_docs]).to be_empty
       end
     end
@@ -244,15 +255,12 @@ describe CollectionsController, :type => :controller do
       let(:asset2) { GenericWork.create!(title: "Second of the Assets", read_users: [user.user_key]) }
       let(:asset3) { GenericWork.create!(title: "Third of the Assets", read_users: [user.user_key]) }
       let!(:collection) do
-        Collection.create!(id: "abc123", title: "My collection",
-                           members: [asset1, asset2, asset3]) do |col|
-          col.apply_depositor_metadata(user.user_key)
-        end
+        FactoryGirl.create(:collection, members: [asset1, asset2, asset3], user: user)
       end
 
       # NOTE: This test depends on title_tesim being in the qf in solrconfig.xml
       it "queries the collections" do
-        get :show, id: collection, cq:"\"#{asset1.title}\""
+        get :show, id: collection, cq: "First"
         expect(assigns[:collection].title).to eq collection.title
         expect(assigns[:member_docs].map(&:id)).to match_array [asset1.id]
       end
@@ -266,9 +274,7 @@ describe CollectionsController, :type => :controller do
       describe "additional collections" do
         let(:asset4) { GenericWork.create!(title: "#{asset1.id}", read_users: [user.user_key]) }
         let!(:collection2) do
-          Collection.create!(id: "abc1234", title: "Other collection", members: [asset4]) do |col|
-            col.apply_depositor_metadata(user.user_key)
-          end
+          FactoryGirl.create(:collection, members: [asset4], user: user)
         end
         it "shows only the collections assets" do
           get :show, id: collection

data/spec/controllers/other_collections_controller_spec.rb

@@ -30,7 +30,7 @@ describe OtherCollectionsController, :type => :controller do
     let(:asset2) { Member.create!(read_users: [user.user_key]) }
     let(:asset3) { Member.create!(read_users: [user.user_key]) }
     let(:collection) do
-      OtherCollection.create(id: 'foo123', title: "My collection",
+      OtherCollection.create(id: 'foo123', title: ["My collection"],
                              members: [asset1, asset2, asset3]) do |collection|
         collection.apply_depositor_metadata(user.user_key)
       end

data/spec/controllers/selects_collections_spec.rb

@@ -19,37 +19,37 @@ describe SelectsCollectionsController, :type => :controller do
   end
 
   describe "Select Collections" do
-    before do
-      @user = FactoryGirl.find_or_create(:user)
-      @collection = Collection.new title:"Test Public"
-      @collection.apply_depositor_metadata(@user.user_key)
-      @collection.read_groups = ["public"]
-      @collection.save
-      @collection2 = Collection.new title:"Test Read"
-      @collection2.apply_depositor_metadata('abc123@test.com')
-      @collection2.read_users = [@user.user_key]
-      @collection2.save
-      @collection3 = Collection.new title:"Test Edit"
-      @collection3.apply_depositor_metadata('abc123@test.com')
-      @collection3.edit_users = [@user.user_key]
-      @collection3.save
-      @collection4 = Collection.new title:"Test No Access"
-      @collection4.apply_depositor_metadata('abc123@test.com')
-      @collection4.save
-    end
+    let(:user) { FactoryGirl.create(:user) }
+    let!(:collection) { FactoryGirl.create(:collection, read_groups: ['public'], user: user) }
+    let!(:collection2) { FactoryGirl.create(:collection, read_users: [user.user_key]) }
+    let!(:collection3) { FactoryGirl.create(:collection, edit_users: [user.user_key]) }
+    let!(:collection4) { FactoryGirl.create(:collection) }
+    # # collection = Collection.new title:"Test Public"
+    # # collection.apply_depositor_metadata(@user.user_key)
+    # # collection.read_groups = ["public"]
+    # # collection.save
+    # collection2 = Collection.new title:"Test Read"
+    # collection2.apply_depositor_metadata('abc123@test.com')
+    # collection2.read_users = [@user.user_key]
+    # collection2.save
+    # collection3 = Collection.new title:"Test Edit"
+    # collection3.apply_depositor_metadata('abc123@test.com')
+    # collection3.edit_users = [@user.user_key]
+    # collection3.save
+    # collection4 = Collection.new title:"Test No Access"
+    # collection4.apply_depositor_metadata('abc123@test.com')
+    # collection4.save
 
     describe "Public Access" do
-      it "should only return public collections" do
+      it "only returns public collections" do
         subject.find_collections
-        expect(assigns[:user_collections].map(&:id)).to match_array [@collection.id]
+        expect(assigns[:user_collections].map(&:id)).to match_array [collection.id]
       end
 
       context "when there are more than 10" do
         before do
           11.times do |i|
-            Collection.create(title:"Test Public #{i}", read_groups: ["public"]) do |col|
-              col.apply_depositor_metadata(@user.user_key)
-            end
+            FactoryGirl.create(:collection, read_groups: ["public"], user: user)
           end
         end
 
@@ -67,33 +67,33 @@ describe SelectsCollectionsController, :type => :controller do
         end
       end
       describe "signed in" do
-        before { sign_in @user }
+        before { sign_in user }
 
-        it "should return only public and read access (edit access implies read) collections" do
+        it "only returns public and read access (edit access implies read) collections" do
           subject.find_collections_with_read_access
-          expect(assigns[:user_collections].map(&:id)).to match_array [@collection.id, @collection2.id, @collection3.id]
+          expect(assigns[:user_collections].map(&:id)).to match_array [collection.id, collection2.id, collection3.id]
         end
       end
     end
 
     describe "Edit Access" do
       describe "not signed in" do
-        it "should error if the user is not signed in" do
+        it "errors if the user is not signed in" do
           expect { subject.find_collections_with_edit_access }.to raise_error
         end
       end
 
       describe "signed in" do
-        before { sign_in @user }
+        before { sign_in user }
 
-        it "returns only public or editable collections" do
+        it "only returns public or editable collections" do
           subject.find_collections_with_edit_access
-          expect(assigns[:user_collections].map(&:id)).to match_array [@collection.id, @collection3.id]
+          expect(assigns[:user_collections].map(&:id)).to match_array [collection.id, collection3.id]
         end
 
-        it "returns only public or editable collections & instructions" do
+        it "only returns public or editable collections & instructions" do
           subject.find_collections_with_edit_access(true)
-          expect(assigns[:user_collections].map(&:id)).to match_array [-1, @collection.id, @collection3.id]
+          expect(assigns[:user_collections].map(&:id)).to match_array [-1, collection.id, collection3.id]
         end
 
         context "after querying for read access" do
@@ -103,7 +103,7 @@ describe SelectsCollectionsController, :type => :controller do
           end
 
           it "returns collections with edit access" do
-            expect(assigns[:user_collections].map(&:id)).to match_array [@collection.id, @collection3.id]
+            expect(assigns[:user_collections].map(&:id)).to match_array [collection.id, collection3.id]
           end
         end
       end

data/spec/factories.rb

@@ -1,4 +1,13 @@
 FactoryGirl.define do
-  factory :collection 
+  factory :collection do
+    transient do
+      user { FactoryGirl.create(:user) }
+    end
+    title ['test collection']
+
+    after(:build) do |work, evaluator|
+      work.apply_depositor_metadata(evaluator.user.user_key)
+    end
+  end
 end