curation_concerns 0.1.0 → 0.2.0

data/spec/controllers/embargoes_controller_spec.rb

@@ -1,91 +1,88 @@
 require 'spec_helper'
 
 describe EmbargoesController do
-  let(:user) { FactoryGirl.create(:user) }
-  let(:a_work) { FactoryGirl.create(:generic_work, user: user) }
-  let(:not_my_work) { FactoryGirl.create(:generic_work) }
+  let(:user) { create(:user) }
+  let(:a_work) { create(:generic_work, user: user) }
+  let(:not_my_work) { create(:generic_work) }
 
   before { sign_in user }
 
-  describe "#index" do
-    context "when I am NOT a repository manager" do
-      it "should redirect" do
+  describe '#index' do
+    context 'when I am NOT a repository manager' do
+      it 'redirects' do
         get :index
         expect(response).to redirect_to root_path
       end
     end
-    context "when I am a repository manager" do
+    context 'when I am a repository manager' do
       before { allow_any_instance_of(User).to receive(:groups).and_return(['admin']) }
-      it "should show me the page" do
+      it 'shows me the page' do
         get :index
         expect(response).to be_success
       end
     end
   end
 
-  describe "#edit" do
-    context "when I do not have edit permissions for the object" do
-      it "should redirect" do
+  describe '#edit' do
+    context 'when I do not have edit permissions for the object' do
+      it 'redirects' do
         get :edit, id: not_my_work
         expect(response.status).to eq 302
         expect(flash[:alert]).to eq 'You are not authorized to access this page.'
       end
     end
-    context "when I have permission to edit the object" do
-      it "should show me the page" do
+    context 'when I have permission to edit the object' do
+      it 'shows me the page' do
         get :edit, id: a_work
         expect(response).to be_success
       end
     end
   end
 
-
-
-  describe "#destroy" do
-    context "when I do not have edit permissions for the object" do
-      it "should deny access" do
+  describe '#destroy' do
+    context 'when I do not have edit permissions for the object' do
+      it 'denies access' do
         get :destroy, id: not_my_work
-        expect(response).to fail_redirect_and_flash(root_path, 'You are not authorized to access this page.') 
+        expect(response).to fail_redirect_and_flash(root_path, 'You are not authorized to access this page.')
       end
     end
 
-    context "when I have permission to edit the object" do
+    context 'when I have permission to edit the object' do
       before do
-        expect(ActiveFedora::Base).to receive(:find).with(a_work.id).and_return(a_work)
-        a_work.visibility = Hydra::AccessControls::AccessRight::VISIBILITY_TEXT_VALUE_AUTHENTICATED
-        a_work.visibility_during_embargo = Hydra::AccessControls::AccessRight::VISIBILITY_TEXT_VALUE_AUTHENTICATED
-        a_work.visibility_after_embargo = Hydra::AccessControls::AccessRight::VISIBILITY_TEXT_VALUE_PUBLIC
-        a_work.embargo_release_date = release_date.to_s
-        a_work.save(validate: false)
-        get :destroy, id: a_work
+        expect(CurationConcerns::EmbargoActor).to receive(:new).with(a_work).and_return(actor)
       end
 
-      context "with an active embargo" do
-        let(:release_date) { Date.today+2 }
+      let(:actor) { double }
 
-        it "should deactivate embargo without updating visibility and redirect" do
-          expect(a_work.visibility).to eq Hydra::AccessControls::AccessRight::VISIBILITY_TEXT_VALUE_AUTHENTICATED
+      context 'that has no files' do
+        it 'deactivates embargo and redirects' do
+          expect(actor).to receive(:destroy)
+          get :destroy, id: a_work
           expect(response).to redirect_to edit_embargo_path(a_work)
         end
       end
 
-      context "with an expired embargo" do
-        let(:release_date) { Date.today-2 }
+      context 'that has files' do
+        before do
+          a_work.members << create(:file_set)
+          a_work.save!
+        end
 
-        it "should deactivate embargo, update the visibility and redirect" do
-          expect(a_work.visibility).to eq Hydra::AccessControls::AccessRight::VISIBILITY_TEXT_VALUE_PUBLIC
+        it 'deactivates embargo and checks to see if we want to copy the visibility to files' do
+          expect(actor).to receive(:destroy)
+          get :destroy, id: a_work
           expect(response).to redirect_to confirm_curation_concerns_permission_path(a_work)
         end
       end
     end
   end
 
