curation_concerns 0.1.0 → 0.2.0

data/spec/features/collection_spec.rb

@@ -6,16 +6,16 @@ describe 'collection' do
     click_link 'Add a Collection'
     fill_in('Title', with: title)
     fill_in('collection_description', with: description)
-    click_button("Create Collection")
+    click_button('Create Collection')
     expect(page).to have_content 'Items in this Collection'
     expect(page).to have_content title
     expect(page).to have_content description
   end
 
-  let(:title1) {"Test Collection 1"}
-  let(:description1) {"Description for collection 1 we are testing."}
-  let(:title2) {"Test Collection 2"}
-  let(:description2) {"Description for collection 2 we are testing."}
+  let(:title1) { 'Test Collection 1' }
+  let(:description1) { 'Description for collection 1 we are testing.' }
+  let(:title2) { 'Test Collection 2' }
+  let(:description2) { 'Description for collection 2 we are testing.' }
 
   let(:user) { FactoryGirl.create(:user, email: 'user1@example.com') }
   let(:user_key) { user.user_key }
@@ -28,8 +28,8 @@ describe 'collection' do
       end
     end
   end
-  let(:gw1) { generic_works[0]}
-  let(:gw2) { generic_works[1]}
+  let(:gw1) { generic_works[0] }
+  let(:gw2) { generic_works[1] }
 
   before(:all) do
     @old_resque_inline_value = Resque.inline
@@ -47,13 +47,13 @@ describe 'collection' do
       sign_in user
       visit search_path_for_my_collections
     end
-    it "should create a collection" do
-      title = "Genealogies of the American West"
-      description = "All about Genealogies of the American West"
+    it 'creates a collection' do
+      title = 'Genealogies of the American West'
+      description = 'All about Genealogies of the American West'
       click_link 'Add a Collection'
       fill_in('Title', with: title)
       fill_in('collection_description', with: description)
-      click_button("Create Collection")
+      click_button('Create Collection')
       expect(page).to have_content 'Items in this Collection'
       expect(page).to have_content title
       expect(page).to have_content description
@@ -61,55 +61,54 @@ describe 'collection' do
   end
 
   describe 'delete collection' do
-    before (:each) do
-      @collection = Collection.new title:'collection title'
+    before do
+      @collection = Collection.new title: 'collection title'
       @collection.description = 'collection description'
       @collection.apply_depositor_metadata(user_key)
       @collection.save
       sign_in user
-      visit main_app.catalog_index_path(:'f[generic_type_sim][]' => 'Collection', works: 'mine')
+      visit main_app.catalog_index_path('f[generic_type_sim][]' => 'Collection', works: 'mine')
     end
 
-    it "should delete a collection" do
+    it 'deletes a collection' do
       expect(page).to have_content(@collection.title)
       within("#document_#{@collection.id}") do
-        first(".itemtrash").click
+        first('.itemtrash').click
       end
       expect(page).to_not have_content(@collection.title)
-      expect(page).to have_content("Collection was successfully deleted.")
+      expect(page).to have_content('Collection was successfully deleted.')
     end
   end
 
   describe 'show collection' do
     before do
-      @collection = FactoryGirl.create(:collection, user:user, title: 'collection title', description:'collection description')
+      @collection = FactoryGirl.create(:collection, user: user, title: 'collection title', description: 'collection description')
       # @collection = Collection.new title: 'collection title'
       # @collection.description = ['collection description']
       # @collection.apply_depositor_metadata(user_key)
-      @collection.members = [gw1,gw2]
+      @collection.members = [gw1, gw2]
       @collection.save
       sign_in user
       visit search_path_for_my_collections
     end
 
-    it "should show a collection with a listing of Descriptive Metadata and catalog-style search results" do
+    it 'shows a collection with a listing of Descriptive Metadata and catalog-style search results' do
       expect(page).to have_content(@collection.title)
-      within('#document_'+@collection.id) do
-        click_link("collection title")
+      within('#document_' + @collection.id) do
+        click_link('collection title')
       end
       expect(page).to have_content(@collection.title)
       expect(page).to have_content(@collection.description)
       # Should have search results / contents listing
       expect(page).to have_content(gw1.title.first)
       expect(page).to have_content(gw2.title.first)
