Use formatted name for worldwide organisations #3029
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
|
Depends on alphagov/publishing-api#2587. |
brucebolt
force-pushed
the
use-ww-org-formatted-name
branch
from
e81e925 to
1a23c25
Compare
brucebolt
force-pushed
the
use-ww-org-formatted-name
branch
from
1a23c25 to
538bcda
Compare
brucebolt
force-pushed
the
use-ww-org-formatted-name
branch
from
538bcda to
b950143
Compare
We are currently presenting the Worldwide Organisation's title in the logo. This means there are no line breaks in the places specified by the user. Updating to use the formatted title, which the publisher would have expected since they entered this in Whitehall. This also applies the change to Worldwide Offices and Worldwide Corporate Information Pages, which include the Worldwide Organisation's logo in the header.
brucebolt
force-pushed
the
use-ww-org-formatted-name
branch
from
b950143 to
bae6511
Compare
jkempster34
approved these changes
Jan 3, 2024
| @@ -41,7 +41,8 @@ class WorldwideCorporateInformationPageTest < ActionDispatch::IntegrationTest | |||
| setup_and_visit_content_item("worldwide_corporate_information_page") | |||
|
|
|||
| assert_has_component_organisation_logo | |||
| assert page.has_link? "British Embassy Manila", href: "/world/organisations/british-embassy-manila" | |||
| assert_has_component_title("British Embassy\nManila") | |||
There was a problem hiding this comment.
I don't understand why this works with a \n and not a <br>😕
There was a problem hiding this comment.
I think that's because we're matching on text here, rather than the raw HTML, so the line break has already been parsed.
| @@ -41,7 +41,8 @@ class WorldwideCorporateInformationPageTest < ActionDispatch::IntegrationTest | |||
| setup_and_visit_content_item("worldwide_corporate_information_page") | |||
|
|
|||
| assert_has_component_organisation_logo | |||
| assert page.has_link? "British Embassy Manila", href: "/world/organisations/british-embassy-manila" | |||
| assert_has_component_title("British Embassy\nManila") | |||
| assert page.has_link? "British EmbassyManila", href: "/world/organisations/british-embassy-manila" | |||
There was a problem hiding this comment.
Shame this doesn't also work with the \n
There was a problem hiding this comment.
Indeed. There seems to be some inconsistency in the way these matchers work.
hannako
reviewed
Jan 3, 2024
| @@ -42,7 +42,7 @@ def schema_name | |||
|
|
|||
| presented = create_presenter(WorldwideCorporateInformationPagePresenter, content_item: without_sponsoring_organisations) | |||
|
|
|||
| expected = { name: "British Embassy Manila", url: "/world/organisations/british-embassy-manila", crest: "single-identity", brand: "single-identity" } | |||
| expected = { name: "British Embassy<br/>Manila", url: "/world/organisations/british-embassy-manila", crest: "single-identity", brand: "single-identity" } | |||
There was a problem hiding this comment.
I don't understand where this <br/> is coming from. I can see the title in the schema example...
There was a problem hiding this comment.
It comes from the formatted_title.
There was a problem hiding this comment.
Oh different field! OK gottit!
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
We are currently presenting the Worldwide Organisation's title in the logo. This means there are no line breaks in the places specified by the user.
Updating to use the formatted title, which the publisher would have expected since they entered this in Whitehall.
Screenshots
Trello card