-  describe "#update" do
-    context "when I have permission to edit the object" do
-      let(:a_file) { FactoryGirl.create(:generic_file, visibility: Hydra::AccessControls::AccessRight::VISIBILITY_TEXT_VALUE_AUTHENTICATED) }
-      let(:release_date) { Date.today+2 }
+  describe '#update' do
+    context 'when I have permission to edit the object' do
+      let(:file_set) { create(:file_set, visibility: Hydra::AccessControls::AccessRight::VISIBILITY_TEXT_VALUE_AUTHENTICATED) }
+      let(:release_date) { Date.today + 2 }
       before do
-        a_work.generic_files << a_file
+        a_work.members << file_set
         a_work.visibility = Hydra::AccessControls::AccessRight::VISIBILITY_TEXT_VALUE_AUTHENTICATED
         a_work.visibility_during_embargo = Hydra::AccessControls::AccessRight::VISIBILITY_TEXT_VALUE_AUTHENTICATED
         a_work.visibility_after_embargo = Hydra::AccessControls::AccessRight::VISIBILITY_TEXT_VALUE_PUBLIC
@@ -94,18 +91,12 @@ describe EmbargoesController do
         a_work.save(validate: false)
       end
 
-      it "should copy visibility from curation_concern to all of the identified files" do
-        pending "Is this ever used?  If so, write this test!"
-        fail
-        patch :update, batch_document_ids: [a_work.id], embargoes: { "0" => { copy_visibility: a_work.id} }
-      end
-
-      context "with an expired embargo" do
-        let(:release_date) { Date.today-2 }
-        it "should deactivate embargo, update the visibility and redirect" do
-          patch :update, batch_document_ids: [a_work.id], embargoes: { "0" => { copy_visibility: a_work.id} }
+      context 'with an expired embargo' do
+        let(:release_date) { Date.today - 2 }
+        it 'deactivates embargo, update the visibility and redirect' do
+          patch :update, batch_document_ids: [a_work.id], embargoes: { '0' => { copy_visibility: a_work.id } }
           expect(a_work.reload.visibility).to eq Hydra::AccessControls::AccessRight::VISIBILITY_TEXT_VALUE_PUBLIC
-          expect(a_file.reload.visibility).to eq Hydra::AccessControls::AccessRight::VISIBILITY_TEXT_VALUE_PUBLIC
+          expect(file_set.reload.visibility).to eq Hydra::AccessControls::AccessRight::VISIBILITY_TEXT_VALUE_PUBLIC
           expect(response).to redirect_to embargoes_path
         end
       end

data/spec/controllers/leases_controller_spec.rb

@@ -1,93 +1,104 @@
 require 'spec_helper'
 
 describe LeasesController do
-  let(:user) { FactoryGirl.create(:user) }
-  let(:a_work) { FactoryGirl.create(:generic_work, user: user) }
-  let(:not_my_work) { FactoryGirl.create(:generic_work) }
+  let(:user) { create(:user) }
+  let(:a_work) { create(:generic_work, user: user) }
+  let(:not_my_work) { create(:generic_work) }
 
   before { sign_in user }
 
-  describe "#index" do
-    context "when I am NOT a repository manager" do
-      it "should redirect" do
+  describe '#index' do
+    context 'when I am NOT a repository manager' do
+      it 'redirects' do
         get :index
         expect(response).to redirect_to root_path
       end
     end
-    context "when I am a repository manager" do
+    context 'when I am a repository manager' do
       before { allow_any_instance_of(User).to receive(:groups).and_return(['admin']) }
-      it "should show me the page" do
+      it 'shows me the page' do
         get :index
         expect(response).to be_success
       end
     end
   end
 
-  describe "#edit" do
-    context "when I do not have edit permissions for the object" do
-      it "should redirect" do
+  describe '#edit' do
+    context 'when I do not have edit permissions for the object' do
+      it 'redirects' do
         get :edit, id: not_my_work
         expect(response.status).to eq 302
         expect(flash[:alert]).to eq 'You are not authorized to access this page.'
       end
     end