-      expect(page).to_not have_css(".pager")
-
+      expect(page).to_not have_css('.pager')
     end
 
-    it "should hide collection descriptive metadata when searching a collection" do
+    it 'hides collection descriptive metadata when searching a collection' do
       expect(page).to have_content(@collection.title)
       within("#document_#{@collection.id}") do
-        click_link("collection title")
+        click_link('collection title')
       end
       expect(page).to have_content(@collection.title)
       expect(page).to have_content(@collection.description)
@@ -118,19 +117,19 @@ describe 'collection' do
       fill_in('collection_search', with: gw1.title.first)
       click_button('collection_submit')
       # Should not have Collection Descriptive metadata table
-      expect(page).to_not have_content("Descriptions")
+      expect(page).to_not have_content('Descriptions')
       expect(page).to have_content(@collection.title)
       expect(page).to have_content(@collection.description)
       # Should have search results / contents listing
       expect(page).to have_content(gw1.title.first)
       expect(page).to_not have_content(gw2.title.first)
       # Should not have Dashboard content in contents listing
-      expect(page).to_not have_content("Visibility")
+      expect(page).to_not have_content('Visibility')
     end
   end
 
   describe 'edit collection' do
-    before (:each) do
+    before do
       @collection = Collection.new(title: 'Awesome Title')
       @collection.description = 'collection description'
       @collection.apply_depositor_metadata(user_key)
@@ -140,22 +139,22 @@ describe 'collection' do
       visit search_path_for_my_collections
     end
 
-    it "should edit and update collection metadata" do
+    it 'edits and update collection metadata' do
       expect(page).to have_content(@collection.title)
       within("#document_#{@collection.id}") do
         click_link('Edit Collection')
       end
       expect(page).to have_field('collection_title', with: @collection.title)
       expect(page).to have_field('collection_description', with: @collection.description)
-      new_title = "Altered Title"
-      new_description = "Completely new Description text."
-      creators = ["Dorje Trollo", "Vajrayogini"]
+      new_title = 'Altered Title'
+      new_description = 'Completely new Description text.'
+      creators = ['Dorje Trollo', 'Vajrayogini']
       fill_in('Title', with: new_title)
       fill_in('collection_description', with: new_description)
       fill_in('Creator', with: creators.first)
-      #within('.form-actions') do
-        click_button('Update Collection')
-      #end
+      # within('.form-actions') do
+      click_button('Update Collection')
+      # end
       expect(page).to_not have_content(@collection.title)
       expect(page).to_not have_content(@collection.description)
       expect(page).to have_content(new_title)
@@ -163,7 +162,7 @@ describe 'collection' do
       expect(page).to have_content(creators.first)
     end
 
-    it "should remove a work from a collection" do
+    it 'removes a work from a collection from edit page' do
       expect(page).to have_content(@collection.title)
       within("#document_#{@collection.id}") do
         click_link('Edit Collection')
@@ -181,10 +180,26 @@ describe 'collection' do
       expect(page).to have_content(gw2.title.first)
     end
 
-    it "should remove all works from a collection" do
-      skip "This is from Sufia, not sure if it should be here."
+    it 'removes a work from a collection from show page' do
+      expect(page).to have_content(@collection.title)
+      within('#document_' + @collection.id) do
+        click_link(@collection.title)
+      end
+      expect(page).to have_content(gw1.title.first)
+      expect(page).to have_content(gw2.title.first)
+      within("#document_#{gw1.id}") do
+        click_link('Remove From Collection')
+      end
+      expect(page).to have_content(@collection.title)
+      expect(page).to have_content(@collection.description)
+      expect(page).to_not have_content(gw1.title.first)
+      expect(page).to have_content(gw2.title.first)
+    end
+
+    it 'removes all works from a collection' do
+      skip 'This is from Sufia, not sure if it should be here.'
       expect(page).to have_content(@collection.title)
