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.

Sign up for GitHub

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

Make preprocessor work with frozen inputs #27

Merged
merged 2 commits into from
Mar 31, 2023
Merged

Make preprocessor work with frozen inputs #27

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
c80df1e
Make preprocessor work with frozen inputs
peteryates Feb 25, 2023
4ffec73
Update specs
HettieS Mar 30, 2023
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: 2 additions & 2 deletions lib/govuk_markdown/preprocessor.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ def initialize(document)
end

def inject_inset_text
output.gsub!(build_regexp("inset-text")) do
@output = output.gsub(build_regexp("inset-text")) do
HettieS marked this conversation as resolved.
Show resolved Hide resolved
<<~HTML
<div class="govuk-inset-text">
#{nested_markdown(Regexp.last_match(1))}
Expand All @@ -18,7 +18,7 @@ def inject_inset_text
end

def inject_details
output.gsub!(build_regexp("details")) do
@output = output.gsub(build_regexp("details")) do
summary, details = *construct_details_from(Regexp.last_match(1))

<<~HTML
Expand Down
54 changes: 36 additions & 18 deletions spec/preprocessor_spec.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -321,6 +321,29 @@
end

describe "multiple preprocessing steps" do
let(:expected_output) do
<<~HTML
<p class="govuk-body-m">an unrelated paragraph</p>

<details class="govuk-details" data-module="govuk-details">
<summary class="govuk-details__summary">
<span class="govuk-details__summary-text">
#{output_summary}
</span>
</summary>
<div class="govuk-details__text">
#{output_details_text}
</div>
</details>

<div class="govuk-inset-text">
#{a_line_of_text}
</div>

<p class="govuk-body-m">an unrelated paragraph</p>
HTML
end

context "inset text and details" do
let(:input) do
<<~MD
Expand All @@ -334,27 +357,22 @@
MD
end

let(:expected_output) do
<<~HTML
<p class="govuk-body-m">an unrelated paragraph</p>
it "renders correctly" do
expect_equal_ignoring_ws(render(input), expected_output)
end
end

<details class="govuk-details" data-module="govuk-details">
<summary class="govuk-details__summary">
<span class="govuk-details__summary-text">
#{output_summary}
</span>
</summary>
<div class="govuk-details__text">
#{output_details_text}
</div>
</details>
context "when the input string is frozen" do
let(:input) do
<<~MD.freeze
an unrelated paragraph

<div class="govuk-inset-text">
#{a_line_of_text}
</div>
{details}#{a_line_of_text}{/details}

<p class="govuk-body-m">an unrelated paragraph</p>
HTML
{inset-text}#{a_line_of_text}{/inset-text}

an unrelated paragraph
MD
end

it "renders correctly" do
Expand Down