-    context "when I have permission to edit the object" do
-      it "should show me the page" do
+    context 'when I have permission to edit the object' do
+      it 'shows me the page' do
         get :edit, id: a_work
         expect(response).to be_success
       end
     end
   end
 
-
-
-  describe "#destroy" do
-    context "when I do not have edit permissions for the object" do
-      it "should deny access" do
+  describe '#destroy' do
+    context 'when I do not have edit permissions for the object' do
+      it 'denies access' do
         get :destroy, id: not_my_work
         expect(response).to fail_redirect_and_flash(root_path, 'You are not authorized to access this page.')
       end
     end
 
-    context "when I have permission to edit the object" do
+    context 'when I have permission to edit the object' do
+      let(:actor) { double('lease actor') }
       before do
-        expect(ActiveFedora::Base).to receive(:find).with(a_work.id).and_return(a_work)
-        a_work.visibility_during_lease = Hydra::AccessControls::AccessRight::VISIBILITY_TEXT_VALUE_PUBLIC
-        a_work.visibility_after_lease = Hydra::AccessControls::AccessRight::VISIBILITY_TEXT_VALUE_PRIVATE
-        a_work.lease_expiration_date = release_date.to_s
-        expect(CurationConcerns.queue).to receive(:push).with(an_instance_of(VisibilityCopyWorker))
-        get :destroy, id: a_work
+        allow(CurationConcerns::LeaseActor).to receive(:new).with(a_work).and_return(actor)
       end
 
-      context "with an active lease" do
-        let(:release_date) { Date.today+2 }
-        it "should deactivate the lease without updating visibility and redirect" do
-          expect(a_work.visibility).to eq Hydra::AccessControls::AccessRight::VISIBILITY_TEXT_VALUE_PUBLIC
+      context 'that has no files' do
+        it 'deactivates the lease and redirects' do
+          expect(actor).to receive(:destroy)
+          get :destroy, id: a_work
           expect(response).to redirect_to edit_lease_path(a_work)
         end
       end
 
-      context "with an expired lease" do
-        let(:release_date) { Date.today-2 }
+      context 'with files' do
+        before do
+          a_work.members << create(:file_set)
+          a_work.save!
+        end
 
-        it "should deactivate the lease, update the visibility and redirect" do
-          expect(a_work.visibility).to eq Hydra::AccessControls::AccessRight::VISIBILITY_TEXT_VALUE_PRIVATE
-          expect(response).to redirect_to edit_lease_path(a_work)
+        it 'deactivates the lease and redirects' do
+          expect(actor).to receive(:destroy)
+          get :destroy, id: a_work
+          expect(response).to redirect_to confirm_curation_concerns_permission_path(a_work)
         end
       end
     end
   end
 
-  describe "#update" do
-    context "when I have permission to edit the object" do
+  describe '#update' do
+    context 'when I have permission to edit the object' do
+      let(:file_set) { create(:file_set, visibility: Hydra::AccessControls::AccessRight::VISIBILITY_TEXT_VALUE_PUBLIC) }
+      let(:expiration_date) { Date.today + 2 }
+
       before do
-        expect(ActiveFedora::Base).to receive(:find).with(a_work.id).and_return(a_work)
+        a_work.members << file_set
+        a_work.visibility = Hydra::AccessControls::AccessRight::VISIBILITY_TEXT_VALUE_AUTHENTICATED
+        a_work.visibility_during_lease = Hydra::AccessControls::AccessRight::VISIBILITY_TEXT_VALUE_PUBLIC
+        a_work.visibility_after_lease = Hydra::AccessControls::AccessRight::VISIBILITY_TEXT_VALUE_AUTHENTICATED
+        a_work.lease_expiration_date = expiration_date.to_s
+        a_work.lease.save(validate: false)
+        a_work.save(validate: false)
       end
