sufia 6.0.0.beta1 → 6.0.0.rc1

data/spec/controllers/batch_controller_spec.rb

@@ -11,13 +11,12 @@ describe BatchController do
     let(:batch) { Batch.create }
     context "enquing a batch job" do
       before do
-        allow(BatchUpdateJob).to receive(:new).with(user.user_key,
-                                                    hash_including('generic_file' => anything)).
-                                                    and_return(batch_update_message)
+        allow(BatchUpdateJob).to receive(:new).with(user.user_key, batch.id, {'1' => 'foo'},
+                { tag: [] }, 'open').and_return(batch_update_message)
       end
       it "should be successful" do
         expect(Sufia.queue).to receive(:push).with(batch_update_message).once
-        post :update, id: batch.id, "generic_file" => {"read_groups_string" => "", "read_users_string" => "archivist1, archivist2", "tag" => [""]}
+        post :update, id: batch.id, title: {'1' => 'foo'}, visibility: 'open', generic_file: { tag: [""] }
         expect(response).to redirect_to routes.url_helpers.dashboard_files_path
         expect(flash[:notice]).to include("Your files are being processed")
       end
@@ -25,12 +24,7 @@ describe BatchController do
 
     describe "when user has edit permissions on a file" do
       # TODO all these tests could move to batch_update_job_spec.rb
-      let!(:file) do
-        GenericFile.new(batch: batch).tap do |f|
-          f.apply_depositor_metadata(user)
-          f.save!
-        end
-      end
+      let!(:file) { GenericFile.create(batch: batch) { |f| f.apply_depositor_metadata(user) } }
 
       it "should set the groups" do
         post :update, id: batch, "generic_file"=>{"permissions_attributes"=>[{"type" => "group", "name" => "public", "access" => "read"}]}
@@ -39,37 +33,13 @@ describe BatchController do
         expect(response).to redirect_to routes.url_helpers.dashboard_files_path
       end
 
-      it "should set the users with read access" do
-        post :update, id: batch, "generic_file"=>{"read_groups_string"=>"", "read_users_string"=>"archivist1, archivist2", "tag"=>[""]}
-
-        expect(file.reload.read_users).to eq ['archivist1', 'archivist2']
-        expect(response).to redirect_to routes.url_helpers.dashboard_files_path
-      end
-
-      it "should set the groups with read access" do
-        post :update, id: batch, "generic_file"=>{"read_groups_string"=>"group1, group2", "read_users_string"=>"", "tag"=>[""]}
-        expect(file.reload.read_groups).to eq ['group1', 'group2']
-      end
-
       it "should set public read access" do
-        post :update, id: batch, "visibility"=>"open", "generic_file"=>{"read_groups_string"=>"", "read_users_string"=>"", "tag"=>[""]}
+        post :update, id: batch, visibility: "open", generic_file: { tag: [""] }
         expect(file.reload.read_groups).to eq ['public']
       end
 
-      it "should set public read access and groups at the same time" do
-        post :update, id: batch, "visibility"=>"open", "generic_file"=>{"read_groups_string"=>"group1, group2", "read_users_string"=>"", "tag"=>[""]}
-        expect(file.reload.read_groups).to eq ['group1', 'group2', 'public']
-      end
-
-      it "should set public discover access and groups at the same time" do
-        post :update, id: batch, "permission"=>{"group"=>{"public"=>"none"}}, "generic_file"=>{"read_groups_string"=>"group1, group2", "read_users_string"=>"", "tag"=>[""]}
-        file.reload
-        expect(file.read_groups).to eq ['group1', 'group2']
-        expect(file.discover_groups).to eq []
-      end
-
       it "should set metadata like title" do
-        post :update, id: batch, "generic_file"=>{"tag"=>["footag", "bartag"]}, "title"=>{file.id=>["New Title"]}
+        post :update, id: batch, generic_file: { tag: ["footag", "bartag"] }, title: { file.id => ["New Title"] }
         file.reload
         expect(file.title).to eq ["New Title"]
         # TODO is order important?
@@ -77,7 +47,7 @@ describe BatchController do
       end
 
       it "should not set any tags" do
-        post :update, id: batch, "generic_file"=>{"read_groups_string"=>"", "read_users_string"=>"archivist1", "tag"=>[""]}
+        post :update, id: batch, generic_file: { tag: [""] }
         expect(file.reload.tag).to be_empty
       end
     end
@@ -99,22 +69,20 @@ describe BatchController do
       end
     end
   end
