blacklight-spotlight 2.6.1.1 → 2.7.0

data/spec/factories/pages.rb

@@ -7,6 +7,12 @@ FactoryBot.define do
     published { true }
     content { '[]' }
   end
+  factory :feature_page_static_title, class: 'Spotlight::FeaturePage' do
+    exhibit
+    title { 'FeaturePage' }
+    published { true }
+    content { '[]' }
+  end
   factory :feature_subpage, parent: :feature_page do
     transient do
       exhibit

data/spec/models/spotlight/custom_translation_extension_spec.rb

@@ -0,0 +1,23 @@
+# frozen_string_literal: true
+
+describe Spotlight::CustomTranslationExtension do
+  let(:exhibit) { FactoryBot.create(:exhibit) }
+  subject do
+    Class.new(ActiveRecord::Base) do
+      include Spotlight::CustomTranslationExtension
+    end
+  end
+
+  describe '.current_exhibit' do
+    it 'sets the current exhibit' do
+      subject.current_exhibit = exhibit
+      expect(subject.current_exhibit).to eq exhibit
+    end
+
+    it 'reloads the i18n' do
+      allow(I18n.backend).to receive(:reload!)
+
+      subject.current_exhibit = exhibit
+    end
+  end
+end

data/spec/models/spotlight/page_spec.rb

@@ -172,6 +172,16 @@ describe Spotlight::Page, type: :model do
       end
     end
 
+    context 'when cloning a page that has been deleted with a FriendlyId UUID added' do
+      let(:feature_page_static_title) { FactoryBot.create(:feature_page_static_title, exhibit: exhibit) }
+      let(:feature_page_static_title_two) { FactoryBot.create(:feature_page_static_title, exhibit: exhibit) }
+      it 'translated page has the same UUID' do
+        expect(feature_page_static_title.slug).to eq 'featurepage'
+        expect(feature_page_static_title_two.slug).not_to eq feature_page_static_title.slug
+        expect(feature_page_static_title_two.clone_for_locale('es').slug).to eq feature_page_static_title_two.slug
+      end
+    end
+
     context 'when cloning a parent page whose children pages have already been cloned' do
       let(:parent_page_es) { parent_page.clone_for_locale('es') }
       let(:child_page_es) { child_page.clone_for_locale('es') }

data/spec/spec_helper.rb

@@ -15,25 +15,20 @@ require 'rspec/rails'
 require 'rspec/active_model/mocks'
 require 'paper_trail/frameworks/rspec'
 
-require 'chromedriver-helper'
 require 'selenium-webdriver'
 require 'webmock/rspec'
 
 Capybara.javascript_driver = :headless_chrome
 
-# @note In January 2018, TravisCI disabled Chrome sandboxing in its Linux
-#       container build environments to mitigate Meltdown/Spectre
-#       vulnerabilities, at which point Spotlight needs to use the --no-sandbox
-#       flag. https://github.com/travis-ci/docs-travis-ci-com/blob/c1da4af0b7ee5de35fa4490fa8e0fc4b44881089/user/chrome.md
-#       h/t @mjgiarlo
 Capybara.register_driver :headless_chrome do |app|
-  capabilities = Selenium::WebDriver::Remote::Capabilities.chrome(
-    chromeOptions: { args: %w[headless disable-gpu no-sandbox window-size=1280,1696] }
-  )
-
-  Capybara::Selenium::Driver.new(app,
-                                 browser: :chrome,
-                                 desired_capabilities: capabilities)
+  Capybara::Selenium::Driver.load_selenium
+  browser_options = ::Selenium::WebDriver::Chrome::Options.new.tap do |opts|
+    opts.args << '--headless'
+    opts.args << '--disable-gpu'
+    opts.args << '--no-sandbox'
+    opts.args << '--window-size=1280,1696'
+  end
+  Capybara::Selenium::Driver.new(app, browser: :chrome, options: browser_options)
 end
 
 if ENV['COVERAGE'] || ENV['CI']

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: blacklight-spotlight
 version: !ruby/object:Gem::Version
-  version: 2.6.1.1
+  version: 2.7.0
 platform: ruby
 authors:
 - Chris Beer
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-05-21 00:00:00.000000000 Z
+date: 2019-06-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -636,7 +636,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '1.25'
 - !ruby/object:Gem::Dependency
-  name: chromedriver-helper
+  name: webdrivers
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -1423,6 +1423,7 @@ files:
 - spec/models/spotlight/contact_image_spec.rb
 - spec/models/spotlight/contact_spec.rb
 - spec/models/spotlight/custom_field_spec.rb
+- spec/models/spotlight/custom_translation_extension_spec.rb
 - spec/models/spotlight/exhibit_spec.rb
 - spec/models/spotlight/exhibit_thumbnail_spec.rb
 - spec/models/spotlight/feature_page_spec.rb
@@ -1662,6 +1663,7 @@ test_files:
 - spec/models/spotlight/exhibit_spec.rb
 - spec/models/spotlight/featured_image_spec.rb
 - spec/models/spotlight/ability_spec.rb
+- spec/models/spotlight/custom_translation_extension_spec.rb
 - spec/models/spotlight/site_spec.rb
 - spec/models/spotlight/solr_document_sidecar_spec.rb
 - spec/models/spotlight/search_spec.rb