-      it "should deactivate lease and redirect" do
-        expect(a_work).to receive(:deactivate_lease!)
-        expect(a_work).to receive(:save)
-        patch :update, batch_document_ids: [a_work.id]
-        expect(response).to redirect_to leases_path
+
+      context 'with an expired lease' do
+        let(:expiration_date) { Date.today - 2 }
+        it 'deactivates lease, update the visibility and redirect' do
+          patch :update, batch_document_ids: [a_work.id], leases: { '0' => { copy_visibility: a_work.id } }
+          expect(a_work.reload.visibility).to eq Hydra::AccessControls::AccessRight::VISIBILITY_TEXT_VALUE_AUTHENTICATED
+          expect(file_set.reload.visibility).to eq Hydra::AccessControls::AccessRight::VISIBILITY_TEXT_VALUE_AUTHENTICATED
+          expect(response).to redirect_to leases_path
+        end
       end
     end
   end

data/spec/controllers/upload_sets_controller_spec.rb

@@ -0,0 +1,76 @@
+require 'spec_helper'
+
+describe UploadSetsController do
+  let(:user) { FactoryGirl.find_or_create(:jill) }
+  let(:other_user) { FactoryGirl.find_or_create(:curator) }
+  before do
+    sign_in user
+    allow_any_instance_of(User).to receive(:groups).and_return([])
+  end
+  describe "#update" do
+    let(:upload_set_update_message) { double('upload_set update message') }
+    let(:upload_set) { UploadSet.create }
+    context "when successful" do
+      it "enqueues a upload_set job and redirects to generic_works list with a flash message" do
+        expect(UploadSetUpdateJob).to receive(:perform_later).with(user.user_key, upload_set.id, { '1' => 'foo' },
+                                                                   { tag: [] }, 'open').once
+        post :update, id: upload_set.id, title: { '1' => 'foo' }, visibility: 'open', file_set: { tag: [""] }
+        expect(response).to redirect_to routes.url_helpers.curation_concerns_generic_works_path
+        expect(flash[:notice]).to include("Your files are being processed")
+      end
+    end
+
+    describe "when user has edit permissions on a file" do
+      # TODO: all these tests could move to upload_set_update_job_spec.rb
+      let!(:file) { FileSet.create(upload_set: upload_set) { |f| f.apply_depositor_metadata(user) } }
+
+      it "they can set public read access" do
+        post :update, id: upload_set, visibility: "open", file_set: { tag: [""] }
+        expect(file.reload.read_groups).to eq ['public']
+      end
+
+      it "they can set metadata like title" do
+        post :update, id: upload_set, file_set: { tag: ["footag", "bartag"] }, title: { file.id => ["New Title"] }
+        file.reload
+        expect(file.title).to eq ["New Title"]
+        # TODO: is order important?
+        expect(file.tag).to include("footag", "bartag")
+      end
+
+      it "they cannot set any tags" do
+        post :update, id: upload_set, file_set: { tag: [""] }
+        expect(file.reload.tag).to be_empty
+      end
+    end
+
+    describe "when user does not have edit permissions on a file" do
+      # TODO: all these tests could move to upload_set_update_job_spec.rb
+      let(:file) do
+        FileSet.new(upload_set: upload_set, title: ['Original Title']) do |f|
+          f.apply_depositor_metadata('someone_else')
+          f.save!
+        end
+      end
+
+      it "they cannot modify the object" do
+        post :update, id: upload_set, "file_set" => { "tag" => [""] },
+                      "title" => { file.id => "Title Wont Change" }
+        file.reload
+        expect(file.title).to eq ["Original Title"]
+      end
+    end
+  end
+
+  describe "#edit" do
+    let(:us1) { UploadSet.create }
+    let!(:file) { FileSet.create(upload_set: us1, label: 'f1') { |f| f.apply_depositor_metadata(user) } }
+    let!(:file2) { FileSet.create(upload_set: us1, label: 'f2') { |f| f.apply_depositor_metadata(user) } }
+
+    it "sets up attributes for the form" do
+      get :edit, id: us1
+      expect(assigns[:form]).not_to be_persisted
+      expect(assigns[:form].creator[0]).to eq user.user_key
+      expect(assigns[:form].title[0]).to eq 'f1'
+    end
+  end
+end

data/spec/controllers/welcome_controller_spec.rb

@@ -0,0 +1,12 @@
+require 'spec_helper'
+
+describe WelcomeController do
+  describe '#index' do
+    before { get :index }
+
+    it 'displays the welcome page' do
+      expect(response).to be_success
+      expect(response).to render_template :index
+    end
+  end
+end

