blacklight-spotlight 2.2.1 → 2.3.0

data/spec/features/exhibits/translation_editing_spec.rb

@@ -42,6 +42,15 @@ describe 'Translation editing', type: :feature do
     end
 
     describe 'main menu' do
+      before do
+        exhibit.searches.first.update(published: true)
+        within '.translation-edit-form #general' do
+          fill_in 'Home', with: 'Maison'
+          fill_in 'Browse', with: 'parcourir ceci!'
+          click_button 'Save changes'
+        end
+      end
+
       it 'adds translations to exhibit navbar' do
         within '.translation-edit-form #general' do
           expect(page).to have_css '.help-block', text: 'Home'
@@ -70,15 +79,6 @@ describe 'Translation editing', type: :feature do
         I18n.locale = I18n.default_locale
       end
 
-      before do
-        exhibit.searches.first.update(published: true)
-        within '.translation-edit-form #general' do
-          fill_in 'Home', with: 'Maison'
-          fill_in 'Browse', with: 'parcourir ceci!'
-          click_button 'Save changes'
-        end
-      end
-
       it 'adds translations to user-facing breadcrumbs' do
         expect(page).to have_css '.flash_messages', text: 'The exhibit was successfully updated.'
         visit spotlight.exhibit_browse_index_path(exhibit, locale: 'fr')

data/spec/features/javascript/edit_in_place_spec.rb

@@ -29,6 +29,7 @@ describe 'Edit in place', type: :feature, js: true do
     end
 
     it 'rejects blank values' do
+      skip('Passes locally, but soooo flakey on Travis.') if ENV['CI']
       visit spotlight.exhibit_dashboard_path(exhibit)
 
       click_link 'Feature pages'

data/spec/models/solr_document_spec.rb

@@ -1,12 +1,13 @@
 describe SolrDocument, type: :model do
   let(:document) { described_class.new(id: 'abcd123') }
   subject { document }
-  its(:to_key) { should == ['abcd123'] }
-  its(:persisted?) { should be_truthy }
   before do
     allow(subject).to receive_messages(reindex: nil)
   end
 
+  its(:to_key) { should == ['abcd123'] }
+  its(:persisted?) { should be_truthy }
+
   let(:exhibit) { FactoryBot.create(:exhibit) }
   let(:exhibit_alt) { FactoryBot.create(:exhibit) }
 

data/spec/models/spotlight/blacklight_configuration_spec.rb

@@ -16,7 +16,7 @@ describe Spotlight::BlacklightConfiguration, type: :model do
   end
 
   it 'is expected to be versioned' do
-    is_expected.to be_versioned
+    expect(subject).to be_versioned
   end
 
   it 'touches the exhibit' do

data/spec/models/spotlight/exhibit_spec.rb

@@ -346,7 +346,7 @@ describe Spotlight::Exhibit, type: :model do
   end
 
   it 'is expected to be versioned' do
-    is_expected.to be_versioned
+    expect(subject).to be_versioned
   end
   describe 'translatable fields' do
     let(:persisted_exhibit) { FactoryBot.create(:exhibit, title: 'Sample', subtitle: 'SubSample', description: 'Description') }

data/spec/models/spotlight/page_spec.rb

@@ -16,7 +16,7 @@ describe Spotlight::Page, type: :model do
   end
 
   it 'is expected to be versioned' do
-    is_expected.to be_versioned
+    expect(subject).to be_versioned
   end
 
   describe '#top_level_page?' do

data/spec/models/spotlight/resources/upload_spec.rb

@@ -5,7 +5,7 @@ describe Spotlight::Resources::Upload, type: :model do
   let(:doc_builder) { resource.document_builder }
 
   let(:configured_fields) { [title_field] + described_class.fields(exhibit) }