+
   describe "#edit" do
     before do
       allow_any_instance_of(User).to receive(:display_name).and_return("Jill Z. User")
-      @b1 = Batch.new
-      @b1.save
-      @file = GenericFile.new(batch: @b1, label: 'f1')
-      @file.apply_depositor_metadata(user)
-      @file.save
-      @file2 = GenericFile.new(batch: @b1, label: 'f2')
-      @file2.apply_depositor_metadata(user)
-      @file2.save
     end
+    let(:b1) { Batch.create }
+    let!(:file) { GenericFile.create(batch: b1, label: 'f1') { |f| f.apply_depositor_metadata(user) } }
+    let!(:file2) { GenericFile.create(batch: b1, label: 'f2') { |f| f.apply_depositor_metadata(user) } }
+
     it "should default creator" do
-      get :edit, id: @b1.id
-      expect(assigns[:generic_file].creator[0]).to eq user.display_name
-      expect(assigns[:generic_file].title[0]).to eq 'f1'
+      get :edit, id: b1
+      expect(assigns[:form]).not_to be_persisted
+      expect(assigns[:form].creator[0]).to eq user.display_name
+      expect(assigns[:form].title[0]).to eq 'f1'
     end
   end
 end

data/spec/controllers/batch_edits_controller_spec.rb

@@ -34,38 +34,49 @@ describe BatchEditsController, :type => :controller do
 
     it "should set the breadcrumb trail" do
       expect(controller).to receive(:add_breadcrumb).with(I18n.t('sufia.dashboard.title'), Sufia::Engine.routes.url_helpers.dashboard_index_path)
+      expect(controller).to receive(:add_breadcrumb).with(I18n.t('sufia.dashboard.my.files'), Sufia::Engine.routes.url_helpers.dashboard_files_path)
       get :edit
     end
   end
 
   describe "update" do
+    let!(:one) do
+      GenericFile.create(creator: ["Fred"], language: ['en']) do |file|
+        file.apply_depositor_metadata('mjg36')
+      end
+    end
+
+    let!(:two) do
+      GenericFile.create(creator: ["Fred"], language: ['en']) do |file|
+        file.apply_depositor_metadata('mjg36')
+      end
+    end
+
     before do
-      @one = GenericFile.new(creator: ["Fred"], language: ['en'])
-      @one.apply_depositor_metadata('mjg36')
-      @two = GenericFile.new(creator: ["Wilma"], publisher: ['Rand McNally'], language: ['en'])
-      @two.apply_depositor_metadata('mjg36')
-      @one.save!
-      @two.save!
-      controller.batch = [@one.id, @two.id]
-      expect(controller).to receive(:can?).with(:edit, @one.id).and_return(true)
-      expect(controller).to receive(:can?).with(:edit, @two.id).and_return(true)
+      controller.batch = [one.id, two.id]
+      expect(controller).to receive(:can?).with(:edit, one.id).and_return(true)
+      expect(controller).to receive(:can?).with(:edit, two.id).and_return(true)
     end
+
     let(:mycontroller) { "my/files" }
+
     it "should be successful" do
-      put :update , update_type: "delete_all"
+      put :update, update_type: "delete_all"
       expect(response).to redirect_to(Sufia::Engine.routes.url_for(controller: "dashboard", only_path: true))
-      expect { GenericFile.find(@one.id) }.to raise_error(Ldp::Gone)
-      expect { GenericFile.find(@two.id) }.to raise_error(Ldp::Gone)
+      expect { GenericFile.find(one.id) }.to raise_error(Ldp::Gone)
+      expect { GenericFile.find(two.id) }.to raise_error(Ldp::Gone)
     end
+
     it "should redirect to the return controller" do
-      put :update , update_type: "delete_all", return_controller: mycontroller
+      put :update, update_type: "delete_all", return_controller: mycontroller
       expect(response).to redirect_to(Sufia::Engine.routes.url_for(controller: mycontroller, only_path: true))
     end
+
     it "should update the records" do
-      put :update , update_type: "update", generic_file: { subject: ["zzz"] }
+      put :update, update_type: "update", generic_file: { subject: ["zzz"] }
       expect(response).to be_redirect
-      expect(GenericFile.find(@one.id).subject).to eq ["zzz"]
-      expect(GenericFile.find(@two.id).subject).to eq ["zzz"]
+      expect(GenericFile.find(one.id).subject).to eq ["zzz"]
+      expect(GenericFile.find(two.id).subject).to eq ["zzz"]
     end
   end
 

data/spec/controllers/collections_controller_spec.rb

