blacklight 9.0.0.beta1 → 9.0.0.beta2

data/spec/components/blacklight/constraint_layout_component_spec.rb

@@ -3,8 +3,8 @@
 require 'spec_helper'
 
 RSpec.describe Blacklight::ConstraintLayoutComponent, type: :component do
-  subject(:rendered) do
-    render_inline_to_capybara_node(described_class.new(**params))
+  before do
+    render_inline described_class.new(**params)
   end
 
   describe "for simple display" do
@@ -13,7 +13,7 @@ RSpec.describe Blacklight::ConstraintLayoutComponent, type: :component do
     end
 
     it "renders label and value" do
-      expect(rendered).to have_css("span.applied-filter.constraint") do |s|
+      expect(page).to have_css("span.applied-filter.constraint") do |s|
         expect(s).to have_css("span.constraint-value")
         expect(s).to have_no_css("a.constraint-value")
         expect(s).to have_css "span.filter-name", text: "my label"
@@ -28,13 +28,13 @@ RSpec.describe Blacklight::ConstraintLayoutComponent, type: :component do
     end
 
     it "includes remove link" do
-      expect(rendered).to have_css("span.applied-filter") do |s|
+      expect(page).to have_css("span.applied-filter") do |s|
         expect(s).to have_css(".remove[href='http://remove']")
       end
     end
 
     it "has an accessible remove label" do
-      expect(rendered).to have_css(".remove") do |s|
+      expect(page).to have_css(".remove") do |s|
         expect(s).to have_css('.visually-hidden', text: 'Remove constraint my label: my value')
       end
     end
@@ -46,7 +46,7 @@ RSpec.describe Blacklight::ConstraintLayoutComponent, type: :component do
     end
 
     it "includes them" do
-      expect(rendered).to have_css("span.applied-filter.constraint.class1.class2")
+      expect(page).to have_css("span.applied-filter.constraint.class1.class2")
     end
   end
 
@@ -56,8 +56,8 @@ RSpec.describe Blacklight::ConstraintLayoutComponent, type: :component do
     end
 
     it "does not escape key and value" do
-      expect(rendered).to have_css("span.applied-filter.constraint span.filter-name span.custom_label")
-      expect(rendered).to have_css("span.applied-filter.constraint span.filter-value span.custom_value")
+      expect(page).to have_css("span.applied-filter.constraint span.filter-name span.custom_label")
+      expect(page).to have_css("span.applied-filter.constraint span.filter-value span.custom_value")
     end
   end
 end

data/spec/components/blacklight/constraints_component_spec.rb

@@ -5,7 +5,7 @@ require 'spec_helper'
 RSpec.describe Blacklight::ConstraintsComponent, type: :component do
   subject(:component) { described_class.new(**params) }
 
-  let(:rendered) { render_inline_to_capybara_node(component) }
+  before { render_inline(component) }
 
   let(:params) do
     { search_state: search_state }
@@ -32,19 +32,19 @@ RSpec.describe Blacklight::ConstraintsComponent, type: :component do
     let(:query_params) { { q: 'some query' } }
 
     it 'renders a start-over link' do
-      expect(rendered).to have_link 'Start Over', href: '/catalog'
+      expect(page).to have_link 'Start Over', href: '/catalog'
     end
 
     it 'has a header' do
-      expect(rendered).to have_css('h2', text: 'Search Constraints')
+      expect(page).to have_css('h2', text: 'Search Constraints')
     end
 
     it 'wraps the output in a div' do
-      expect(rendered).to have_css('div#appliedParams')
+      expect(page).to have_css('div#appliedParams')
     end
 
     it 'renders the query' do
-      expect(rendered).to have_css('.applied-filter.constraint', text: 'some query')
+      expect(page).to have_css('.applied-filter.constraint', text: 'some query')
     end
   end
 
@@ -52,15 +52,15 @@ RSpec.describe Blacklight::ConstraintsComponent, type: :component do
     let(:query_params) { { f: { some_facet: ['some value'] } } }
 
     it 'renders the query' do