-  let(:title_field) { OpenStruct.new(field_name: 'configured_title_field') }
+  let(:title_field) { Spotlight::UploadFieldConfig.new(field_name: 'configured_title_field') }
   let(:upload_data) do
     {
       title_field.field_name => 'Title Data',
@@ -30,7 +30,7 @@ describe Spotlight::Resources::Upload, type: :model do
   end
 
   context 'with a custom upload title field' do
-    let(:title_field) { OpenStruct.new(field_name: 'configured_title_field', solr_field: :some_other_field) }
+    let(:title_field) { Spotlight::UploadFieldConfig.new(field_name: 'configured_title_field', solr_fields: [:some_other_field]) }
     subject { doc_builder.to_solr }
 
     describe '#to_solr' do
@@ -43,7 +43,7 @@ describe Spotlight::Resources::Upload, type: :model do
   context 'multiple solr field mappings' do
     let :configured_fields do
       [
-        OpenStruct.new(field_name: 'some_field', solr_field: %w(a b))
+        Spotlight::UploadFieldConfig.new(field_name: 'some_field', solr_fields: %w(a b))
       ]
     end
 
@@ -55,6 +55,7 @@ describe Spotlight::Resources::Upload, type: :model do
       subject { doc_builder.to_solr }
 
       it 'maps a single uploaded field to multiple solr fields' do
+        expect(subject).not_to include 'some_field'
         expect(subject['a']).to eq 'value'
         expect(subject['b']).to eq 'value'
       end

data/spec/models/spotlight/solr_document_sidecar_spec.rb

@@ -13,5 +13,18 @@ describe Spotlight::SolrDocumentSidecar, type: :model do
     its(:to_solr) { should include id: 'doc_id' }
     its(:to_solr) { should include "exhibit_#{exhibit.slug}_public_bsi".to_sym => true }
     its(:to_solr) { should include 'a_tesim', 'b_tesim', 'c_tesim' }
+
+    context 'with an uploaded item' do
+      before do
+        subject.data = { 'configured_fields' => { 'some_configured_field' => 'some value' } }
+        allow(Spotlight::Resources::Upload).to receive(:fields).with(exhibit).and_return([uploaded_field_config])
+      end
+
+      let(:uploaded_field_config) do
+        Spotlight::UploadFieldConfig.new(field_name: 'some_configured_field', solr_fields: ['the_solr_field'])
+      end
+
+      its(:to_solr) { should include 'the_solr_field' => 'some value' }
+    end
   end
 end

data/spec/support/features/capybara_default_max_wait_metadata_helper.rb

@@ -4,12 +4,14 @@ module CapybaraDefaultMaxWaitMetadataHelper
   included do
     before do |example|
       next unless example.metadata[:default_max_wait_time]
+
       @previous_wait_time = Capybara.default_max_wait_time
       Capybara.default_max_wait_time = example.metadata[:default_max_wait_time]
     end
 
     after do |example|
       next unless example.metadata[:default_max_wait_time]
+
       Capybara.default_max_wait_time = @previous_wait_time
     end
   end

data/spec/views/spotlight/exhibits/edit.html.erb_spec.rb

@@ -5,8 +5,8 @@ describe 'spotlight/exhibits/edit', type: :view do
     allow(view).to receive_messages(
       current_exhibit: exhibit,
       can?: true,
-      import_exhibit_path:  '/',
-      get_exhibit_path:     '/',
+      import_exhibit_path: '/',
+      get_exhibit_path: '/',
       exhibit_filters_path: '/',
       exhibit_languages_path: '/',
       add_exhibit_language_dropdown_options: [],

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: blacklight-spotlight
 version: !ruby/object:Gem::Version
-  version: 2.2.1
+  version: 2.3.0
 platform: ruby
 authors:
 - Chris Beer
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-08-20 00:00:00.000000000 Z
+date: 2018-10-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -373,16 +373,16 @@ dependencies:
   name: paper_trail
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '7.0'
+        version: '10.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '7.0'
+        version: '10.0'
 - !ruby/object:Gem::Dependency
   name: openseadragon
   requirement: !ruby/object:Gem::Requirement
@@ -653,16 +653,16 @@ dependencies:
   name: chromedriver-helper
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "<"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 2.0.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "<"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 2.0.0
 - !ruby/object:Gem::Dependency
   name: selenium-webdriver
   requirement: !ruby/object:Gem::Requirement
@@ -1263,8 +1263,8 @@ files:
 - db/migrate/20180405044000_add_locale_to_pages.rb
 - db/migrate/20180406212516_add_default_locale_reference_to_spotlight_pages.rb
 - db/migrate/20180529225807_change_spotlight_pages_content_column_to_medium_text.rb
+- db/migrate/20180822233601_change_type_of_taggings_taggable.rb
 - lib/blacklight/spotlight.rb
-- lib/generators/spotlight/increase_paper_trail_column_size_generator.rb
 - lib/generators/spotlight/install_generator.rb
 - lib/generators/spotlight/scaffold_resource_generator.rb
 - lib/generators/spotlight/templates/catalog_controller.rb
@@ -1272,7 +1272,6 @@ files:
 - lib/generators/spotlight/templates/config/initializers/spotlight_initializer.rb
 - lib/generators/spotlight/templates/config/initializers/translation.rb
 - lib/generators/spotlight/templates/config/sitemap.rb
-- lib/generators/spotlight/templates/migrations/20180814221815_change_paper_trail_versions_object_column_to_medium_text.rb
 - lib/generators/spotlight/templates/solr/config/schema.xml
 - lib/generators/spotlight/templates/solr/config/solrconfig.xml
 - lib/generators/spotlight/templates/spotlight.js

data/lib/generators/spotlight/increase_paper_trail_column_size_generator.rb

@@ -1,17 +0,0 @@
-require 'rails/generators'
-
-module Spotlight
-  ##
-  # spotlight:increase_paper_trail_column_size generator
-  class IncreasePaperTrailColumnSize < Rails::Generators::Base
-    source_root File.expand_path('templates', __dir__)
-
-    def add_paper_trail_column_size_increase_migration
-      rake 'db:migrate' # run migrations so that the versions table is created
-      copy_file(
-        'migrations/20180814221815_change_paper_trail_versions_object_column_to_medium_text.rb',
-        'db/migrate/20180814221815_change_paper_trail_versions_object_column_to_medium_text.rb'
-      )
-    end
-  end
-end

data/lib/generators/spotlight/templates/migrations/20180814221815_change_paper_trail_versions_object_column_to_medium_text.rb

@@ -1,11 +0,0 @@
-##
-# A migration that updates the object column size on PaperTrail's version table
-# This is in a generator template because our migrations run before PaperTrail is installed
-class ChangePaperTrailVersionsObjectColumnToMediumText < ActiveRecord::Migration[5.1]
-  # See https://github.com/paper-trail-gem/paper_trail/blob/6c34a3dd5a5f8c1b042f458b7727c9d3bbf81a50/lib/generators/paper_trail/install/templates/create_versions.rb.erb#L5-L17
-  # for rationale of the 1,073,741,823 byte limit
-
-  def change
-    change_column :versions, :object, :text, limit: 1_073_741_823
-  end
-end