blacklight-spotlight 0.32.0 → 0.33.0

data/spec/factories/contact_images.rb

@@ -0,0 +1,6 @@
+FactoryGirl.define do
+  factory :contact_image, class: Spotlight::ContactImage do
+    image { Rack::Test::UploadedFile.new(File.expand_path(File.join('..', 'fixtures', 'avatar.png'), __dir__)) }
+    iiif_tilesource 'https://exhibits-stage.stanford.edu/images/78'
+  end
+end

data/spec/factories/contacts.rb

@@ -1,6 +1,9 @@
 FactoryGirl.define do
   factory :contact, class: Spotlight::Contact do
     exhibit
-    avatar { Rack::Test::UploadedFile.new(File.expand_path(File.join('..', 'fixtures', 'avatar.png'), __dir__)) }
+
+    trait :with_avatar do
+      association :avatar, factory: :contact_image
+    end
   end
 end

data/spec/factories/exhibit_thumbnails.rb

@@ -0,0 +1,6 @@
+FactoryGirl.define do
+  factory :exhibit_thumbnail, class: Spotlight::ExhibitThumbnail do
+    image { Rack::Test::UploadedFile.new(File.expand_path(File.join('..', 'fixtures', 'avatar.png'), __dir__)) }
+    iiif_tilesource 'https://exhibits-stage.stanford.edu/images/78'
+  end
+end

data/spec/factories/exhibits.rb

@@ -3,5 +3,9 @@ FactoryGirl.define do
     sequence(:title) { |n| "Exhibit Title #{n}" }
     published true
     after(:build) { |exhibit| exhibit.searches << FactoryGirl.build(:default_search) }
+
+    trait :with_thumbnail do
+      association :thumbnail, factory: :exhibit_thumbnail
+    end
   end
 end

data/spec/factories/featured_images.rb

@@ -1,6 +1,7 @@
 FactoryGirl.define do
   factory :featured_image, class: Spotlight::FeaturedImage do
     image { Rack::Test::UploadedFile.new(File.expand_path(File.join('..', 'fixtures', 'avatar.png'), __dir__)) }
+    iiif_tilesource 'https://exhibits-stage.stanford.edu/images/78'
   end
 
   factory :masthead, class: Spotlight::Masthead do

data/spec/factories/resources.rb

@@ -6,6 +6,7 @@ FactoryGirl.define do
   end
   factory :uploaded_resource, class: Spotlight::Resources::Upload, parent: :resource do
     type 'Spotlight::Resources::Upload'
-    url { Rack::Test::UploadedFile.new(File.expand_path(File.join('..', 'fixtures', 'avatar.png'), __dir__)) }
+    association :upload, factory: :featured_image
+    # url { Rack::Test::UploadedFile.new(File.expand_path(File.join('..', 'fixtures', 'avatar.png'), __dir__)) }
   end
 end

data/spec/features/add_contacts_spec.rb

@@ -41,19 +41,19 @@ describe 'Add a contact to an exhibit', type: :feature do
   end
 
   it "allows the curator to crop the contact's avatar", js: true do
-    skip "Capyabara and jcrop don't play well together.."
+    skip "Capybara doesn't play well with the image cropper..."
 
     visit spotlight.exhibit_about_pages_path(exhibit)
     click_link 'Add contact'
-    page.document.synchronize do
-      find('.jcrop-holder')
-    end
+
     within '#new_contact' do
       fill_in 'Name', with: 'Pictured User'
       fill_in 'Email', with: 'marcus@rome.gov'
-      attach_file('contact_avatar', File.absolute_path(File.join(FIXTURES_PATH, 'avatar.png')))
+      attach_file('contact_avatar_attributes_file', File.absolute_path(File.join(FIXTURES_PATH, 'avatar.png')))
+      click_button 'Save'
     end
     expect(page).to have_content 'The contact was created.'
     expect(page).to have_selector 'img.contact-photo'
+    expect(Spotlight::Contact.last.avatar.iiif_url).to be_present
   end
 end

data/spec/features/add_iiif_manifest_spec.rb

