Skip to content

Commit b32879e

Browse files
authored
Merge pull request #2889 from projectblacklight/extract-logo-link-method
Extract a logo_link method on the TopNavbarComponent
2 parents a440c79 + 8ed372b commit b32879e

File tree

3 files changed

+25
-1
lines changed

3 files changed

+25
-1
lines changed

app/components/blacklight/top_navbar_component.html.erb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<nav class="navbar navbar-expand-md navbar-dark bg-dark topbar" role="navigation">
22
<div class="<%= container_classes %>">
3-
<%= link_to application_name, blacklight_config.logo_link, class: 'mb-0 navbar-brand navbar-logo' %>
3+
<%= logo_link %>
44
<button class="navbar-toggler navbar-toggler-right" type="button" data-toggle="collapse" data-bs-toggle="collapse" data-target="#user-util-collapse" data-bs-target="#user-util-collapse" aria-controls="user-util-collapse" aria-expanded="false" aria-label="Toggle navigation">
55
<span class="navbar-toggler-icon"></span>
66
</button>

app/components/blacklight/top_navbar_component.rb

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,5 +9,9 @@ def initialize(blacklight_config:)
99
attr_reader :blacklight_config
1010

1111
delegate :application_name, :container_classes, to: :helpers
12+
13+
def logo_link(title: application_name)
14+
link_to title, blacklight_config.logo_link, class: 'mb-0 navbar-brand navbar-logo'
15+
end
1216
end
1317
end
Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,20 @@
1+
# frozen_string_literal: true
2+
3+
RSpec.describe Blacklight::HeaderComponent, type: :component do
4+
before do
5+
with_controller_class(CatalogController) do
6+
allow(controller).to receive(:current_user).and_return(nil)
7+
allow(controller).to receive(:search_action_url).and_return('/search')
8+
render
9+
end
10+
end
11+
12+
context 'with no slots' do
13+
let(:render) { render_inline(described_class.new(blacklight_config: CatalogController.blacklight_config)) }
14+
15+
it 'draws the topbar' do
16+
expect(page).to have_css 'nav.topbar'
17+
expect(page).to have_link 'Blacklight', href: '/'
18+
end
19+
end
20+
end

0 commit comments

Comments
 (0)