-      within('#document_'+@collection.id) do
+      within('#document_' + @collection.id) do
         click_link('Edit Collection')
       end
       expect(page).to have_field('collection_title', with: @collection.title)
@@ -201,8 +216,8 @@ describe 'collection' do
   end
 
   describe 'show pages of a collection' do
-    before (:each) do
-      @collection = Collection.new title:'collection title'
+    before do
+      @collection = Collection.new title: 'collection title'
       @collection.description = 'collection description'
       @collection.apply_depositor_metadata(user_key)
       @collection.members = generic_works
@@ -211,12 +226,12 @@ describe 'collection' do
       visit search_path_for_my_collections
     end
 
-    it "should show a collection with a listing of Descriptive Metadata and catalog-style search results" do
+    it 'shows a collection with a listing of Descriptive Metadata and catalog-style search results' do
       expect(page).to have_content(@collection.title)
-      within('#document_'+@collection.id) do
-        click_link("collection title")
+      within('#document_' + @collection.id) do
+        click_link('collection title')
       end
-      expect(page).to have_css(".pager")
+      expect(page).to have_css('.pager')
     end
   end
 end

data/spec/features/create_work_spec.rb

@@ -1,41 +1,48 @@
 require 'spec_helper'
+require 'redlock'
 
-describe "Creating a new Work" do
+describe 'Creating a new Work' do
   let(:user) { FactoryGirl.create(:user) }
 
+  let(:redlock_client_stub) { # stub out redis connection
+    client = double('redlock client')
+    allow(client).to receive(:lock).and_yield(true)
+    allow(Redlock::Client).to receive(:new).and_return(client)
+    client
+  }
+
   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
+    expect(CharacterizeJob).to receive(:perform_later)
+    redlock_client_stub
   end
 
-  it "should create the work and allow you to attach a file" do
-    visit "/concern/generic_works/new"
+  it 'creates the work and allow you to attach a file' do
+    visit '/concern/generic_works/new'
     work_title = 'My Test Work'
-    within("form.new_generic_work") do
-      fill_in("Title", with: work_title)
-      attach_file("Upload a file", fixture_file_path('files/image.png'))
-      choose("visibility_open")
-      click_on("Create Generic work")
+    within('form.new_generic_work') do
+      fill_in('Title', with: work_title)
+      attach_file('Upload a file', fixture_file_path('files/image.png'))
+      choose('visibility_open')
+      click_on('Create Generic work')
     end
     within '.related_files' do
-      expect(page).to have_link "image.png"
+      expect(page).to have_link 'image.png'
     end
 
-    title = "Genealogies of the American West"
+    title = 'Genealogies of the American West'
     click_link 'Add a Collection'
     fill_in('Title', with: title)
-    click_button("Create Collection")
-    click_on("Add files from your dashboard")
-    find("#facet-human_readable_type_sim").click_link('Generic Work')
+    click_button('Create Collection')
+    click_on('Add files from your dashboard')
+    find('#facet-human_readable_type_sim').click_link('Generic Work')
 
     # Works can be added to collections
-    within(".modal.fade", :match => :first) do
-      select title, :from => "id"
-      click_on("Add to collection")
+    within('.modal.fade', match: :first) do
+      select title, from: 'id'
+      click_on('Add to collection')
     end
     expect(page).to have_content('Collection was successfully updated.')
     expect(page).to have_content(work_title)

data/spec/features/embargo_spec.rb

@@ -5,7 +5,7 @@ describe 'embargo' do
   before do
     sign_in user
   end
-  describe "creating an embargoed object" do
+  describe 'creating an embargoed object' do
     before do
       visit '/'
     end
@@ -13,37 +13,38 @@ describe 'embargo' do
     let(:future_date) { 5.days.from_now }
     let(:later_future_date) { 10.days.from_now }
 
-    it "can be created, displayed and updated" do
+    it 'can be created, displayed and updated' do
       click_link 'New Generic Work'
       fill_in 'Title', with: 'Embargo test'
       choose 'Embargo'