@@ -0,0 +1,41 @@
+require 'spec_helper'
+
+describe 'adding IIIF Manifest', type: :feature do
+  let(:exhibit) { FactoryGirl.create(:exhibit) }
+  let(:curator) { FactoryGirl.create(:exhibit_curator, exhibit: exhibit) }
+  before { login_as curator }
+
+  it 'has form to add IIIF Manifests' do
+    visit spotlight.admin_exhibit_catalog_path(exhibit)
+    click_link 'Add items'
+
+    expect(page).to have_link('IIIF URL') # tab name
+    expect(page).to have_css("input[id='resource_url'][type='text']")
+    expect(page).to have_content 'Add the URL of a IIIF manifest or collection'
+    expect(page).to have_button 'Add IIIF items'
+  end
+
+  it 'submits the form to create a new item' do
+    expect_any_instance_of(Spotlight::Resource).to receive(:reindex_later).and_return(true)
+    url = 'https://purl.stanford.edu/vw754mr2281/iiif/manifest.json'
+    visit spotlight.admin_exhibit_catalog_path(exhibit)
+
+    click_link 'Add items'
+    fill_in 'URL', with: url
+
+    click_button 'Add IIIF items'
+
+    expect(Spotlight::Resource.last.url).to eq url
+  end
+
+  it 'returns an error message if the URL returned in not a IIIF endpoint' do
+    visit spotlight.admin_exhibit_catalog_path(exhibit)
+
+    click_link 'Add items'
+    fill_in 'URL', with: 'http://example.com'
+
+    click_button 'Add IIIF items'
+
+    expect(page).to have_css('.alert', text: 'Invalid IIIF URL')
+  end
+end

data/spec/features/add_items_spec.rb

@@ -37,7 +37,7 @@ describe 'Uploading a non-repository item', type: :feature do
       end
       expect(page).to have_content 'Object uploaded successfully.'
 
-      expect(Spotlight::Resource.last.url.file.path).to end_with '800x600.png'
+      expect(Spotlight::Resource.last.upload.image.file.path).to end_with '800x600.png'
       Blacklight.default_index.connection.delete_by_id Spotlight::Resource.last.send(:compound_id)
       Blacklight.default_index.connection.commit
     end
@@ -98,7 +98,7 @@ describe 'Uploading a non-repository item', type: :feature do
       click_button 'Save'
 
       expect(page).to have_content 'This is a now an avatar'
-      expect(Spotlight::Resource.last.url.file.path).to end_with 'avatar.png'
+      expect(Spotlight::Resource.last.upload.image.path).to end_with 'avatar.png'
       Blacklight.default_index.connection.delete_by_id Spotlight::Resource.last.send(:compound_id)
       Blacklight.default_index.connection.commit
     end

data/spec/features/autocomplete_typeahead_spec.rb

