Merge pull request #3321 from projectblacklight/remove-show-tools-partial

Remove deprecated show tools partial

Author: jcoyne

app/components/blacklight/document/sidebar_component.rb

@@ -16,12 +16,12 @@ def initialize(presenter:)
 
       private
 
-      def render_show_tools
-        blacklight_config.view_config(:show).show_tools_component&.tap do |show_tools_component_class|
-          return render show_tools_component_class.new(document: document)
-        end
+      def show_tools_component_class
+        blacklight_config.view_config(:show).show_tools_component
+      end
 
-        render 'show_tools', document: document, silence_deprecation: helpers.partial_from_blacklight?('show_tools')
+      def render_show_tools
+        render show_tools_component_class.new(document: document)
       end
     end
   end

app/helpers/blacklight/blacklight_helper_behavior.rb

@@ -41,10 +41,4 @@ def with_format(format)
   def self.blacklight_gem_path
     @blacklight_gem_path ||= Gem.loaded_specs["blacklight"].full_gem_path
   end
-
-  def partial_from_blacklight?(partial)
-    path = lookup_context.find_all(partial, lookup_context.prefixes + [""], true).first&.identifier
-
-    path.nil? ? false : path.starts_with?(Blacklight::BlacklightHelperBehavior.blacklight_gem_path)
-  end
 end

app/views/catalog/_show_tools.html.erb

@@ -183,9 +183,7 @@ def initialized_default_configuration?
         # document presenter class used by helpers and views
         document_presenter_class: nil,
         document_component: Blacklight::DocumentComponent,
-        # in Blacklight 9, the default show_tools_component configuration will
-        # be Blacklight::Document::ShowToolsComponent
-        show_tools_component: nil,
+        show_tools_component: Blacklight::Document::ShowToolsComponent,
         show_header_tools_component: nil,
         document_header_component: Blacklight::Document::PageHeaderComponent,
         sidebar_component: Blacklight::Document::SidebarComponent,

lib/blacklight/configuration.rb

@@ -33,29 +33,14 @@
     # rubocop:disable RSpec/SubjectStub
     before 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)
     end
 
-    context "without a configured ShowTools component" do
-      before do
-        allow(component).to receive(:render).with('show_tools', document: presented_document, silence_deprecation: false).and_return(expected_html)
-      end
+    let(:show_tools_component) { Class.new(Blacklight::Document::ShowToolsComponent) }
 
-      it 'renders show_tools partial' do
-        expect(rendered).to have_css 'div[@class="expected-show_tools"]'
-      end
-    end
-
-    context "with a configured ShowTools component" do
-      let(:show_tools_component) { Class.new(Blacklight::Document::ShowToolsComponent) }
-
-      before do
-        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)
-      end
-
-      it 'renders configured show_tools component' do
-        expect(rendered).to have_css 'div[@class="expected-show_tools"]'
-      end
+    it 'renders configured show_tools component' do
+      expect(rendered).to have_css 'div[@class="expected-show_tools"]'
     end
     # rubocop:enable RSpec/SubjectStub
   end