diff --git a/__fixtures__/menus.json b/__fixtures__/menus.json index b3de53345..1d0e7f854 100644 --- a/__fixtures__/menus.json +++ b/__fixtures__/menus.json @@ -5,7 +5,7 @@ { "label": "Sign In", "url": "/login?location=${currentPath}", "submenu": null }, { "label": "Sign Out", "url": "/logout", "submenu": null }, { "label": "Subscribe", "url": "/products", "submenu": null }, - { "label": "Account Settings", "url": "https://myaccount.ft.com/details/core/view", "submenu": null }, + { "label": "Settings & Account", "url": "https://www.ft.com/myaccount", "submenu": null }, { "label": "myFT", "url": "/myft", "submenu": null }, { "label": "Portfolio", "url": "https://markets.ft.com/data/portfolio/dashboard", "submenu": null } ] @@ -980,7 +980,7 @@ "label": "User", "items": [ { "label": "Help Centre", "url": "http://help.ft.com", "submenu": null }, - { "label": "Account Settings", "url": "https://myaccount.ft.com/details/core/view", "submenu": null }, + { "label": "Settings & Account", "url": "https://www.ft.com/myaccount", "submenu": null }, { "label": "Contact Preferences", "url": "/myft/alerts", "submenu": null }, { "label": "Sign Out", "url": "/logout", "submenu": null } ] @@ -1161,7 +1161,7 @@ "label": "Navigation", "items": [ { "label": "Portfolio", "url": "https://markets.ft.com/data/portfolio/dashboard", "submenu": null }, - { "label": "Account Settings", "url": "https://myaccount.ft.com/details/core/view", "submenu": null } + { "label": "Settings & Account", "url": "https://www.ft.com/myaccount", "submenu": null } ] }, "navbar-right-anon": { diff --git a/examples/ft-ui/__test__/anonymous-user.test.js b/examples/ft-ui/__test__/anonymous-user.test.js index 9229c2c8f..58f58ed1f 100644 --- a/examples/ft-ui/__test__/anonymous-user.test.js +++ b/examples/ft-ui/__test__/anonymous-user.test.js @@ -19,8 +19,8 @@ describe('examples/ft-ui', () => { await expect( page ).not.toMatchElement( - '.o-header__nav-list--right a[href="https://myaccount.ft.com/details/core/view"]', - { text: 'Account Settings' } + '.o-header__nav-list--right a[href="https://www.ft.com/myaccount"]', + { text: 'Settings & Account' } ) await expect( page diff --git a/examples/ft-ui/__test__/logged-in-user.test.js b/examples/ft-ui/__test__/logged-in-user.test.js index 523837ee7..8e0f9b74c 100644 --- a/examples/ft-ui/__test__/logged-in-user.test.js +++ b/examples/ft-ui/__test__/logged-in-user.test.js @@ -8,9 +8,9 @@ describe('examples/ft-ui', () => { it('renders the expected loggin-in user Header link elements', async () => { await expect(page).toMatchElement('.o-header__top-column--right a[href="/myft"]', { text: 'myFT' }) await expect(page).toMatchElement( - '.o-header__nav-list--right a[href="https://myaccount.ft.com/details/core/view"]', + '.o-header__nav-list--right a[href="https://www.ft.com/myaccount"]', { - text: 'Account Settings' + text: 'Settings & Account' } ) await expect( diff --git a/packages/dotcom-ui-header/src/__stories__/story-data/navbarRight.ts b/packages/dotcom-ui-header/src/__stories__/story-data/navbarRight.ts index 77fc00a53..7db493510 100644 --- a/packages/dotcom-ui-header/src/__stories__/story-data/navbarRight.ts +++ b/packages/dotcom-ui-header/src/__stories__/story-data/navbarRight.ts @@ -9,8 +9,8 @@ const data: TNavMenu = { submenu: null }, { - label: 'Account Settings', - url: 'https://myaccount.ft.com/details/core/view', + label: 'Settings & Account', + url: 'https://www.ft.com/myaccount', submenu: null } ] diff --git a/packages/dotcom-ui-header/src/__stories__/story-data/user.ts b/packages/dotcom-ui-header/src/__stories__/story-data/user.ts index 777c9c552..2c762c155 100644 --- a/packages/dotcom-ui-header/src/__stories__/story-data/user.ts +++ b/packages/dotcom-ui-header/src/__stories__/story-data/user.ts @@ -4,7 +4,7 @@ const data: TNavMenu = { label: 'User', items: [ { label: 'Help Centre', url: 'http://help.ft.com', submenu: null }, - { label: 'Account Settings', url: 'https://myaccount.ft.com/details/core/view', submenu: null }, + { label: 'Settings & Account', url: 'https://www.ft.com/myaccount', submenu: null }, { label: 'Contact Preferences', url: '/myft/alerts', submenu: null }, { label: 'Sign Out', url: '/logout', submenu: null } ] diff --git a/packages/dotcom-ui-header/src/__test__/components/__snapshots__/Drawer.spec.tsx.snap b/packages/dotcom-ui-header/src/__test__/components/__snapshots__/Drawer.spec.tsx.snap index 10f911524..8b279c0d4 100644 --- a/packages/dotcom-ui-header/src/__test__/components/__snapshots__/Drawer.spec.tsx.snap +++ b/packages/dotcom-ui-header/src/__test__/components/__snapshots__/Drawer.spec.tsx.snap @@ -1239,10 +1239,10 @@ exports[`dotcom-ui-header/src/components/Drawer renders as a logged in user 1`] > - Account Settings + Settings & Account
  • { it('renders the expected logged in user header links', () => { expect(header.find('a[data-trackable="Portfolio"]')).toExist() - expect(header.find('a[data-trackable="Account Settings"]')).toExist() + expect(header.find('a[data-trackable="Settings & Account"]')).toExist() }) it('does not render the anonymous user header links', () => { @@ -79,7 +79,7 @@ describe('dotcom-ui-header', () => { it('does not render the logged in user header links', () => { expect(header.find('a[data-trackable="Portfolio"]')).not.toExist() - expect(header.find('a[data-trackable="Account Settings"]')).not.toExist() + expect(header.find('a[data-trackable="Settings & Account"]')).not.toExist() }) }) }) diff --git a/packages/dotcom-ui-header/src/__test__/enzyme/drawer.spec.tsx b/packages/dotcom-ui-header/src/__test__/enzyme/drawer.spec.tsx index ce1164dc1..384838ade 100644 --- a/packages/dotcom-ui-header/src/__test__/enzyme/drawer.spec.tsx +++ b/packages/dotcom-ui-header/src/__test__/enzyme/drawer.spec.tsx @@ -90,8 +90,8 @@ describe('dotcom-ui-header/src/components/drawer', () => { expect(result.find('a[data-trackable="Sign Out"]')).toExist() }) - it('renders account settings link', () => { - expect(result.find('a[data-trackable="Account Settings"]')).toExist() + it('renders settings and account link', () => { + expect(result.find('a[data-trackable="Settings & Account"]')).toExist() }) })