-      expect(rendered).to have_css('.constraint-value > .filter-name', text: 'Some Facet').and(have_css('.constraint-value > .filter-value', text: 'some value'))
+      expect(page).to have_css('.constraint-value > .filter-name', text: 'Some Facet').and(have_css('.constraint-value > .filter-value', text: 'some value'))
     end
 
     context 'that is not configured' do
       let(:query_params) { { f: { some_facet: ['some value'], missing: ['another value'] } } }
 
       it 'renders only the configured constraints' do
-        expect(rendered).to have_css('.constraint-value > .filter-name', text: 'Some Facet').and(have_css('.constraint-value > .filter-value', text: 'some value'))
-        expect(rendered).to have_no_css('.constraint-value > .filter-name', text: 'Missing')
+        expect(page).to have_css('.constraint-value > .filter-name', text: 'Some Facet').and(have_css('.constraint-value > .filter-value', text: 'some value'))
+        expect(page).to have_no_css('.constraint-value > .filter-name', text: 'Missing')
       end
     end
   end
@@ -71,15 +71,15 @@ RSpec.describe Blacklight::ConstraintsComponent, type: :component do
     let(:query_params) { { q: 'some query', f: { some_facet: ['some value'] } } }
 
     it 'wraps the output in a span' do
-      expect(rendered).to have_css('span .constraint')
+      expect(page).to have_css('span .constraint')
     end
 
     it 'renders the search state as lightly-decorated text' do
-      expect(rendered).to have_css('.constraint > .filter-values', text: 'some query').and(have_css('.constraint', text: 'Some Facet:some value'))
+      expect(page).to have_css('.constraint > .filter-values', text: 'some query').and(have_css('.constraint', text: 'Some Facet:some value'))
     end
 
     it 'omits the headers' do
-      expect(rendered).to have_no_css('h2', text: 'Search Constraints')
+      expect(page).to have_no_css('h2', text: 'Search Constraints')
     end
   end
 end

data/spec/components/blacklight/document/action_component_spec.rb

@@ -6,35 +6,43 @@ RSpec.describe Blacklight::Document::ActionComponent, type: :component do
   subject(:component) { described_class.new(document: document, action: action, **attr) }
 
   let(:action) { Blacklight::Configuration::ToolConfig.new(key: 'some_tool', name: 'some_tool', component: true) }
-  let(:attr) { {} }
-  let(:view_context) { controller.view_context }
-  let(:render) do
-    component.render_in(view_context)
-  end
-
-  let(:rendered) do
-    Capybara::Node::Simple.new(render)
-  end
-
   let(:document) do
     SolrDocument.new(
       id: 'x'
     )
   end
+  let(:attr) { {} }
+  let(:view_context) { vc_test_controller.view_context }
+
+  before do
+    # Every call to view_context returns a different object. This ensures it stays stable.
+    allow(vc_test_controller).to receive_messages(view_context: view_context)
+  end
 
-  it 'renders an action link' do
-    allow(view_context).to receive(:some_tool_solr_document_path).with(document, { only_path: true }).and_return('/asdf')
+  context 'with a configured path' do
+    before do
+      allow(view_context).to receive(:some_tool_solr_document_path).with(document, { only_path: true }).and_return('/asdf')
 
-    expect(rendered).to have_link 'Some tool', href: '/asdf'
+      render_inline component
+    end
+
+    it 'renders an action link' do
+      expect(page).to have_link 'Some tool', href: '/asdf'
+    end
   end
 
   context 'with a partial configured' do
     let(:action) { Blacklight::Configuration::ToolConfig.new(name: '', partial: '/some/tool') }
 
-    it 'render the partial' do
+    before do
+      allow(view_context).to receive(:render).and_call_original
       allow(view_context).to receive(:render).with(hash_including(partial: '/some/tool'), {}).and_return('tool')
 
-      expect(rendered).to have_content 'tool'
+      render_inline component
+    end
+
+    it 'render the partial' do
+      expect(page).to have_content 'tool'
     end
   end
 end

data/spec/components/blacklight/document/group_component_spec.rb

@@ -6,40 +6,35 @@ RSpec.describe Blacklight::Document::GroupComponent, type: :component do
   subject(:component) { described_class.new(group: group, **attr) }
 
   let(:attr) { {} }