-      fill_in "generic_work_embargo_release_date", with: future_date
+      fill_in 'generic_work_embargo_release_date', with: future_date
       select 'Private', from: 'Restricted to'
       select 'Open Access', from: 'then open it up to'
       click_button 'Create Generic work'
 
-      expect(page).to have_content(future_date.to_datetime.iso8601) # chosen embargo date is on the show page
+      # chosen embargo date is on the show page
+      expect(page).to have_content(future_date.to_datetime.iso8601.sub(/\+00:00/, 'Z'))
 
-      click_link "Edit This Generic Work"
-      click_link "Embargo Management Page"
+      click_link 'Edit This Generic Work'
+      click_link 'Embargo Management Page'
 
-      expect(page).to have_content("This work is under embargo.")
-      expect(page).to have_xpath("//input[@name='generic_work[embargo_release_date]' and @value='#{future_date.to_datetime.iso8601}']")  # current embargo date is pre-populated in edit field
+      expect(page).to have_content('This work is under embargo.')
+      expect(page).to have_xpath("//input[@name='generic_work[embargo_release_date]' and @value='#{future_date.to_datetime.iso8601}']") # current embargo date is pre-populated in edit field
 
-      fill_in "until", with: later_future_date.to_s
+      fill_in 'until', with: later_future_date.to_s
 
-      click_button "Update Embargo"
+      click_button 'Update Embargo'
       expect(page).to have_content(later_future_date.to_date.to_formatted_s(:long_ordinal))
     end
   end
 
-  describe "managing embargoes" do
+  describe 'managing embargoes' do
     before do
       # admin privs
       allow_any_instance_of(Ability).to receive(:user_groups).and_return(['admin'])
     end
 
-    it "should show lists of objects under lease" do
+    it 'shows lists of objects under lease' do
       visit '/embargoes'
       expect(page).to have_content 'Manage Embargoes'
     end

data/spec/features/lease_spec.rb

@@ -1,47 +1,46 @@
 require 'spec_helper'
 
-describe "leases" do
+describe 'leases' do
   let(:user) { FactoryGirl.create(:user) }
   before do
     sign_in user
   end
-  describe "create a new leased object" do
-
+  describe 'create a new leased object' do
     let(:future_date) { 5.days.from_now }
     let(:later_future_date) { 10.days.from_now }
 
-    it "can be created, displayed and updated" do
+    it 'can be created, displayed and updated' do
       visit '/'
       click_link 'New Generic Work'
       fill_in 'Title', with: 'Lease test'
       choose 'Lease'
-      fill_in "generic_work_lease_expiration_date", with: future_date
+      fill_in 'generic_work_lease_expiration_date', with: future_date
       select 'Open Access', from: 'Is available for'
       select 'Private', from: 'then restrict it to'
       click_button 'Create Generic work'
 
-      expect(page).to have_content(future_date.to_datetime.iso8601) # chosen lease date is on the show page
+      # chosen lease date is on the show page
+      expect(page).to have_content(future_date.to_datetime.iso8601.sub(/\+00:00/, 'Z'))
 
-      click_link "Edit This Generic Work"
-      click_link "Lease Management Page"
+      click_link 'Edit This Generic Work'
+      click_link 'Lease Management Page'
 
-      expect(page).to have_content("This work is under lease.")
-      expect(page).to have_xpath("//input[@name='generic_work[lease_expiration_date]' and @value='#{future_date.to_datetime.iso8601}']")  # current lease date is pre-populated in edit field
+      expect(page).to have_content('This work is under lease.')
+      expect(page).to have_xpath("//input[@name='generic_work[lease_expiration_date]' and @value='#{future_date.to_datetime.iso8601}']") # current lease date is pre-populated in edit field
 
-      fill_in "until", with: later_future_date.to_s
+      fill_in 'until', with: later_future_date.to_s
 
-      click_button "Update Lease"
-      expect(page).to have_content(later_future_date.to_date.to_formatted_s(:long_ordinal))  # new lease date is displayed in message
+      click_button 'Update Lease'
+      expect(page).to have_content(later_future_date.to_date.to_formatted_s(:long_ordinal)) # new lease date is displayed in message
     end