@@ -0,0 +1,86 @@
+describe 'Autocomplete typeahead', type: :feature, js: true do
+  let(:exhibit) { FactoryGirl.create(:exhibit) }
+  let(:admin) { FactoryGirl.create(:exhibit_admin, exhibit: exhibit) }
+
+  before { login_as admin }
+
+  describe 'IIIF Integration' do
+    context 'for items that include a IIIF manifest' do
+      it 'instantiates a cropper and persists all levels of the IIIF manifest' do
+        visit spotlight.edit_exhibit_appearance_path(exhibit)
+        click_link 'Exhibit masthead'
+
+        expect(page).not_to have_css('.leaflet-container')
+
+        check 'Show background image in masthead'
+
+        fill_in_typeahead_field(with: 'gk446cj2442', type: 'featured-image')
+
+        expect(page).to have_css('.leaflet-container', visible: true)
+
+        click_button 'Save changes'
+
+        featured_image = Spotlight::FeaturedImage.last
+
+        expect(featured_image.iiif_manifest_url).to eq 'https://purl.stanford.edu/gk446cj2442/iiif/manifest.json'
+        expect(featured_image.iiif_canvas_id).to eq 'https://purl.stanford.edu/gk446cj2442/iiif/canvas/gk446cj2442_1'
+        expect(featured_image.iiif_image_id).to eq 'https://purl.stanford.edu/gk446cj2442/iiif/annotation/gk446cj2442_1'
+        expect(featured_image.iiif_tilesource).to eq 'https://stacks.stanford.edu/image/iiif/gk446cj2442%2Fgk446cj2442_05_0001/info.json'
+      end
+
+      it 'instantiates the multi-image selector when an multi-image item is chosen in the typeahead (and again on edit)' do
+        # Poltergeist doesn't play nice with croppers behind tabs. This is not the case in real browsers
+        allow(Spotlight::Engine.config).to receive(:exhibit_themes).and_return(['default'])
+
+        visit spotlight.edit_exhibit_appearance_path(exhibit)
+
+        check 'Show background image in masthead'
+
+        fill_in_typeahead_field(with: 'xd327cm9378', type: 'featured-image')
+
+        expect(page).to have_css('[data-panel-image-pagination]', text: /Image 1 of 2/, visible: true)
+
+        # Open the multi-image selector and choose the last one
+        click_link('Change')
+        all('.thumbs-list li').last.click
+        expect(page).to have_css('.leaflet-container', visible: true)
+
+        click_button 'Save changes'
+
+        expect(page).to have_content('The exhibit was successfully updated.')
+
+        expect(page).to have_css('[data-panel-image-pagination]', text: /Image 2 of 2/, visible: true)
+      end
+
+      it 'removes the multi-image selector when a non multi-image item is selected' do
+        visit spotlight.edit_exhibit_appearance_path(exhibit)
+        click_link 'Exhibit masthead'
+
+        fill_in_typeahead_field(with: 'xd327cm9378', type: 'featured-image')
+
+        expect(page).to have_css('[data-panel-image-pagination]', text: /Image 1 of 2/, visible: true)
+
+        fill_in_typeahead_field(with: 'gk446cj2442', type: 'featured-image')
+
+        expect(page).not_to have_css('[data-panel-image-pagination]', text: /Image 1 of 2/)
+      end
+    end
+
+    context 'for items that do not include a IIIF manifest' do
+      before do
+        allow(Spotlight::Engine.config).to receive(:iiif_manifest_field).and_return('not_a_real_field')
+      end
+
+      it 'provides an alert informing the user that they cannot crop from that item' do
+        visit spotlight.edit_exhibit_appearance_path(exhibit)
+        click_link 'Exhibit masthead'
+
+        expect(page).not_to have_css('[data-behavior="non-iiif-alert"]', visible: true)
+
+        fill_in_typeahead_field(with: 'gk446cj2442', type: 'featured-image')
+
+        expect(page).to have_css('[data-behavior="non-iiif-alert"]', visible: true)
+      end
+    end
+  end
+end

data/spec/features/browse_category_admin_spec.rb

@@ -9,6 +9,27 @@ describe 'Browse Category Administration', type: :feature do
       expect(page).to have_css('.panel .search .title', text: search.title)
     end
   end
+  describe 'create' do
+    it 'creates a new browse category with the current search parameters', js: true do
+      visit spotlight.search_exhibit_catalog_path(exhibit, q: 'xyz')
+      click_button 'Save this search'
+      expect(page).to have_css('#save-modal')
+      fill_in 'search_title', with: 'Some search'
+      expect do
+        click_button 'Save'
+        exhibit.searches.reload
+      end.to change { exhibit.searches.count }.by 1
+      expect(exhibit.searches.last.query_params).to eq 'q' => 'xyz'
+    end
+    it 'updates an existing browse category with the current search parameters', js: true do
+      visit spotlight.search_exhibit_catalog_path(exhibit, q: 'xyz')
+      click_button 'Save this search'
+      expect(page).to have_css('#save-modal')
+      select search.title, from: 'id'
+      click_button 'Save'
+      expect(search.reload.query_params).to eq 'q' => 'xyz'
+    end
+  end
   describe 'edit' do
     it 'displays an edit form' do
       visit spotlight.edit_exhibit_search_path(exhibit, search)
@@ -27,7 +48,10 @@ describe 'Browse Category Administration', type: :feature do
 
       within '#search-masthead' do
         choose 'Upload an image'