-  let(:view_context) { controller.view_context }
-  let(:render) do
-    component.render_in(view_context)
-  end
-
-  let(:rendered) do
-    Capybara::Node::Simple.new(render)
-  end
-
-  let(:docs) { 10.times.map { double } }
+  let(:view_context) { vc_test_controller.view_context }
+  let(:docs) { 10.times.map { SolrDocument.new } }
 
   let(:group) do
     instance_double(Blacklight::Solr::Response::Group, key: 'group1', field: 'group_field', total: 15, docs: docs)
   end
 
   before do
+    # Every call to view_context returns a different object. This ensures it stays stable.
+    allow(vc_test_controller).to receive_messages(view_context: view_context)
     allow(view_context).to receive(:render_document_index).with(docs).and_return('results')
+    render_inline component
   end
 
   it 'renders the group with a header' do
-    expect(rendered).to have_css 'div.group'
-    expect(rendered).to have_css 'h2', text: 'group1'
-    expect(rendered).to have_no_link 'more'
+    expect(page).to have_css 'div.group'
+    expect(page).to have_css 'h2', text: 'group1'
+    expect(page).to have_no_link 'more'
   end
 
   it 'renders the group documents' do
-    expect(rendered).to have_content 'results'
+    expect(page).to have_content 'results'
   end
 
   context 'with a limit applied' do
     let(:attr) { { group_limit: 5 } }
 
     it 'renders a control to see more results' do
-      expect(rendered).to have_link 'more'
+      expect(page).to have_link 'more'
     end
   end
 end

data/spec/components/blacklight/document/page_header_component_spec.rb

@@ -7,14 +7,7 @@ RSpec.describe Blacklight::Document::PageHeaderComponent, type: :component do
 
   let(:show_header_tools_component) { Class.new(Blacklight::Document::ShowToolsComponent) }
 
-  let(:view_context) { controller.view_context }
-  let(:render) do
-    component.render_in(view_context)
-  end
-
-  let(:rendered) do
-    Capybara::Node::Simple.new(render)
-  end
+  let(:view_context) { vc_test_controller.view_context }
 
   let(:document) { SolrDocument.new(id: 'x', title_tsim: 'Title') }
 
@@ -25,16 +18,16 @@ RSpec.describe Blacklight::Document::PageHeaderComponent, type: :component do
   # rubocop:disable RSpec/SubjectStub
   before do
     # Every call to view_context returns a different object. This ensures it stays stable.
-    allow(controller).to receive_messages(blacklight_config: blacklight_config)
-    allow(controller).to receive(:current_search_session).and_return(double(id: document.id))
-    controller.class.helper_method :current_search_session
-    allow(controller).to receive_messages(controller_name: 'catalog', link_to_previous_document: '', link_to_next_document: '')
+    allow(vc_test_controller).to receive_messages(view_context: view_context, blacklight_config: blacklight_config)
+    allow(vc_test_controller).to receive(:current_search_session).and_return(double(id: document.id))
+    vc_test_controller.class.helper_method :current_search_session
+    allow(vc_test_controller).to receive_messages(controller_name: 'catalog', link_to_previous_document: '', link_to_next_document: '')
     allow(view_context).to receive_messages(search_context: search_context, search_session: current_search_session, current_search_session: current_search_session)
     allow(component).to receive(:render).and_call_original
     allow(component).to receive(:render).with(an_instance_of(show_header_tools_component)).and_return('tool component content')
     replace_hash = { 'application/_start_over.html.erb' => 'Start Over' }
     if Rails.version.to_f >= 7.1
-      controller.prepend_view_path(RSpec::Rails::ViewExampleGroup::StubResolverCache.resolver_for(replace_hash))
+      vc_test_controller.prepend_view_path(RSpec::Rails::ViewExampleGroup::StubResolverCache.resolver_for(replace_hash))
     else
       view_context.view_paths.unshift(RSpec::Rails::ViewExampleGroup::StubResolverCache.resolver_for(replace_hash))
     end
@@ -45,18 +38,25 @@ RSpec.describe Blacklight::Document::PageHeaderComponent, type: :component do
     let(:search_context) { nil }
     let(:current_search_session) { {} }
 