-
   end
 
-  describe "managing leases" do
+  describe 'managing leases' do
     before do
       # admin privs
       allow_any_instance_of(Ability).to receive(:user_groups).and_return(['admin'])
     end
-    it "should show lists of objects under lease" do
+    it 'shows lists of objects under lease' do
       visit '/leases'
       expect(page).to have_content 'Manage Leases'
     end

data/spec/features/update_file_spec.rb

@@ -1,32 +1,30 @@
 require 'spec_helper'
 
-describe "Editing attached files" do
+describe 'Editing attached files' do
   let(:user) { create(:user) }
   let!(:parent) { create(:work_with_one_file, user: user) }
-  let!(:generic_file) { parent.generic_files.first }
+  let!(:file_set) { parent.file_sets.first }
 
   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
+    expect(CharacterizeJob).to receive(:perform_later)
   end
 
-  it "updates the file" do
+  it 'updates the file' do
     visit "/concern/generic_works/#{parent.id}"
     click_link 'Edit'
     expect(page).to have_content "Updating Attached File to \"Test title\""
 
-    attach_file("Upload a file", fixture_file_path('files/image.png'))
-    click_button "Update Attached File"
+    attach_file('Upload a file', fixture_file_path('files/image.png'))
+    click_button 'Update Attached File'
 
-    expect(page).to have_content "The file A Contained Generic File has been updated."
+    expect(page).to have_content 'The file A Contained Generic File has been updated.'
 
-    #TODO this stuff belongs in an Actor or Controller test:
-    generic_file.reload
-    expect(generic_file.original_file.original_name).to eq 'image.png'
-    expect(generic_file.original_file.mime_type).to eq 'image/png'
+    # TODO: this stuff belongs in an Actor or Controller test:
+    file_set.reload
+    expect(file_set.original_file.original_name).to eq 'image.png'
+    expect(file_set.original_file.mime_type).to eq 'image/png'
   end
 end

data/spec/features/work_generator_spec.rb

@@ -1,56 +1,64 @@
 require 'spec_helper'
 require 'rails/generators'
+require 'redlock'
 
-describe "Creating a new Work" do
+describe 'Creating a new Work' do
   let(:user) { FactoryGirl.create(:user) }
 
+  let(:redlock_client_stub) { # stub out redis connection
+    client = double('redlock client')
+    allow(client).to receive(:lock).and_yield(true)
+    allow(Redlock::Client).to receive(:new).and_return(client)
+    client
+  }
+
   before do
-    Rails::Generators.invoke("curation_concerns:work", ["Catapult"], destination_root: Rails.root)
+    Rails::Generators.invoke('curation_concerns:work', ['Catapult'], destination_root: Rails.root)
     load 'spec/internal/app/models/catapult.rb'
     load 'spec/internal/app/controllers/curation_concerns/catapults_controller.rb'
     load 'spec/internal/app/actors/curation_concerns/catapult_actor.rb'
-    load 'spec/internal/config/initializers/curation_concerns_config.rb'
+    load 'spec/internal/app/forms/curation_concerns/catapult_form.rb'
+    load 'spec/internal/config/initializers/curation_concerns.rb'
     load 'spec/internal/config/routes.rb'
     load 'app/helpers/curation_concerns/url_helper.rb'
     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
+    expect(CharacterizeJob).to receive(:perform_later)
+    redlock_client_stub
   end
 
   after do
-    Rails::Generators.invoke("curation_concerns:work", ["Catapult"], behavior: :revoke, destination_root: Rails.root)
+    Rails::Generators.invoke('curation_concerns:work', ['Catapult'], behavior: :revoke, destination_root: Rails.root)
   end
 
-  it "catapults should behave like generic works" do
-    visit "/concern/catapults/new"
-    # within("form.new_generic_file") do
+  it 'catapults should behave like generic works' do
+    visit '/concern/catapults/new'
+    # within("form.new_file_set") do
     #   attach_file("Upload a file", fixture_file_path('files/image.png'))
     #   click_button "Attach to Generic Work"
     # end
     catapult_title = 'My Test Work'