data/spec/factories/collections.rb

@@ -6,10 +6,14 @@ FactoryGirl.define do
       user { FactoryGirl.create(:user) }
     end
 
-    title "Test collection title"
+    title 'Test collection title'
 
     after(:build) do |collection, evaluator|
       collection.apply_depositor_metadata(evaluator.user.user_key)
     end
+
+    trait :public do
+      visibility Hydra::AccessControls::AccessRight::VISIBILITY_TEXT_VALUE_PUBLIC
+    end
   end
 end

data/spec/factories/{generic_files.rb → file_sets.rb}

@@ -1,7 +1,7 @@
 FactoryGirl.define do
-  # The ::GenericFile model is defined in spec/internal/app/models by the
+  # The ::FileSet model is defined in spec/internal/app/models by the
   # curation_concerns:install generator.
-  factory :generic_file, class: GenericFile do
+  factory :file_set, class: FileSet do
     transient do
       user { FactoryGirl.create(:user) }
       content nil
@@ -9,19 +9,19 @@ FactoryGirl.define do
 
     after(:create) do |file, evaluator|
       if evaluator.content
-        Hydra::Works::UploadFileToGenericFile.call(file, evaluator.content)
+        Hydra::Works::UploadFileToFileSet.call(file, evaluator.content)
       end
     end
 
     factory :file_with_work do
-      after(:build) do |file, evaluator|
+      after(:build) do |file, _evaluator|
         file.title = ['testfile']
       end
       after(:create) do |file, evaluator|
         if evaluator.content
-          Hydra::Works::UploadFileToGenericFile.call(file, evaluator.content)
+          Hydra::Works::UploadFileToFileSet.call(file, evaluator.content)
         end
-        FactoryGirl.create(:generic_work, user: evaluator.user).generic_files << file
+        FactoryGirl.create(:generic_work, user: evaluator.user).members << file
       end
     end
     after(:build) do |file, evaluator|

data/spec/factories/generic_works.rb

@@ -6,26 +6,25 @@ FactoryGirl.define do
       user { FactoryGirl.create(:user) }
     end
 
-    title ["Test title"]
+    title ['Test title']
     visibility Hydra::AccessControls::AccessRight::VISIBILITY_TEXT_VALUE_PRIVATE
 
     after(:build) do |work, evaluator|
       work.apply_depositor_metadata(evaluator.user.user_key)
     end
 
-
     factory :public_generic_work do
       visibility Hydra::AccessControls::AccessRight::VISIBILITY_TEXT_VALUE_PUBLIC
     end
 
     factory :work_with_one_file do
       before(:create) do |work, evaluator|
-        work.generic_files << FactoryGirl.create(:generic_file, user: evaluator.user, title:['A Contained Generic File'], filename:['filename.pdf'])
+        work.ordered_members << FactoryGirl.create(:file_set, user: evaluator.user, title: ['A Contained Generic File'], filename: 'filename.pdf')
       end
     end
 
     factory :work_with_files do
-      before(:create) { |work, evaluator| 2.times { work.generic_files << FactoryGirl.create(:generic_file, user: evaluator.user) } }
+      before(:create) { |work, evaluator| 2.times { work.ordered_members << FactoryGirl.create(:file_set, user: evaluator.user) } }
     end
 
     factory :with_embargo_date do
@@ -38,7 +37,7 @@ FactoryGirl.define do
 
       factory :embargoed_work_with_files do
         after(:build) { |work, evaluator| work.apply_embargo(evaluator.embargo_date, Hydra::AccessControls::AccessRight::VISIBILITY_TEXT_VALUE_PRIVATE, Hydra::AccessControls::AccessRight::VISIBILITY_TEXT_VALUE_PUBLIC) }
-        after(:create) { |work, evaluator| 2.times { work.generic_files << FactoryGirl.create(:generic_file, user: evaluator.user) } }
+        after(:create) { |work, evaluator| 2.times { work.ordered_members << FactoryGirl.create(:file_set, user: evaluator.user) } }
       end
 
       factory :leased_work do