-        attach_file('search_masthead_attributes_image', File.absolute_path(File.join(FIXTURES_PATH, 'avatar.png')))
+        # attach_file('search_masthead_attributes_file', File.absolute_path(File.join(FIXTURES_PATH, 'avatar.png')))
+        # The JS fills in these fields:
+        find('#search_masthead_attributes_iiif_tilesource', visible: false).set 'http://test.host/images/7'
+        find('#search_masthead_attributes_iiif_region', visible: false).set '0,0,100,200'
       end
 
       click_button 'Save changes'
@@ -37,8 +61,7 @@ describe 'Browse Category Administration', type: :feature do
       search.reload
 
       expect(search.masthead).not_to be nil
-      expect(search.masthead.image.cropped).not_to be_nil
-      expect(search.masthead.image.path).to end_with 'avatar.png'
+      expect(search.masthead.iiif_url).to eq 'http://test.host/images/7/0,0,100,200/1800,180/0/default.jpg'
     end
 
     it 'attaches a thumbnail image' do
@@ -48,7 +71,7 @@ describe 'Browse Category Administration', type: :feature do
 
       within '#search-thumbnail' do
         choose 'Upload an image'
-        attach_file('search_thumbnail_attributes_image', File.absolute_path(File.join(FIXTURES_PATH, 'avatar.png')))
+        attach_file('search_thumbnail_attributes_file', File.absolute_path(File.join(FIXTURES_PATH, 'avatar.png')))
       end
 
       click_button 'Save changes'
@@ -58,8 +81,6 @@ describe 'Browse Category Administration', type: :feature do
       search.reload
 
       expect(search.thumbnail).not_to be nil
-      expect(search.thumbnail.image.thumb).not_to be_nil
-      expect(search.thumbnail.image.path).to end_with 'avatar.png'
     end
 
     it 'can select a default index view type' do

data/spec/features/browse_category_spec.rb

@@ -35,11 +35,11 @@ feature 'Browse pages' do
     end
 
     context 'with a custom masthead' do
-      let(:masthead) { FactoryGirl.create(:masthead, display: true) }
+      let(:masthead) { FactoryGirl.create(:masthead, display: true, iiif_tilesource: 'http://test.host/images/1') }
 
       before do
         search.masthead = masthead
-        search.save
+        search.save!
       end
 
       it 'has a contextual masthead with the title and resource count' do

data/spec/features/create_exhibit_spec.rb

@@ -8,7 +8,7 @@ describe 'Create a new exhibit', type: :feature do
   it 'has a link in the user dropdown' do
     visit '/'
     within '.dropdown-menu' do
-      click_link 'Create Exhibit'
+      click_link 'Create new exhibit'
     end
     expect(page).to have_selector 'h1', text: 'Manage exhibits'
     expect(page).to have_selector 'h1 small', text: 'Create a new exhibit'
@@ -17,7 +17,7 @@ describe 'Create a new exhibit', type: :feature do
   it 'allows admins to create a new exhibit' do
     visit '/'
     within '.dropdown-menu' do
-      click_link 'Create Exhibit'
+      click_link 'Create new exhibit'
     end
 
     fill_in 'Title', with: 'My exhibit title'
@@ -31,7 +31,7 @@ describe 'Create a new exhibit', type: :feature do
   it 'allows admins to create a new exhibit with a slug' do
     visit '/'
     within '.dropdown-menu' do
-      click_link 'Create Exhibit'
+      click_link 'Create new exhibit'
     end
 
     fill_in 'Title', with: 'My exhibit title'

data/spec/features/exhibit_masthead_spec.rb

@@ -10,12 +10,16 @@ describe 'Add and update the site masthead', type: :feature do
       click_link 'Appearance'
     end
 
-    click_link 'Site masthead'
+    click_link 'Exhibit masthead'
 
     within '#site-masthead' do
       check 'Show background image in masthead'
       choose 'Upload an image'
-      attach_file('exhibit_masthead_attributes_image', File.absolute_path(File.join(FIXTURES_PATH, 'avatar.png')))
+
+      # The JS fills in these fields:
+      find('#exhibit_masthead_attributes_iiif_tilesource', visible: false).set 'http://test.host/images/7'
+      find('#exhibit_masthead_attributes_iiif_region', visible: false).set '0,0,100,200'
+      # attach_file('exhibit_masthead_attributes_image', File.absolute_path(File.join(FIXTURES_PATH, 'avatar.png')))
     end
 
     click_button 'Save changes'