-    within("form.new_catapult") do
-      fill_in("Title", with: catapult_title)
-      attach_file("Upload a file", fixture_file_path('files/image.png'))
-      choose("visibility_open")
-      click_on("Create Catapult")
+    within('form.new_catapult') do
+      fill_in('Title', with: catapult_title)
+      attach_file('Upload a file', fixture_file_path('files/image.png'))
+      choose('visibility_open')
+      click_on('Create Catapult')
     end
-    click_on("Edit This Catapult")
-    within("form.edit_catapult") do
-      fill_in("Subject", with: 'test')
-      click_on("Update Catapult")
+    click_on('Edit This Catapult')
+    within('form.edit_catapult') do
+      fill_in('Subject', with: 'test')
+      click_on('Update Catapult')
     end
-    title = "Genealogies of the American West"
+    title = 'Genealogies of the American West'
     click_link 'Add a Collection'
     fill_in('Title', with: title)
-    click_button("Create Collection")
-    click_on("Add files from your dashboard")
-    find("#facet-human_readable_type_sim").click_link('Catapult')
-    within(".modal.fade", :match => :first) do
-      select title, :from => "id"
-      click_on("Add to collection")
+    click_button('Create Collection')
+    click_on('Add files from your dashboard')
+    find('#facet-human_readable_type_sim').click_link('Catapult')
+    within('.modal.fade', match: :first) do
+      select title, from: 'id'
+      click_on('Add to collection')
     end
     expect(page).to have_content('Collection was successfully updated.')
     expect(page).to have_content(catapult_title)

data/spec/forms/collection_edit_form_spec.rb

@@ -4,17 +4,61 @@ describe CurationConcerns::Forms::CollectionEditForm do
   let(:collection) { Collection.new }
   let(:form) { described_class.new(collection) }
 
-  describe "#terms" do
-    subject { form.terms}
-    it { is_expected.to eq [:resource_type, :title, :creator, :contributor, :description,
-                            :tag, :rights, :publisher, :date_created, :subject, :language,
-                            :identifier, :based_near, :related_url] }
+  describe '#terms' do
+    subject { form.terms }
+    it do
+      is_expected.to eq [:resource_type, :title, :creator, :contributor, :description,
+                         :tag, :rights, :publisher, :date_created, :subject, :language,
+                         :identifier, :based_near, :related_url, :visibility]
+    end
+  end
+
+  describe ".build_permitted_params" do
+    subject { described_class.build_permitted_params }
+    it { is_expected.to eq [{ resource_type: [] },
+                            :title,
+                            { creator: [] },
+                            { contributor: [] },
+                            :description,
+                            { tag: [] },
+                            { rights: [] },
+                            { publisher: [] },
+                            { date_created: [] },
+                            { subject: [] },
+                            { language: [] },
+                            { identifier: [] },
+                            { based_near: [] },
+                            { related_url: [] },
+                            :visibility] }
   end
 
-  describe "unique?" do
-    context "with :title" do
-      subject { CurationConcerns::Forms::CollectionEditForm.unique?(:title) }
-      it { is_expected.to be true }
+  describe 'multiple?' do
+    context 'with :title' do
+      subject { described_class.multiple?(:title) }
+      it { is_expected.to be false }
+    end
+  end
+
+  describe '#select_files' do
+    context 'without any works/files attached' do
+      subject { form.select_files }
+      it { is_expected.to be_empty }
+    end
+
+    context 'with a work/file attached' do
+      let(:work) { create(:work_with_one_file) }
+      let(:title) { work.file_sets.first.title.first }
+      let(:file_id) { work.file_sets.first.id }
+      let(:collection_with_file) do
+        Collection.create!(title: 'foo', members: [work]) do |c|
+          c.apply_depositor_metadata('jcoyne')
+        end
+      end
+
+      it 'returns a hash of with file title as key and file id as value' do
+        form_with_files = described_class.new(collection_with_file)
+        expect(form_with_files.select_files).to eq(title => file_id)
+      end
     end
   end
 end