Skip to content

Commit

Permalink
Add TakePartController
Browse files Browse the repository at this point in the history
- add view and helpers
- convert test suite to RSpec on move
- note that we explicitly remove the content-bottom-margin div
  class that was immediately inside the 2/3rds column. This is
  a style used in a handful of government-frontend document
  types which (on review with frontend developers) does not
  really fix the problem it's trying to fix (insufficient bottom
  margin on some tablet-sized devices). This has been captured
  as alphagov/govuk_publishing_components#4220
  to be fixed properly in the components gem.
- We replace the call to TitleHelper in the view with a direct call,
  as it didn't add much and it's not clear whether it's worth
  copying that helper across yet.
- main element wrapper added as it's in the layout in government-
  frontend, but not in frontend.

Commit audit trail:
- https://github.com/alphagov/government-frontend/blob/6523741691ddfb9551967311a3f79775e9403ecf/app/views/content_items/take_part.html.erb
- https://github.com/alphagov/government-frontend/blob/6523741691ddfb9551967311a3f79775e9403ecf/test/integration/take_part_test.rb
  • Loading branch information
KludgeKML committed Nov 4, 2024
1 parent 75b6e31 commit e014bc7
Show file tree
Hide file tree
Showing 5 changed files with 94 additions and 2 deletions.
2 changes: 2 additions & 0 deletions app/controllers/take_part_controller.rb
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
class TakePartController < ContentItemsController
end
44 changes: 44 additions & 0 deletions app/views/take_part/show.html.erb
Original file line number Diff line number Diff line change
@@ -0,0 +1,44 @@
<% content_for :title do %>
<%= @content_item.title %> - GOV.UK
<% end %>

<% content_for :extra_headers do %>
<%= render "govuk_publishing_components/components/machine_readable_metadata", { content_item: @content_item.to_h, schema: :article } %>
<meta name="description" content="<%= strip_tags(@content_item.description) %>">
<% end %>


<main role="main" id="content" class="take-part" <%= lang_attribute(@content_item.locale) %>>
<div class="govuk-grid-row">
<div class="govuk-grid-column-two-thirds">
<%= render "govuk_publishing_components/components/title", {
title: @content_item.title,
context: I18n.t("formats.#{@content_item.document_type}", count: 1),
context_locale: t_locale_fallback("formats.#{@content_item.document_type}", count: 1),
}
%>
<%= render "govuk_publishing_components/components/lead_paragraph", text: @content_item.description %>
</div>

<%= render 'shared/translations' %>
</div>

<div class="govuk-grid-row">
<div class="govuk-grid-column-two-thirds">
<%= render 'components/figure',
src: @content_item.image["url"],
alt: @content_item.image["alt_text"],
credit: @content_item.image["credit"],
caption: @content_item.image["caption"] if @content_item.image %>

<%= render "govuk_publishing_components/components/govspeak", {
direction: page_text_direction
} do %>
<%= raw(@content_item.body) %>
<% end %>
</div>
<%= render 'shared/sidebar_navigation' %>
</div>
</main>

<%= render 'shared/footer_navigation' %>
10 changes: 8 additions & 2 deletions config/routes.rb
Original file line number Diff line number Diff line change
Expand Up @@ -70,8 +70,14 @@
# Media previews
get "/media/:id/:filename/preview", to: "csv_preview#show", filename: /[^\/]+/

# Placeholder for attachments being virus-scanned
get "/government/placeholder", to: "placeholder#show"
scope "/government" do
# Placeholder for attachments being virus-scanned
get "/placeholder", to: "placeholder#show"

scope "/get-involved" do
get "/take-part/:slug", to: "take_part#show"
end
end

# Simple Smart Answer pages
constraints FormatRoutingConstraint.new("simple_smart_answer") do
Expand Down
13 changes: 13 additions & 0 deletions spec/requests/take_part_spec.rb
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
RSpec.describe "Take Part" do
before do
content_store_has_example_item("/government/get-involved/take-part/tp1", schema: :take_part)
end

context "GET index" do
it "returns 200" do
get "/government/get-involved/take-part/tp1"

expect(response).to have_http_status(:ok)
end
end
end
27 changes: 27 additions & 0 deletions spec/system/take_part_spec.rb
Original file line number Diff line number Diff line change
@@ -0,0 +1,27 @@
RSpec.describe "TakePart" do
it_behaves_like "it has meta tags", "take_part", "/government/get-involved/take-part"
it_behaves_like "it has meta tags for images", "take_part", "/government/get-involved/take-part"

before do
content_store_has_example_item("/government/get-involved/take-part/tp1", schema: :take_part)
end

context "when visiting a Take Part page" do
it "displays the take_part page" do
visit "/government/get-involved/take-part/tp1"

expect(page).to have_title("Become a councillor - GOV.UK")

expect(page).to have_css("h1", text: "Become a councillor")
expect(page).to have_text("All councils are led by democratically elected councillors who set the vision and direction, and represent their local community.")

assert page.has_text?("There are roughly 20,000 local councillors in England. Councillors are elected to the local council to represent their own local community, so they must either live or work in the area.")
end

it "does not display a single page notification button" do
visit "/government/get-involved/take-part/tp1"

expect(page).not_to have_css(".gem-c-single-page-notification-button")
end
end
end

0 comments on commit e014bc7

Please sign in to comment.