@@ -66,92 +66,112 @@ describe CollectionsController do
   end
 
   describe "#update" do
-    before do
-      @collection = Collection.create(title: "Collection Title") do |collection|
+    before { sign_in user }
+
+    let(:collection) do
+      Collection.create(title: "Collection Title") do |collection|
         collection.apply_depositor_metadata(user.user_key)
       end
-      @asset1 = GenericFile.new(title: ["First of the Assets"])
-      @asset1.apply_depositor_metadata(user.user_key)
-      @asset1.save
-      @asset2 = GenericFile.new(title: ["Second of the Assets"], depositor: user.user_key)
-      @asset2.apply_depositor_metadata(user.user_key)
-      @asset2.save
-      @asset3 = GenericFile.new(title: ["Third of the Assets"], depositor:'abc')
-      @asset3.apply_depositor_metadata(user.user_key)
-      @asset3.save
-      sign_in user
     end
 
-    it "should set collection on members" do
-      put :update, id: @collection, collection: {members:"add"}, batch_document_ids: [@asset3.id, @asset1.id, @asset2.id]
-      expect(response).to redirect_to routes.url_helpers.collection_path(@collection.noid)
-      expect(assigns[:collection].members).to match_array [@asset2, @asset3, @asset1]
-      asset_results = ActiveFedora::SolrService.instance.conn.get "select", params:{fq:["id:\"#{@asset2.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 @asset2.id
-      afterupdate = GenericFile.find(@asset2.id)
-      expect(doc[Solrizer.solr_name(:collection)]).to eq afterupdate.to_solr[Solrizer.solr_name(:collection)]
-      put :update, id: @collection, collection: {members:"remove"}, batch_document_ids: [@asset2]
-      asset_results = ActiveFedora::SolrService.instance.conn.get "select", params:{fq:["id:\"#{@asset2.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 @asset2.id
-      afterupdate = GenericFile.find(@asset2.id)
-      expect(doc[Solrizer.solr_name(:collection)]).to be_nil
+    context "a collections members" do
+      before do
+        @asset1 = GenericFile.new(title: ["First of the Assets"])
+        @asset1.apply_depositor_metadata(user.user_key)
+        @asset1.save
+        @asset2 = GenericFile.new(title: ["Second of the Assets"], depositor: user.user_key)
+        @asset2.apply_depositor_metadata(user.user_key)
+        @asset2.save
+        @asset3 = GenericFile.new(title: ["Third of the Assets"], depositor:'abc')
+        @asset3.apply_depositor_metadata(user.user_key)
+        @asset3.save
+      end
+
+      it "should set collection on members" do
+        put :update, id: collection, collection: {members:"add"}, batch_document_ids: [@asset3.id, @asset1.id, @asset2.id]
+        expect(response).to redirect_to routes.url_helpers.collection_path(collection.noid)
+        expect(assigns[:collection].members).to match_array [@asset2, @asset3, @asset1]
+        asset_results = ActiveFedora::SolrService.instance.conn.get "select", params:{fq:["id:\"#{@asset2.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 @asset2.id
+        afterupdate = GenericFile.find(@asset2.id)
+        expect(doc[Solrizer.solr_name(:collection)]).to eq afterupdate.to_solr[Solrizer.solr_name(:collection)]
+        put :update, id: collection, collection: {members:"remove"}, batch_document_ids: [@asset2]
+        asset_results = ActiveFedora::SolrService.instance.conn.get "select", params:{fq:["id:\"#{@asset2.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 @asset2.id
+        afterupdate = GenericFile.find(@asset2.id)
+        expect(doc[Solrizer.solr_name(:collection)]).to be_nil
+      end
+    end
+
+    context "updating a collections metadata" do
+      it "should save the metadata" do
+        put :update, id: collection, collection: { creator: ['Emily'] }
+        collection.reload
+        expect(collection.creator).to eq ['Emily']
+      end
     end
   end
 
   describe "#show" do
-    before do
-      @asset1 = GenericFile.new(title: ["First of the Assets"])
-      @asset1.apply_depositor_metadata(user.user_key)
-      @asset2 = GenericFile.new(title: ["Second of the Assets"], depositor:user.user_key)
-      @asset2.apply_depositor_metadata(user.user_key)
-      @asset3 = GenericFile.new(title: ["Third of the Assets"], depositor:user.user_key)
-      @asset3.apply_depositor_metadata(user.user_key)
-      @asset4 = GenericFile.new(title: ["Third of the Assets"], depositor:user.user_key)
-      @asset4.apply_depositor_metadata(user.user_key)
-      @collection = Collection.create(title: "My collection",
-                                   description: "My incredibly detailed description of the collection",
-                                   members: [@asset1,@asset2,@asset3]) do |collection|
-        collection.apply_depositor_metadata(user)
-      end
-      allow(controller).to receive(:authorize!).and_return(true)
+    let(:asset1) do
+      GenericFile.new(title: ["First of the Assets"]) { |a| a.apply_depositor_metadata(user) }
+    end
+
+    let(:asset2) do
+      GenericFile.new(title: ["Second of the Assets"]) { |a| a.apply_depositor_metadata(user) }
+    end
+
+    let(:asset3) do
+      GenericFile.new(title: ["Third of the Assets"]) { |a| a.apply_depositor_metadata(user) }
+    end
+
+    let!(:asset4) do
+      GenericFile.create(title: ["Fourth of the Assets"]) { |a| a.apply_depositor_metadata(user) }
+    end
+
+    let(:collection) do
+      Collection.create(title: "My collection",
+        description: "My incredibly detailed description of the collection",
+        members: [asset1, asset2, asset3]) { |c| c.apply_depositor_metadata(user) }
     end
+
     context "when signed in" do
-      before do
-        sign_in user
-      end
+      before { sign_in user }
 
       it "should return the collection and its members" do
-        get :show, id: @collection
-        expect(response).to be_successful
-        expect(assigns[:collection].title).to eq @collection.title
-        expect(assigns[:member_docs].map(&:id)).to match_array [@asset1, @asset2, @asset3].map(&:id)
-      end
-      it "should set the breadcrumb trail" do
         expect(controller).to receive(:add_breadcrumb).with(I18n.t('sufia.dashboard.title'), Sufia::Engine.routes.url_helpers.dashboard_index_path)
-        get :show, id: @collection
+        get :show, id: collection
+        expect(response).to be_successful
+        expect(assigns[:presenter]).to be_kind_of Sufia::CollectionPresenter
+        expect(assigns[:collection].title).to eq collection.title
+        expect(assigns[:member_docs].map(&:id)).to match_array [asset1, asset2, asset3].map(&:id)
       end
     end
+
     context "not signed in" do
       it "should not show me files in the collection" do
-        get :show, id: @collection
+        get :show, id: collection
         expect(assigns[:member_docs].count).to eq 0
       end
     end
   end
 
   describe "#edit" do
-    before do
-      @collection = Collection.new(title: "My collection", description: "My incredibly detailed description of the collection")
-      @collection.apply_depositor_metadata(user.user_key)
-      @collection.save
-      sign_in user
+    let(:collection) do
+      Collection.create(title: "My collection",
+        description: "My incredibly detailed description of the collection") do |c|
+        c.apply_depositor_metadata(user)
+      end
     end
+
+    before { sign_in user }
+
     it "should not show flash" do
-      get :edit, id: @collection
+      get :edit, id: collection
       expect(flash[:notice]).to be_nil
     end
   end

data/spec/controllers/generic_files_controller_spec.rb

@@ -40,9 +40,11 @@ describe GenericFilesController do
       end
 
       context "when everything is perfect" do
+        render_views
         it "spawns a content deposit event job" do
           expect_any_instance_of(Sufia::GenericFile::Actor).to receive(:create_content).with(file, 'world.png', 'content').and_return(true)
           xhr :post, :create, files: [file], 'Filename' => 'The world', batch_id: batch_id, permission: {group: { public: 'read' } }, terms_of_service: '1'
+          expect(response.body).to eq '[{"name":null,"size":"","url":"/files/test123","thumbnail_url":"test123","delete_url":"deleteme","delete_type":"DELETE"}]'
           expect(flash[:error]).to be_nil
         end
 
@@ -288,6 +290,10 @@ describe GenericFilesController do
       end
 
       it 'renders the stats view' do
+        allow(controller.request).to receive(:referer).and_return('foo')
+        expect(controller).to receive(:add_breadcrumb).with(I18n.t('sufia.dashboard.title'), Sufia::Engine.routes.url_helpers.dashboard_index_path)
+        expect(controller).to receive(:add_breadcrumb).with(I18n.t('sufia.dashboard.my.files'), Sufia::Engine.routes.url_helpers.dashboard_files_path)
+        expect(controller).to receive(:add_breadcrumb).with(I18n.t('sufia.generic_file.browse_view'), Sufia::Engine.routes.url_helpers.generic_file_path(generic_file.noid))
         get :stats, id: generic_file
         expect(response).to be_success
         expect(response).to render_template(:stats)
@@ -326,14 +332,19 @@ describe GenericFilesController do
       end
     end
 
-    it "should set the versions presenter" do
+    it "should set the breadcrumbs and versions presenter" do
+      allow(controller.request).to receive(:referer).and_return('foo')
+      expect(controller).to receive(:add_breadcrumb).with(I18n.t('sufia.dashboard.title'), Sufia::Engine.routes.url_helpers.dashboard_index_path)
+      expect(controller).to receive(:add_breadcrumb).with(I18n.t('sufia.dashboard.my.files'), Sufia::Engine.routes.url_helpers.dashboard_files_path)
+      expect(controller).to receive(:add_breadcrumb).with(I18n.t('sufia.generic_file.browse_view'), Sufia::Engine.routes.url_helpers.generic_file_path(generic_file.noid))
       get :edit, id: generic_file
 
       expect(response).to be_success
       expect(assigns[:generic_file]).to eq generic_file
+      expect(assigns[:form]).to be_kind_of Sufia::Forms::GenericFileEditForm
       expect(assigns[:version_list]).to be_kind_of Sufia::VersionListPresenter
+      expect(response).to render_template(:edit)
     end
-
   end
 
   describe "update" do
@@ -521,6 +532,10 @@ describe GenericFilesController do
         expect(assigns[:generic_file]).to eq generic_file
         expect(assigns[:audit_status]).to eq 'Audits have not yet been run on this file.'
       end
+      it 'renders an endnote file' do
+        get :show, id: generic_file, format: 'endnote'
+        expect(response).to be_successful
+      end
     end
   end
 

data/spec/controllers/users_controller_spec.rb

@@ -173,7 +173,7 @@ describe UsersController, :type => :controller do
         s1 = double('one')
         expect(UserEditProfileEventJob).to receive(:new).with(user.user_key).and_return(s1)
         expect(Sufia.queue).to receive(:push).with(s1).once
-        post :update, id: user.user_key, user: { remove_avatar: true }
+        post :update, id: user.user_key, user: { remove_avatar: 'true' }
         expect(response).to redirect_to(@routes.url_helpers.profile_path(user.to_param))
         expect(flash[:notice]).to include("Your profile has been updated")
         expect(User.find_by_user_key(user.user_key).avatar?).to be false
@@ -185,16 +185,18 @@ describe UsersController, :type => :controller do
       expect(UserEditProfileEventJob).to receive(:new).with(user.user_key).and_return(s1)
       expect(Sufia.queue).to receive(:push).with(s1).once
       expect_any_instance_of(User).to receive(:populate_attributes).once
-      post :update, id: user.user_key, user: { update_directory: true }
+      post :update, id: user.user_key, user: { update_directory: 'true' }
       expect(response).to redirect_to(@routes.url_helpers.profile_path(user.to_param))
       expect(flash[:notice]).to include("Your profile has been updated")
     end
+
     it "should set an social handles" do
       expect(user.twitter_handle).to be_blank
       expect(user.facebook_handle).to be_blank
       expect(user.googleplus_handle).to be_blank
       expect(user.linkedin_handle).to be_blank
-      post :update, id: user.user_key, user: { twitter_handle: 'twit', facebook_handle: 'face', googleplus_handle: 'goo', linkedin_handle:"link" }
+      expect(user.orcid).to be_blank
+      post :update, id: user.user_key, user: { twitter_handle: 'twit', facebook_handle: 'face', googleplus_handle: 'goo', linkedin_handle:"link", orcid: '0000-0000-1111-2222' }
       expect(response).to redirect_to(@routes.url_helpers.profile_path(user.to_param))
       expect(flash[:notice]).to include("Your profile has been updated")
       u = User.find_by_user_key(user.user_key)
@@ -202,6 +204,14 @@ describe UsersController, :type => :controller do
       expect(u.facebook_handle).to eq 'face'
       expect(u.googleplus_handle).to eq 'goo'
       expect(u.linkedin_handle).to eq 'link'
+      expect(u.orcid).to eq 'http://orcid.org/0000-0000-1111-2222'
+    end
+
+    it 'displays a flash when invalid ORCID is entered' do
+      expect(user.orcid).to be_blank
+      post :update, id: user.user_key, user: { orcid: 'foobar' }
+      expect(response).to redirect_to(@routes.url_helpers.edit_profile_path(user.to_param))
+      expect(flash[:alert]).to include('Orcid must be a string of 19 characters, e.g., "0000-0000-0000-0000"')
     end
 
     context "when removing a trophy" do