Skip to content

Commit

Permalink
Merge pull request #919 from alphagov/next-previous
Browse files Browse the repository at this point in the history
Use the Previous/Next component from the gem
  • Loading branch information
tijmenb authored Jun 1, 2018
2 parents 1447e94 + 742a1f0 commit 241efed
Show file tree
Hide file tree
Showing 4 changed files with 4 additions and 4 deletions.
2 changes: 1 addition & 1 deletion app/views/content_items/guide.html.erb
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@
direction: page_text_direction,
disable_youtube_expansions: true,
rich_govspeak: true %>
<%= render 'govuk_component/previous_and_next_navigation', @content_item.previous_and_next_navigation %>
<%= render 'govuk_publishing_components/components/previous_and_next_navigation', @content_item.previous_and_next_navigation %>

<% if @content_item.multi_page_guide? %>
<%= render 'components/print-link', href: @content_item.print_link, link_text: t("multi_page.print_entire_guide") %>
Expand Down
2 changes: 1 addition & 1 deletion app/views/content_items/travel_advice.html.erb
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@
content: @content_item.current_part_body,
direction: page_text_direction %>

<%= render 'govuk_component/previous_and_next_navigation', @content_item.previous_and_next_navigation %>
<%= render 'govuk_publishing_components/components/previous_and_next_navigation', @content_item.previous_and_next_navigation %>

<%= render 'components/print-link', href: @content_item.print_link, link_text: t("multi_page.print_entire_guide") %>
</div>
Expand Down
2 changes: 1 addition & 1 deletion test/integration/guide_test.rb
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ class GuideTest < ActionDispatch::IntegrationTest
assert_has_component_title(@content_item['title'])

assert page.has_css?('h1', text: @content_item['details']['parts'].first['title'])
assert page.has_css?(shared_component_selector("previous_and_next_navigation"))
assert page.has_css?('.gem-c-pagination')
assert page.has_css?('.app-c-print-link a[href$="/print"]')
end

Expand Down
2 changes: 1 addition & 1 deletion test/integration/travel_advice_test.rb
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ class TravelAdviceTest < ActionDispatch::IntegrationTest
assert page.has_css?(".part-navigation li a[href*=\"#{part['slug']}\"]", text: part['title'])
end

assert page.has_css?(shared_component_selector("previous_and_next_navigation"))
assert page.has_css?('.gem-c-pagination')
assert page.has_css?('.app-c-print-link a[href$="/print"]')
end

Expand Down

0 comments on commit 241efed

Please sign in to comment.