-    it 'does not render' do
-      expect(rendered.native.inner_html).to be_blank
+    context 'with no header tools' do
+      before do
+        render_inline component
+      end
+
+      it 'does not render' do
+        expect(page.native.inner_html).to be_blank
+      end
     end
 
     context 'has header tools' do
       before do
         blacklight_config.show.show_header_tools_component = show_header_tools_component
+        render_inline component
       end
 
       it 'renders the tools' do
-        expect(rendered).to have_text 'tool component content'
-        expect(rendered).to have_css '.row'
+        expect(page).to have_text 'tool component content'
+        expect(page).to have_css '.row'
       end
     end
   end
@@ -67,25 +67,32 @@ RSpec.describe Blacklight::Document::PageHeaderComponent, type: :component do
     let(:next_doc) { SolrDocument.new(id: '888') }
     let(:current_search_session) { { query_params: { q: 'abc' }, 'id' => '123', 'document_id' => document.id } }
 
-    it 'renders pagination' do
-      expect(rendered).to have_text 'Previous'
-      expect(rendered).to have_text 'Next'
-      expect(rendered).to have_text 'Start Over'
-      expect(rendered).to have_text 'Back to Search'
+    context 'with no header tools' do
+      before do
+        render_inline component
+      end
+
+      it 'renders pagination' do
+        expect(page).to have_text 'Previous'
+        expect(page).to have_text 'Next'
+        expect(page).to have_text 'Start Over'
+        expect(page).to have_text 'Back to Search'
+      end
     end
 
     context 'has header tools' do
       before do
         blacklight_config.show.show_header_tools_component = show_header_tools_component
+        render_inline component
       end
 
       it 'renders the tools and pagination' do
-        expect(rendered).to have_text 'Previous'
-        expect(rendered).to have_text 'Next'
-        expect(rendered).to have_text 'Start Over'
-        expect(rendered).to have_text 'Back to Search'
-        expect(rendered).to have_text 'tool component content'
-        expect(rendered).to have_css '.row'
+        expect(page).to have_text 'Previous'
+        expect(page).to have_text 'Next'
+        expect(page).to have_text 'Start Over'
+        expect(page).to have_text 'Back to Search'
+        expect(page).to have_text 'tool component content'
+        expect(page).to have_css '.row'
       end
     end
   end

data/spec/components/blacklight/document/sidebar_component_spec.rb

@@ -5,14 +5,7 @@ require 'spec_helper'
 RSpec.describe Blacklight::Document::SidebarComponent, type: :component do
   subject(:component) { described_class.new(presenter: document) }
 
-  let(:view_context) { controller.view_context }
-  let(:render) do
-    component.render_in(view_context)
-  end
-
-  let(:rendered) do
-    Capybara::Node::Simple.new(render)
-  end
+  let(:view_context) { vc_test_controller.view_context }
 
   let(:document) { view_context.document_presenter(presented_document) }
 
@@ -26,7 +19,7 @@ RSpec.describe Blacklight::Document::SidebarComponent, type: :component do
 
   before do
     # Every call to view_context returns a different object. This ensures it stays stable.
-    allow(controller).to receive_messages(view_context: view_context, blacklight_config: blacklight_config)
+    allow(vc_test_controller).to receive_messages(view_context: view_context, blacklight_config: blacklight_config)
   end
 
   describe '#render_show_tools' do
@@ -35,13 +28,14 @@ RSpec.describe Blacklight::Document::SidebarComponent, type: :component do
       allow(component).to receive(:render).with(an_instance_of(Blacklight::Document::MoreLikeThisComponent)).and_return("")
       blacklight_config.show.show_tools_component = show_tools_component
       allow(component).to receive(:render).with(an_instance_of(show_tools_component)).and_return(expected_html)
+      render_inline component
     end
+    # rubocop:enable RSpec/SubjectStub
 
     let(:show_tools_component) { Class.new(Blacklight::Document::ShowToolsComponent) }
 
     it 'renders configured show_tools component' do
-      expect(rendered).to have_css 'div[@class="expected-show_tools"]'
+      expect(page).to have_css 'div[@class="expected-show_tools"]'
     end
-    # rubocop:enable RSpec/SubjectStub
   end
 end