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

[#7194] Tweak wording on Internal Review mailer #7195

Draft
wants to merge 4 commits into
base: develop
Choose a base branch
from
Draft

[#7194] Tweak wording on Internal Review mailer #7195

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
c9219c1
Replace "Internet" with "online" in IR templates
mdeuk Jul 28, 2022
0620201
Update internal review specs
mdeuk Jul 28, 2022
2bddce5
Fixup! Update IR template in spec
mdeuk Jul 31, 2022
2bee517
Merge branch 'mysociety:develop' into 7194-Wording-tweak-for-internal…
mdeuk Sep 2, 2022
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 app/models/outgoing_message/template/internal_review.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,8 +30,8 @@ def letter(replacements = {})

unless replacements[:embargo]
msg += "\n\n\n\n"
msg += _("A full history of my FOI request and all " \
"correspondence is available on the Internet at this " \
msg += _("A full history of my FOI request, including all " \
"correspondence, is available online at this " \
"address: {{url}}",
replacements)
end
Expand Down
7 changes: 2 additions & 5 deletions spec/models/outgoing_message/template/internal_review_spec.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,10 +47,7 @@

[ GIVE DETAILS ABOUT YOUR COMPLAINT HERE ]



A full history of my FOI request and all correspondence is available on the Internet at this address: http://test.host/request/a_test_title

A full history of my FOI request, including all correspondence, is available online at this address: http://test.host/request/a_test_title

Yours faithfully,

Expand Down Expand Up @@ -98,8 +95,8 @@
[ GIVE DETAILS ABOUT YOUR COMPLAINT HERE ]


A full history of my FOI request, including all correspondence, is available online at this address: http://test.host/request/a_test_title

A full history of my FOI request and all correspondence is available on the Internet at this address: http://test.host/request/a_test_title
EOF
expected.chomp!

Expand Down
12 changes: 6 additions & 6 deletions spec/models/outgoing_message_spec.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -592,8 +592,8 @@ class TestError < StandardError; end
:info_request => info_request)

expect(outgoing_message.body).
to include("A full history of my FOI request and all " \
"correspondence is available on the Internet at this " \
to include("A full history of my FOI request, including " \
"all correspondence is available online at this " \
"address")
end

Expand All @@ -607,8 +607,8 @@ class TestError < StandardError; end
:info_request => info_request)

expect(outgoing_message.body).
not_to include("A full history of my FOI request and all " \
"correspondence is available on the Internet at " \
not_to include("A full history of my FOI request, including " \
"all correspondence, is available on the online at " \
"this address")
end

Expand Down Expand Up @@ -803,7 +803,7 @@ class TestError < StandardError; end



A full history of my FOI request and all correspondence is available on the Internet at this address: http://test.host/request/a_test_title
A full history of my FOI request, including all correspondence, is available online at this address: http://test.host/request/a_test_title


Yours faithfully,
Expand Down Expand Up @@ -1942,7 +1942,7 @@ class TestError < StandardError; end
:what_doing => 'internal_review',
:info_request => info_request
})
expected_text = "Dear A test public body,\n\nPlease pass this on to the person who conducts Freedom of Information reviews.\n\nI am writing to request an internal review of A test public body's handling of my FOI request 'A test title'.\n\n[ GIVE DETAILS ABOUT YOUR COMPLAINT HERE ]\n\nA full history of my FOI request and all correspondence is available on the Internet at this address: http://test.host/request/a_test_title\n\nYours faithfully,"
expected_text = "Dear A test public body,\n\nPlease pass this on to the person who conducts Freedom of Information reviews.\n\nI am writing to request an internal review of A test public body's handling of my FOI request 'A test title'.\n\n[ GIVE DETAILS ABOUT YOUR COMPLAINT HERE ]\n\nA full history of my FOI request, including all correspondence, is available online at this address: http://test.host/request/a_test_title\n\nYours faithfully,"
expect(outgoing_message.body).to eq(expected_text)
end

Expand Down