@@ -26,13 +30,14 @@ describe 'Add and update the site masthead', type: :feature do
       click_link 'Appearance'
     end
 
-    click_link 'Site masthead'
+    click_link 'Exhibit masthead'
 
     within '#site-masthead' do
       expect(field_labeled('Show background image in masthead')).to be_checked
       expect(field_labeled('Upload an image')).to be_checked
     end
   end
+
   it 'displays a masthead image when one is uploaded and configured' do
     visit spotlight.exhibit_dashboard_path(exhibit)
     expect(page).to_not have_css('.image-masthead')
@@ -40,12 +45,15 @@ describe 'Add and update the site masthead', type: :feature do
       click_link 'Appearance'
     end
 
-    click_link 'Site masthead'
+    click_link 'Exhibit masthead'
 
     within '#site-masthead' do
       check 'Show background image in masthead'
 
-      attach_file('exhibit_masthead_attributes_image', File.absolute_path(File.join(FIXTURES_PATH, 'avatar.png')))
+      # attach_file('exhibit_masthead_attributes_image', File.absolute_path(File.join(FIXTURES_PATH, 'avatar.png')))
+      # The JS fills in these fields:
+      find('#exhibit_masthead_attributes_iiif_tilesource', visible: false).set 'http://test.host/images/7'
+      find('#exhibit_masthead_attributes_iiif_region', visible: false).set '0,0,100,200'
     end
 
     click_button 'Save changes'
@@ -54,6 +62,7 @@ describe 'Add and update the site masthead', type: :feature do
 
     expect(page).to have_css('.image-masthead .background-container')
   end
+
   it 'does not display an uploaded masthead if configured to not display' do
     visit spotlight.exhibit_dashboard_path(exhibit)
     expect(page).to_not have_css('.image-masthead')
@@ -61,10 +70,10 @@ describe 'Add and update the site masthead', type: :feature do
       click_link 'Appearance'
     end
 
-    click_link 'Site masthead'
+    click_link 'Exhibit masthead'
 
     within '#site-masthead' do
-      attach_file('exhibit_masthead_attributes_image', File.absolute_path(File.join(FIXTURES_PATH, 'avatar.png')))
+      attach_file('exhibit_masthead_attributes_file', File.absolute_path(File.join(FIXTURES_PATH, 'avatar.png')))
     end
 
     click_button 'Save changes'
@@ -73,15 +82,17 @@ describe 'Add and update the site masthead', type: :feature do
 
     expect(page).to_not have_css('.image-masthead .background-container')
   end
+
   it 'displays a masthead image when one is uploaded from an exhibit item', js: true do
-    skip "Capyabara and jcrop don't play well together.."
+    skip "Capyabara and the cropping tool don't play well together.."
+
     visit spotlight.exhibit_dashboard_path(exhibit)
     expect(page).to_not have_css('.image-masthead')
     within '#sidebar' do
       click_link 'Appearance'
     end
 
-    click_link 'Site masthead'
+    click_link 'Exhibit masthead'
 
     within '#site-masthead' do
       check 'Show background image in masthead'

data/spec/features/exhibit_themes_spec.rb

@@ -0,0 +1,25 @@
+describe 'Update the site theme', type: :feature do
+  let(:exhibit) { FactoryGirl.create(:exhibit) }
+  let(:user) { FactoryGirl.create(:exhibit_admin, exhibit: exhibit) }
+
+  before { login_as user }
+  it 'updates the exhibit theme' do
+    visit spotlight.edit_exhibit_appearance_path(exhibit)
+
+    expect(page).to have_content('Visual theme')
+    choose 'Modern'
+
+    click_button 'Save changes'
+
+    expect(page).to have_content('The exhibit was successfully updated.')
+
+    within '#sidebar' do
+      click_link 'Appearance'
+    end
+
+    click_link 'Exhibit masthead'
+
+    expect(field_labeled('Modern')).to be_checked
+    expect(page).to have_xpath('//link[contains(@href, "/stylesheets/application_modern.css")]', visible: false)
+  end
+end