blacklight 7.19.1 → 7.19.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 924afe1d564ba4e2a2fdf2f2959fb85a6245dd48b4be4eabbe9c1298b6d96e9b
-  data.tar.gz: e1574d78f4ac42092f73d68f0f5cb76a3e5eeb116ca98a8a017a82e883110486
+  metadata.gz: 9f48da02e969e0c163d09760d711066ce9c0b4d5078636c8f50e19699ec58e8e
+  data.tar.gz: 77da2b86854e93f08a79ba9e28c86c7c91116b9f6934229eb6936cc6872bfdc6
 SHA512:
-  metadata.gz: 268ddf30836b4c0f4b9a4b00b6bc7b1779ca2eb88568190ca344bbce72e5a5eb1c7bccc13a0339f224f1f468c6a972d4d9ce0198af284fe4c361cc0f671e2913
-  data.tar.gz: 20d21c6e2f5b86c0383124af0d7862f0ef7b2d8fadd475257b4e150e36e488e5025e4c2f2fd96ad399d7472a613edfa069d04d50693a2ded20f1d29d02c039b3
+  metadata.gz: a42155551ab05fa25e433a7aad6e40078ce7cbc2918de03f6ede94aef53ade03b4b16f4411a915b737b1233a631d9cb2baddc9d560aa70b67df237776c01e7f6
+  data.tar.gz: 6430192899c4db45277e988217aecc04e954d856645941773176e36ecefd3ddda3c2a9988caffb7bde50f8aa76702a10cd00da67216f17c6fb49a2802a678dfe

data/VERSION

@@ -1 +1 @@
-7.19.1
+7.19.2

data/app/components/blacklight/facet_field_no_layout_component.rb

@@ -10,7 +10,7 @@ module Blacklight
     def initialize(**); end
 
     def call
-      body
+      body.to_s
     end
   end
 end

data/app/components/blacklight/facet_item_component.rb

@@ -27,7 +27,7 @@ module Blacklight
                   render_facet_value
                 end
 
-      return if content.blank?
+      return '' if content.blank?
       return content unless @wrapping_element
 
       content_tag @wrapping_element, content

data/spec/components/blacklight/constraint_layout_component_spec.rb

@@ -3,12 +3,8 @@
 require 'spec_helper'
 
 RSpec.describe Blacklight::ConstraintLayoutComponent, type: :component do
-  subject(:render) do
-    render_inline(described_class.new(**params))
-  end
-
-  let(:rendered) do
-    Capybara::Node::Simple.new(render)
+  subject(:rendered) do
+    render_inline_to_capybara_node(described_class.new(**params))
   end
 
   describe "for simple display" do

data/spec/components/blacklight/facet_field_checkboxes_component_spec.rb

@@ -3,12 +3,8 @@
 require 'spec_helper'
 
 RSpec.describe Blacklight::FacetFieldCheckboxesComponent, type: :component do
-  subject(:render) do
-    render_inline(described_class.new(facet_field: facet_field))
-  end
-
-  let(:rendered) do
-    Capybara::Node::Simple.new(render)
+  subject(:rendered) do
+    render_inline_to_capybara_node(described_class.new(facet_field: facet_field))
   end
 
   let(:facet_field) do

data/spec/components/blacklight/facet_field_list_component_spec.rb

@@ -3,12 +3,8 @@
 require 'spec_helper'
 
 RSpec.describe Blacklight::FacetFieldListComponent, type: :component do
-  subject(:render) do
-    render_inline(described_class.new(facet_field: facet_field))
-  end
-
-  let(:rendered) do
-    Capybara::Node::Simple.new(render)
+  subject(:rendered) do
+    render_inline_to_capybara_node(described_class.new(facet_field: facet_field))
   end
 
   let(:facet_field) do

data/spec/components/blacklight/facet_item_component_spec.rb

@@ -3,12 +3,8 @@
 require 'spec_helper'
 
 RSpec.describe Blacklight::FacetItemComponent, type: :component do
-  subject(:render) do
-    render_inline(described_class.new(facet_item: facet_item))
-  end
-
-  let(:rendered) do
-    Capybara::Node::Simple.new(render)
+  subject(:rendered) do
+    render_inline_to_capybara_node(described_class.new(facet_item: facet_item))
   end
 
   let(:facet_item) do

data/spec/components/blacklight/facet_item_pivot_component_spec.rb

@@ -3,12 +3,8 @@
 require 'spec_helper'
 
 RSpec.describe Blacklight::FacetItemPivotComponent, type: :component do
-  subject(:render) do
-    render_inline(described_class.new(facet_item: facet_item))
-  end
-
-  let(:rendered) do
-    Capybara::Node::Simple.new(render)
+  subject(:rendered) do
+    render_inline_to_capybara_node(described_class.new(facet_item: facet_item))
   end
 
   let(:search_state) do
@@ -31,7 +27,7 @@ RSpec.describe Blacklight::FacetItemPivotComponent, type: :component do
 
   it 'links to the facet and shows the number of hits' do
     expect(rendered).to have_selector 'li'
-    expect(rendered).to have_link 'x', href: '/catalog?f[z]=x'
+    expect(rendered).to have_link 'x', href: '/catalog?f%5Bz%5D=x'
     expect(rendered).to have_selector '.facet-count', text: '10'
   end
 

