Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix single line formatting of call to action component #302

Merged
merged 1 commit into from
Jan 24, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,7 @@
## Unreleased

* Fix single line formatting of call to action component ([#302](https://github.com/alphagov/govspeak/pull/302))

## 8.3.2

* Various bug fixes related to legislative list components ([#298](https://github.com/alphagov/govspeak/pull/298))
Expand Down
4 changes: 3 additions & 1 deletion lib/govspeak.rb
Original file line number Diff line number Diff line change
Expand Up @@ -277,7 +277,9 @@ def render_image(image)

extension("call-to-action", surrounded_by("$CTA")) do |body|
<<~BODY
<div class="call-to-action" markdown="1">#{body}</div>
<div class="call-to-action" markdown="1">
#{body.strip}
</div>
BODY
end

Expand Down
43 changes: 42 additions & 1 deletion test/govspeak_test.rb
Original file line number Diff line number Diff line change
Expand Up @@ -425,6 +425,48 @@ class GovspeakTest < Minitest::Test
assert_text_output "Click here to start the tool"
end

test_given_govspeak "
$CTA Click here to start the program $CTA

Here is some text" do
assert_html_output %(
<div class="call-to-action">
<p>Click here to start the program</p>
</div>

<p>Here is some text</p>)
end

test_given_govspeak "
Some text

$CTA Click there to start the program $CTA

Here is some text" do
assert_html_output %(
<p>Some text</p>
<div class="call-to-action">
<p>Click there to start the program</p>
</div>

<p>Here is some text</p>)
end

test_given_govspeak "
Some text

$CTAClick anywhere to start the program$CTA

Here is some text" do
assert_html_output %(
<p>Some text</p>
<div class="call-to-action">
<p>Click anywhere to start the program</p>
</div>

<p>Here is some text</p>)
end

test_given_govspeak "
Here is some text\n

Expand Down Expand Up @@ -453,7 +495,6 @@ class GovspeakTest < Minitest::Test
$CTA" do
assert_html_output %(
<div class="call-to-action">

<p>This is a test:</p>

<ol class="steps">
Expand Down
Loading