diff --git a/plugins/contact/src/index.ts b/plugins/contact/src/index.ts index ab1ce98e2b..aa3fb55770 100644 --- a/plugins/contact/src/index.ts +++ b/plugins/contact/src/index.ts @@ -178,7 +178,7 @@ export function getLastName (name: string): string { * @public */ export function formatName (name: string): string { - return getFirstName(name) + ' ' + getLastName(name) + return getLastName(name) + ' ' + getFirstName(name) } /** diff --git a/tests/sanity/tests/contacts.spec.ts b/tests/sanity/tests/contacts.spec.ts index 442fc7356c..7195fe66e0 100644 --- a/tests/sanity/tests/contacts.spec.ts +++ b/tests/sanity/tests/contacts.spec.ts @@ -52,7 +52,7 @@ test.describe('contact tests', () => { test('contact-search', async ({ page }) => { await page.locator('[id="app-contact\\:string\\:Contacts"]').click() - await expect(page.locator('text=Marina M.')).toBeVisible() + await expect(page.locator('text=M. Marina')).toBeVisible() expect(await page.locator('.antiTable-body__row').count()).toBeGreaterThan(5) const searchBox = page.locator('[placeholder="Search"]') @@ -64,7 +64,7 @@ test.describe('contact tests', () => { await searchBox.fill('') await searchBox.press('Enter') - await expect(page.locator('text=Rosamund Chen')).toBeVisible() + await expect(page.locator('text=Chen Rosamund')).toBeVisible() expect(await page.locator('.antiTable-body__row').count()).toBeGreaterThan(5) }) @@ -91,8 +91,8 @@ test.describe('contact tests', () => { await page.waitForSelector('form.antiCard', { state: 'detached' }) // Click #context-menu svg - await page.hover(`td:has-text("${first} ${last}")`) - await page.click(`td:has-text("${first} ${last}")`, { + await page.hover(`td:has-text("${last} ${first}")`) + await page.click(`td:has-text("${last} ${first}")`, { button: 'right' }) await page.click('text="Delete"') diff --git a/tests/sanity/tests/org.members.spec.ts b/tests/sanity/tests/org.members.spec.ts index 066bba0882..272986c84a 100644 --- a/tests/sanity/tests/org.members.spec.ts +++ b/tests/sanity/tests/org.members.spec.ts @@ -23,8 +23,8 @@ test.describe('recruit tests', () => { await page.click(`text=${orgId}`) await page.click('[id="contact:string:AddMember"]') - await page.click('button:has-text("Rosamund Chen")') - await page.click('text=Rosamund Chen less than a minute ago >> span') + await page.click('button:has-text("Chen Rosamund")') + await page.click('text=Chen Rosamund less than a minute ago >> span') await page.click(`:nth-match(:text("${orgId}"), 2)`) }) }) diff --git a/tests/sanity/tests/recruit.review.spec.ts b/tests/sanity/tests/recruit.review.spec.ts index 39ea69b115..07ba826db4 100644 --- a/tests/sanity/tests/recruit.review.spec.ts +++ b/tests/sanity/tests/recruit.review.spec.ts @@ -20,20 +20,20 @@ test.describe('recruit review tests', () => { await page.click('button:has-text("1 member")') - await page.click('button:has-text("Rosamund Chen")') + await page.click('button:has-text("Chen Rosamund")') await page.press('[placeholder="Search\\.\\.\\."]', 'Escape') await page.click('form button :has-text("Talent")') - // Click button:has-text("Rosamund Chen") - await page.click('button:has-text("Rosamund Chen")') + // Click button:has-text("Chen Rosamund") + await page.click('button:has-text("Chen Rosamund")') await page.click('button:has-text("Create")') await page.waitForSelector('form.antiCard', { state: 'detached' }) await page.click(`tr:has-text('${reviewId}') td a`) await page.click('button:has-text("2 members")') - await page.click('.popup button:has-text("Rosamund Chen")') + await page.click('.popup button:has-text("Chen Rosamund")') await page.press('[placeholder="Search\\.\\.\\."]', 'Escape') await page.click('button:has-text("1 member")') }) diff --git a/tests/sanity/tests/recruit.spec.ts b/tests/sanity/tests/recruit.spec.ts index 639f472fad..d2510068ca 100644 --- a/tests/sanity/tests/recruit.spec.ts +++ b/tests/sanity/tests/recruit.spec.ts @@ -47,7 +47,7 @@ test.describe('recruit tests', () => { await page.locator('.antiCard button:has-text("Create")').click() await page.waitForSelector('form.antiCard', { state: 'detached' }) - await page.click(`text="${first} ${last}"`) + await page.click(`text="${last} ${first}"`) await expect(page.locator(`text=${first}`).first()).toBeVisible() await expect(page.locator(`text=${last}`).first()).toBeVisible() @@ -75,7 +75,7 @@ test.describe('recruit tests', () => { await page.click('text=Talents') await page.click('text=Talents') - await page.click('text=Andrey P.') + await page.click('text=P. Andrey') // Click on Add button // await page.click('.applications-container .flex-row-center .flex-center') @@ -91,7 +91,7 @@ test.describe('recruit tests', () => { await page.click(`tr:has-text("${vacancyId}") >> text=APP-`) await page.click('button:has-text("Assigned recruiter")') - await page.click('button:has-text("Rosamund Chen")') + await page.click('button:has-text("Chen Rosamund")') }) test('create-vacancy', async ({ page }) => { @@ -111,12 +111,12 @@ test.describe('recruit tests', () => { // Create Applicatio n1 await page.click('button:has-text("Application")') await page.click('form[id="recruit:string:CreateApplication"] [id="vacancy.talant.selector"]') - await page.click('button:has-text("Alex P.")') + await page.click('button:has-text("P. Alex")') await page.click('form[id="recruit:string:CreateApplication"] button:has-text("Create")') await page.waitForSelector('form.antiCard', { state: 'detached' }) await expect(page.locator('text=APP-').first()).toBeVisible() - await expect(page.locator('text=Alex P.').first()).toBeVisible() + await expect(page.locator('text=P. Alex').first()).toBeVisible() }) test('use-kanban', async ({ page }) => { await page.locator('[id="app-recruit\\:string\\:RecruitApplication"]').click() @@ -127,9 +127,9 @@ test.describe('recruit tests', () => { // await page.click('[name="tooltip-task:string:Kanban"]') await page.click('.tablist-container div:nth-child(2)') - await expect(page.locator('text=Marina M.').first()).toBeVisible() - await expect(page.locator('text=John Multiseed').first()).toBeVisible() - await expect(page.locator('text=Alex P.').first()).toBeVisible() + await expect(page.locator('text=M. Marina').first()).toBeVisible() + await expect(page.locator('text=Multiseed John').first()).toBeVisible() + await expect(page.locator('text=P. Alex').first()).toBeVisible() }) test('application-search', async ({ page }) => { @@ -138,7 +138,7 @@ test.describe('recruit tests', () => { await page.locator('text=Vacancies').click() await page.click('text=Software Engineer') - await expect(page.locator('text=Marina M.')).toBeVisible() + await expect(page.locator('text=M. Marina')).toBeVisible() expect(await page.locator('.antiTable-body__row').count()).toBeGreaterThan(2) const searchBox = page.locator('[placeholder="Search"]') @@ -150,7 +150,7 @@ test.describe('recruit tests', () => { await searchBox.fill('') await searchBox.press('Enter') - await expect(page.locator('text=Marina M.')).toBeVisible() + await expect(page.locator('text=M. Marina')).toBeVisible() expect(await page.locator('.antiTable-body__row').count()).toBeGreaterThan(2) }) @@ -173,7 +173,7 @@ test.describe('recruit tests', () => { await page.fill('[placeholder="Location"]', 'NSK') await page.click('form button:has-text("Talent")') - await page.click('button:has-text("Andrey P.")') + await page.click('button:has-text("P. Andrey")') await page.click('text=Create') await page.waitForSelector('form.antiCard', { state: 'detached' }) await page.click('td:has-text("RVE-")') diff --git a/tests/sanity/tests/settings.spec.ts b/tests/sanity/tests/settings.spec.ts index ffe2b9126c..89d2f09bc7 100644 --- a/tests/sanity/tests/settings.spec.ts +++ b/tests/sanity/tests/settings.spec.ts @@ -14,7 +14,7 @@ test.describe('contact tests', () => { await page.goto(`${PlatformURI}/workbench%3Acomponent%3AWorkbenchApp/sanity-ws`) // Click #profile-button await page.click('#profile-button') - await page.click('text=John Appleseed') + await page.click('text=Appleseed John') // await expect(page).toHaveURL(`${PlatformURI}/workbench%3Acomponent%3AWorkbenchApp/sanity-ws/setting/setting`) // Click text=Edit profile // await page.click('text=Edit profile') diff --git a/tests/sanity/tests/tags.spec.ts b/tests/sanity/tests/tags.spec.ts index 8615a9408e..f640eb1ae1 100644 --- a/tests/sanity/tests/tags.spec.ts +++ b/tests/sanity/tests/tags.spec.ts @@ -106,7 +106,7 @@ test.describe('recruit tests', () => { await page.click('button:has-text("Create")') await page.waitForSelector('form.antiCard', { state: 'detached' }) // Click text=q w - await page.click(`tr > :has-text("${first} ${last}")`) + await page.click(`tr > :has-text("${last} ${first}")`) // Click text=java await expect(page.locator('text=java').first()).toBeVisible() }) diff --git a/tests/sanity/tests/tracker.spec.ts b/tests/sanity/tests/tracker.spec.ts index a87da6fed6..50981d17b0 100644 --- a/tests/sanity/tests/tracker.spec.ts +++ b/tests/sanity/tests/tracker.spec.ts @@ -107,7 +107,7 @@ async function openIssue (page: Page, name: string): Promise { } const defaultStatuses = ['Backlog', 'Todo', 'In Progress', 'Done', 'Canceled'] -const defaultUser = 'John Appleseed' +const defaultUser = 'Appleseed John' enum viewletSelectors { Table = '.tablist-container >> div.button:nth-child(1)', Board = '.tablist-container >> div.button:nth-child(2)' @@ -206,7 +206,7 @@ test('my-issues', async ({ page }) => { test('report-time-from-issue-card', async ({ page }) => { await navigate(page) - const assignee = 'Rosamund Chen' + const assignee = 'Chen Rosamund' const status = 'In Progress' const values = [0.25, 0.5, 0.75, 1] for (let i = 0; i < 10; i++) { @@ -242,7 +242,7 @@ test('report-time-from-main-view', async ({ page }) => { await page.keyboard.press('Escape') const values = [0.25, 0.5, 0.75, 1] - const assignee = 'Rosamund Chen' + const assignee = 'Chen Rosamund' const status = 'In Progress' const name = getIssueName() diff --git a/tests/sanity/tests/workbench.spec.ts b/tests/sanity/tests/workbench.spec.ts index 0e620abb92..7bd5493cc3 100644 --- a/tests/sanity/tests/workbench.spec.ts +++ b/tests/sanity/tests/workbench.spec.ts @@ -24,7 +24,7 @@ test.describe('workbench tests', () => { await page.click('text=Talents') await expect(page).toHaveURL(`${PlatformURI}/workbench%3Acomponent%3AWorkbenchApp/sanity-ws/recruit/talents`) - await expect(page.locator('text=Andrey P.')).toBeVisible() + await expect(page.locator('text=P. Andrey')).toBeVisible() // Click text=Vacancies await page.click('text=Vacancies') @@ -48,6 +48,6 @@ test.describe('workbench tests', () => { await page.click('[id="app-contact\\:string\\:Contacts"]') await expect(page).toHaveURL(`${PlatformURI}/workbench%3Acomponent%3AWorkbenchApp/sanity-ws/contact`) // Click text=John Appleseed - await expect(page.locator('text=John Appleseed')).toBeVisible() + await expect(page.locator('text=Appleseed John')).toBeVisible() }) })