@@ -47,7 +46,7 @@ FactoryGirl.define do
 
       factory :leased_work_with_files do
         after(:build) { |work, evaluator| work.apply_lease(evaluator.embargo_date, Hydra::AccessControls::AccessRight::VISIBILITY_TEXT_VALUE_PUBLIC, Hydra::AccessControls::AccessRight::VISIBILITY_TEXT_VALUE_PRIVATE) }
-        after(:create) { |work, evaluator| 2.times { work.generic_files << FactoryGirl.create(:generic_file, user: evaluator.user) } }
+        after(:create) { |work, evaluator| 2.times { work.ordered_members << FactoryGirl.create(:file_set, user: evaluator.user) } }
       end
     end
   end

data/spec/factories/users.rb

@@ -1,12 +1,12 @@
 FactoryGirl.define do
   factory :user do
-    sequence(:email) {|n| "email-#{srand}@test.com" }
+    sequence(:email) { |_n| "email-#{srand}@test.com" }
     password 'a password'
     password_confirmation 'a password'
     factory :admin do
       after(:build) do |user|
         def user.groups
-          ["admin"]
+          ['admin']
         end
       end
     end
@@ -22,7 +22,5 @@ FactoryGirl.define do
     factory :curator do
       email 'curator1@example.com'
     end
-
   end
-
 end

data/spec/features/add_file_spec.rb

@@ -1,30 +1,29 @@
 require 'spec_helper'
 
-describe "Add an attached file" do
-  let(:user) { FactoryGirl.create(:user) }
-  let!(:work) { FactoryGirl.create(:work, user: user) }
+describe 'Add an attached file' do
+  let(:user) { create(:user) }
+  let!(:work) { create(:work, user: user) }
 
   before do
     sign_in user
     # stub out characterization. Travis doesn't have fits installed, and it's not relevant to the test.
-    s2 = double('resque message')
-    expect(CharacterizeJob).to receive(:new).and_return(s2)
-    expect(CurationConcerns.queue).to receive(:push).with(s2).once
+    allow(CharacterizeJob).to receive(:perform_later)
+    allow_any_instance_of(CurationConcerns::FileSetActor).to receive(:acquire_lock_for).and_yield
   end
 
-  it "should update the file" do
+  it 'updates the file' do
     visit "/concern/generic_works/#{work.id}"
     click_link 'Attach a File'
 
-    within("form.new_generic_file") do
-      fill_in("Title", with: 'image.png')
-      attach_file("Upload a file", fixture_file_path('files/image.png'))
-      click_on("Attach to Generic Work")
+    within('form.new_file_set') do
+      fill_in('Title', with: 'image.png')
+      attach_file('Upload a file', fixture_file_path('files/image.png'))
+      click_on('Attach to Generic Work')
     end
 
     visit "/concern/generic_works/#{work.id}"
     within '.related_files' do
-      expect(page).to have_link "image.png"
+      expect(page).to have_link 'image.png'
     end
   end
 end

data/spec/features/catalog_search_spec.rb

@@ -0,0 +1,43 @@
+require 'spec_helper'
+
+feature 'Catalog index page' do
+  let!(:work) { create(:public_generic_work, title: ['My Work']) }
+  let!(:coll) { create(:collection, :public, title: 'My Collection') }
+
+  scenario 'Browse the catalog using filter tabs' do
+    visit catalog_index_path
+
+    # Filter on Works
+    within '#type-tabs' do
+      click_on 'Works'
+    end
+
+    expect(page).to have_selector('#documents .document', count: 1)
+    within '#documents' do
+      expect(page).to have_link 'My Work'
+      expect(page).to_not have_link 'My Collection'
+    end
+
+    # Filter on Collections
+    within '#type-tabs' do
+      click_on 'Collections'
+    end
+
+    expect(page).to have_selector('#documents .document', count: 1)
+    within '#documents' do
+      expect(page).to_not have_link 'My Work'
+      expect(page).to have_link 'My Collection'
+    end
+
+    # Filter on All
+    within '#type-tabs' do
+      click_on 'All'
+    end
+
+    expect(page).to have_selector('#documents .document', count: 2)
+    within '#documents' do
+      expect(page).to have_link 'My Work'
+      expect(page).to have_link 'My Collection'
+    end
+  end
+end