data/spec/components/blacklight/hidden_search_state_component_spec.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 RSpec.describe Blacklight::HiddenSearchStateComponent, type: :component do
-  subject(:render) { render_inline(instance) }
+  subject(:rendered) { render_inline_to_capybara_node(instance) }
 
   let(:params) do
     { q: "query",
@@ -11,14 +11,13 @@ RSpec.describe Blacklight::HiddenSearchStateComponent, type: :component do
       f: { field1: %w[a b], field2: ["z"] } }
   end
   let(:instance) { described_class.new(params: params) }
-  let(:generated) { Capybara::Node::Simple.new("<div>#{render.to_html}</div>") }
 
   it "converts a hash with nested complex data to Rails-style hidden form fields" do
-    expect(generated).to have_selector("input[type='hidden'][name='q'][value='query']", visible: :hidden)
-    expect(generated).to have_selector("input[type='hidden'][name='per_page'][value='10']", visible: :hidden)
-    expect(generated).to have_selector("input[type='hidden'][name='extra_arbitrary_key'][value='arbitrary_value']", visible: :hidden)
-    expect(generated).to have_selector("input[type='hidden'][name='f[field2][]'][value='z']", visible: :hidden)
-    expect(generated).to have_selector("input[type='hidden'][name='f[field1][]'][value='a']", visible: :hidden)
-    expect(generated).to have_selector("input[type='hidden'][name='f[field1][]'][value='b']", visible: :hidden)
+    expect(rendered).to have_selector("input[type='hidden'][name='q'][value='query']", visible: :hidden)
+    expect(rendered).to have_selector("input[type='hidden'][name='per_page'][value='10']", visible: :hidden)
+    expect(rendered).to have_selector("input[type='hidden'][name='extra_arbitrary_key'][value='arbitrary_value']", visible: :hidden)
+    expect(rendered).to have_selector("input[type='hidden'][name='f[field2][]'][value='z']", visible: :hidden)
+    expect(rendered).to have_selector("input[type='hidden'][name='f[field1][]'][value='a']", visible: :hidden)
+    expect(rendered).to have_selector("input[type='hidden'][name='f[field1][]'][value='b']", visible: :hidden)
   end
 end

data/spec/components/blacklight/metadata_field_component_spec.rb

@@ -3,8 +3,8 @@
 require 'spec_helper'
 
 RSpec.describe Blacklight::MetadataFieldComponent, type: :component do
-  subject(:render) do
-    render_inline(described_class.new(field: field))
+  subject(:rendered) do
+    render_inline_to_capybara_node(described_class.new(field: field))
   end
 
   let(:view_context) { controller.view_context }
@@ -15,10 +15,6 @@ RSpec.describe Blacklight::MetadataFieldComponent, type: :component do
     Blacklight::FieldPresenter.new(view_context, document, field_config)
   end
 
-  let(:rendered) do
-    Capybara::Node::Simple.new(render)
-  end
-
   it 'renders the field label' do
     expect(rendered).to have_selector 'dt.blacklight-field', text: 'Field label'
   end
@@ -28,8 +24,8 @@ RSpec.describe Blacklight::MetadataFieldComponent, type: :component do
   end
 
   context 'from a show view' do
-    subject(:render) do
-      render_inline(described_class.new(field: field, show: true))
+    subject(:rendered) do
+      render_inline_to_capybara_node(described_class.new(field: field, show: true))
     end
 
     it 'renders the right field label' do

data/spec/spec_helper.rb

@@ -62,6 +62,7 @@ RSpec.configure do |config|
   config.infer_spec_type_from_file_location!
   config.include PresenterTestHelpers, type: :presenter
   config.include ViewComponent::TestHelpers, type: :component
+  config.include ViewComponentCapybaraTestHelpers, type: :component
 
   config.include(ControllerLevelHelpers, type: :helper)
   config.before(:each, type: :helper) { initialize_controller_helpers(helper) }

data/spec/support/view_component_capybara_test_helpers.rb

@@ -0,0 +1,8 @@
+# frozen_string_literal: true
+
+module ViewComponentCapybaraTestHelpers
+  # Work around for https://github.com/teamcapybara/capybara/issues/2466
+  def render_inline_to_capybara_node(component)
+    Capybara::Node::Simple.new(render_inline(component).to_s)
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: blacklight
 version: !ruby/object:Gem::Version
-  version: 7.19.1
+  version: 7.19.2
 platform: ruby
 authors:
 - Jonathan Rochkind
@@ -17,7 +17,7 @@ authors:
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2021-05-11 00:00:00.000000000 Z
+date: 2021-05-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -849,6 +849,7 @@ files:
 - spec/support/features.rb
 - spec/support/features/session_helpers.rb
 - spec/support/presenter_test_helpers.rb
+- spec/support/view_component_capybara_test_helpers.rb
 - spec/test_app_templates/Gemfile.extra
 - spec/test_app_templates/lib/generators/test_app_generator.rb
 - spec/views/catalog/_constraints.html.erb_spec.rb
@@ -1020,6 +1021,7 @@ test_files:
 - spec/support/features.rb
 - spec/support/features/session_helpers.rb
 - spec/support/presenter_test_helpers.rb
+- spec/support/view_component_capybara_test_helpers.rb
 - spec/test_app_templates/Gemfile.extra
 - spec/test_app_templates/lib/generators/test_app_generator.rb
 - spec/views/catalog/_constraints.html.erb_spec.rb