diff --git a/packages/manager/cypress/support/ui/constants.ts b/packages/manager/cypress/support/ui/constants.ts index 9e791402da7..f067604ea1d 100644 --- a/packages/manager/cypress/support/ui/constants.ts +++ b/packages/manager/cypress/support/ui/constants.ts @@ -41,8 +41,7 @@ export interface Page { // List of Routes and validator of the route export const pages: Page[] = [ { - assertIsLoaded: () => - cy.findByText('Choose a Distribution').should('be.visible'), + assertIsLoaded: () => cy.findByText('Choose an OS').should('be.visible'), goWithUI: [ { go: () => { diff --git a/packages/manager/cypress/support/ui/pages/linode-create-page.ts b/packages/manager/cypress/support/ui/pages/linode-create-page.ts index 1f24a0899ca..ddd46b2702c 100644 --- a/packages/manager/cypress/support/ui/pages/linode-create-page.ts +++ b/packages/manager/cypress/support/ui/pages/linode-create-page.ts @@ -8,33 +8,13 @@ import { ui } from 'support/ui'; * Page utilities for interacting with the Linode create page. */ export const linodeCreatePage = { - /** - * Sets the Linode's label. - * - * @param linodeLabel - Linode label to set. - */ - setLabel: (linodeLabel: string) => { - cy.findByLabelText('Linode Label').type(`{selectall}{del}${linodeLabel}`); - }, - - /** - * Sets the Linode's root password. - * - * @param linodePassword - Root password to set. - */ - setRootPassword: (linodePassword: string) => { - cy.findByLabelText('Root Password').as('rootPasswordField').click(); - - cy.get('@rootPasswordField').type(linodePassword, { log: false }); - }, - /** * Selects the Image with the given name. * * @param imageName - Name of Image to select. */ selectImage: (imageName: string) => { - cy.findByText('Choose a Distribution') + cy.findByText('Choose an OS') .closest('[data-qa-paper]') .within(() => { ui.autocomplete.find().click(); @@ -46,15 +26,6 @@ export const linodeCreatePage = { }); }, - /** - * Select the Region with the given ID. - * - * @param regionId - ID of Region to select. - */ - selectRegionById: (regionId: string) => { - ui.regionSelect.find().click().type(`${regionId}{enter}`); - }, - /** * Select the given Linode plan. * @@ -91,4 +62,33 @@ export const linodeCreatePage = { cy.get('@selectionCard').click(); }); }, + + /** + * Select the Region with the given ID. + * + * @param regionId - ID of Region to select. + */ + selectRegionById: (regionId: string) => { + ui.regionSelect.find().click().type(`${regionId}{enter}`); + }, + + /** + * Sets the Linode's label. + * + * @param linodeLabel - Linode label to set. + */ + setLabel: (linodeLabel: string) => { + cy.findByLabelText('Linode Label').type(`{selectall}{del}${linodeLabel}`); + }, + + /** + * Sets the Linode's root password. + * + * @param linodePassword - Root password to set. + */ + setRootPassword: (linodePassword: string) => { + cy.findByLabelText('Root Password').as('rootPasswordField').click(); + + cy.get('@rootPasswordField').type(linodePassword, { log: false }); + }, }; diff --git a/packages/manager/src/features/Linodes/LinodeCreatev2/Tabs/Distributions.test.tsx b/packages/manager/src/features/Linodes/LinodeCreatev2/Tabs/Distributions.test.tsx index 020bb95191f..6e2f6f28f14 100644 --- a/packages/manager/src/features/Linodes/LinodeCreatev2/Tabs/Distributions.test.tsx +++ b/packages/manager/src/features/Linodes/LinodeCreatev2/Tabs/Distributions.test.tsx @@ -10,7 +10,7 @@ describe('Distributions', () => { component: , }); - const header = getByText('Choose a Distribution'); + const header = getByText('Choose an OS'); expect(header).toBeVisible(); expect(header.tagName).toBe('H2'); diff --git a/packages/manager/src/features/Linodes/LinodeCreatev2/Tabs/Distributions.tsx b/packages/manager/src/features/Linodes/LinodeCreatev2/Tabs/Distributions.tsx index d76c3cdbbef..4c7aa4d24c7 100644 --- a/packages/manager/src/features/Linodes/LinodeCreatev2/Tabs/Distributions.tsx +++ b/packages/manager/src/features/Linodes/LinodeCreatev2/Tabs/Distributions.tsx @@ -19,7 +19,7 @@ export const Distributions = () => { return ( - Choose a Distribution + Choose an OS