diff --git a/pages/app/app-context.tsx b/pages/app/app-context.tsx index b0b2d48bd8..8365fe9337 100644 --- a/pages/app/app-context.tsx +++ b/pages/app/app-context.tsx @@ -14,11 +14,10 @@ interface AppUrlParams { visualRefresh: boolean; motionDisabled: boolean; appLayoutWidget: boolean; - mode?: Mode; + mode: Mode; } export interface AppContextType { - mode: Mode; pageId?: string; urlParams: AppUrlParams & T; setUrlParams: (newParams: Partial) => void; @@ -26,7 +25,6 @@ export interface AppContextType { } const appContextDefaults: AppContextType = { - mode: Mode.Light, pageId: undefined, urlParams: { density: Density.Comfortable, @@ -34,6 +32,7 @@ const appContextDefaults: AppContextType = { visualRefresh: THEME === 'default', motionDisabled: false, appLayoutWidget: false, + mode: Mode.Light, }, setMode: () => {}, setUrlParams: () => {}, @@ -74,34 +73,21 @@ function formatQuery(params: AppUrlParams) { export function AppContextProvider({ children }: { children: React.ReactNode }) { const history = useHistory(); const location = useLocation(); - const matchWithVisualMode = useRouteMatch<{ mode: Mode; pageId: string }>('/:mode(light|dark)/:pageId*'); - const matchWithoutVisualMode = useRouteMatch<{ pageId: string }>('/:pageId*'); - const pageId = (matchWithVisualMode ?? matchWithoutVisualMode)?.params.pageId ?? undefined; + const pageId = useRouteMatch<{ pageId: string }>('/:pageId*')?.params.pageId ?? undefined; const urlParams = parseQuery(location.search) as AppUrlParams; - const mode = matchWithVisualMode?.params.mode ?? urlParams.mode ?? Mode.Light; function setUrlParams(newParams: Partial) { const formattedQuery = formatQuery({ ...urlParams, ...newParams }); - if (matchWithVisualMode) { - const pathname = [matchWithVisualMode.params.mode, pageId].filter(segment => !!segment).join('/') + '/'; - history.replace(`/${pathname}${formatQuery({ ...urlParams, ...newParams })}`); - } else { - const newUrl = pageId ? `/${pageId}${formattedQuery}` : formattedQuery; - history.replace(newUrl); - } + const newUrl = pageId ? `/${pageId}${formattedQuery}` : formattedQuery; + history.replace(newUrl); } function updateMode(newMode: Mode) { - if (matchWithVisualMode) { - const pathname = [newMode, pageId].filter(segment => !!segment).join('/') + '/'; - history.replace('/' + pathname + location.search + location.hash); - } else { - setUrlParams({ mode: newMode }); - } + setUrlParams({ mode: newMode }); } return ( - + {children} ); diff --git a/pages/app/components/header.tsx b/pages/app/components/header.tsx index a8ddc58445..c0b414ec41 100644 --- a/pages/app/components/header.tsx +++ b/pages/app/components/header.tsx @@ -10,7 +10,7 @@ import ThemeSwitcher from './theme-switcher'; import styles from './header.scss'; export default function Header({ sticky }: { sticky?: boolean }) { - const { mode } = useContext(AppContext); + const { urlParams: mode } = useContext(AppContext); return ( <> {/* #h selector for compatibility with global navigation */} diff --git a/pages/app/components/theme-switcher.tsx b/pages/app/components/theme-switcher.tsx index d6afde3416..31e696a91c 100644 --- a/pages/app/components/theme-switcher.tsx +++ b/pages/app/components/theme-switcher.tsx @@ -10,7 +10,7 @@ import SpaceBetween from '~components/space-between'; import AppContext from '../app-context'; export default function ThemeSwitcher() { - const { mode, urlParams, setUrlParams, setMode } = useContext(AppContext); + const { urlParams, setUrlParams, setMode } = useContext(AppContext); const vrSwitchProps: React.InputHTMLAttributes = { id: 'visual-refresh-toggle', @@ -38,7 +38,7 @@ export default function ThemeSwitcher() { setMode(event.target.checked ? Mode.Dark : Mode.Light)} /> Dark mode diff --git a/pages/app/index.tsx b/pages/app/index.tsx index 6611ccb580..abae4ca7a9 100644 --- a/pages/app/index.tsx +++ b/pages/app/index.tsx @@ -57,9 +57,8 @@ function isAppLayoutPage(pageId?: string) { function App() { const { - mode, pageId, - urlParams: { density, motionDisabled }, + urlParams: { density, mode, motionDisabled }, } = useContext(AppContext); // AppLayout already contains
diff --git a/src/__a11y__/a11y-app-layout-toolbar.test.ts b/src/__a11y__/a11y-app-layout-toolbar.test.ts index 062ee81152..aab0582ea1 100644 --- a/src/__a11y__/a11y-app-layout-toolbar.test.ts +++ b/src/__a11y__/a11y-app-layout-toolbar.test.ts @@ -16,7 +16,7 @@ describe('A11y checks for app layout toolbar', () => { findAllPages() .filter(page => page.startsWith('app-layout') && !EXCLUDED_PAGES.includes(page)) .forEach(inputUrl => { - const url = `#/light/${inputUrl}?${getUrlParams('refresh-toolbar')}`; + const url = `#/${inputUrl}?${getUrlParams('refresh-toolbar')}`; test( `${url}`, useBrowser(async browser => { diff --git a/src/__integ__/screenshot-area.test.ts b/src/__integ__/screenshot-area.test.ts index 8f458564c8..eb9b50a044 100644 --- a/src/__integ__/screenshot-area.test.ts +++ b/src/__integ__/screenshot-area.test.ts @@ -21,7 +21,7 @@ test( 'shows warning message when the page height exceeds the limit and hides when it does not', useBrowser(async browser => { const page = new ScreenshotAreaPage(browser); - await browser.url('#light/utils/screenshot-area-warning'); + await browser.url('#utils/screenshot-area-warning'); await page.waitForVisible('.screenshot-area'); await expect(page.isWarningDisplayed()).resolves.toBe(false); await page.clickAddItems(); diff --git a/src/__integ__/themes.test.ts b/src/__integ__/themes.test.ts index 773571a633..436d8e4388 100644 --- a/src/__integ__/themes.test.ts +++ b/src/__integ__/themes.test.ts @@ -37,17 +37,17 @@ class CustomPropertyPageObject extends BasePageObject { describe('CSS Custom Properties', () => { test.each<[string, string, string?]>([ - ['light', `#light/?visualRefresh=false`], - ['dark', '#dark/?visualRefresh=false'], - ['compact', '#light/?visualRefresh=false&density=compact'], + ['light', '#/?visualRefresh=false&mode=light'], + ['dark', '#/?visualRefresh=false&mode=dark'], + ['compact', '#/?visualRefresh=false&density=compact'], // use motionDisabled to force design tokens into expected values - ['reduced-motion', '#light/?visualRefresh=false&motionDisabled=true'], - ['visual-refresh', '#light/?visualRefresh=true'], - ['visual-refresh-dark', '#dark/?visualRefresh=true'], - ['visual-refresh-compact', '#light/?visualRefresh=true&density=compact'], + ['reduced-motion', '#/?visualRefresh=false&motionDisabled=true'], + ['visual-refresh', '#/?visualRefresh=true'], + ['visual-refresh-dark', '#/?visualRefresh=true&mode=dark'], + ['visual-refresh-compact', '#/?visualRefresh=true&density=compact'], [ 'visual-refresh-content-header', - '#/light/visual-contexts/content-header/?visualRefresh=true', + 'visual-contexts/content-header/?visualRefresh=true&mode=light', '.awsui-context-content-header', ], ])('match previous snapshot for mode %p', (_, url, selector = 'body') => diff --git a/src/__integ__/toggles.test.ts b/src/__integ__/toggles.test.ts index 35ce229e05..a4371eef50 100644 --- a/src/__integ__/toggles.test.ts +++ b/src/__integ__/toggles.test.ts @@ -18,7 +18,7 @@ Object.keys(wrappers).forEach(componentName => { function setupTest(testFn: (page: BasePageObject) => Promise) { return useBrowser(async browser => { const page = new BasePageObject(browser); - await browser.url(`#light/${componentName}/focus-test`); + await browser.url(`#${componentName}/focus-test`); await testFn(page); }); } diff --git a/src/alert/__integ__/persistence-integ.test.ts b/src/alert/__integ__/persistence-integ.test.ts index c810bbf388..43d423a4fb 100644 --- a/src/alert/__integ__/persistence-integ.test.ts +++ b/src/alert/__integ__/persistence-integ.test.ts @@ -31,7 +31,7 @@ const setupTest = ( if (params.dismissedKeys !== undefined) { urlParams.set('dismissedKeys', params.dismissedKeys); } - const url = `#/light/alert/persistence${urlParams.toString() ? '?' + urlParams.toString() : ''}`; + const url = `#/alert/persistence${urlParams.toString() ? '?' + urlParams.toString() : ''}`; await browser.url(url); await page.waitForVisible(wrapper.findAlert().toSelector()); await testFn(page); diff --git a/src/alert/__integ__/runtime-content.test.ts b/src/alert/__integ__/runtime-content.test.ts index b8496c7ed2..e5e1b08338 100644 --- a/src/alert/__integ__/runtime-content.test.ts +++ b/src/alert/__integ__/runtime-content.test.ts @@ -15,7 +15,7 @@ class RuntimeContentPage extends BasePageObject { function setupTest(testFn: (page: RuntimeContentPage) => Promise) { return useBrowser(async browser => { const page = new RuntimeContentPage(browser); - await browser.url('#/light/alert/runtime-content/?autofocus=true'); + await browser.url('#/alert/runtime-content/?autofocus=true'); await page.waitForVisible('.screenshot-area'); await testFn(page); }); diff --git a/src/anchor-navigation/__integ__/anchor-navigation.test.ts b/src/anchor-navigation/__integ__/anchor-navigation.test.ts index d9f676f87a..4afe6c5ba6 100644 --- a/src/anchor-navigation/__integ__/anchor-navigation.test.ts +++ b/src/anchor-navigation/__integ__/anchor-navigation.test.ts @@ -19,7 +19,7 @@ describe('AnchorNavigation', () => { function setupTest(testFn: (page: AnchorNavigationPage) => Promise) { return useBrowser(async browser => { const page = new AnchorNavigationPage(browser); - await browser.url('#/light/anchor-navigation/basic'); + await browser.url('#/anchor-navigation/basic'); await page.waitForVisible(wrapper.toSelector()); await testFn(page); }); diff --git a/src/annotation-context/__integ__/annotation-scroll.test.ts b/src/annotation-context/__integ__/annotation-scroll.test.ts index fe0f2fb495..ccf9681d34 100644 --- a/src/annotation-context/__integ__/annotation-scroll.test.ts +++ b/src/annotation-context/__integ__/annotation-scroll.test.ts @@ -11,7 +11,7 @@ const annotationWrapper = wrapper.findAnnotation(); function setupTest(testFn: (page: BasePageObject) => Promise) { return useBrowser(async browser => { const page = new BasePageObject(browser); - await browser.url('#/light/annotation-context/annotation-scroll'); + await browser.url('#/annotation-context/annotation-scroll'); await testFn(page); }); } diff --git a/src/annotation-context/__integ__/switching-pages.test.ts b/src/annotation-context/__integ__/switching-pages.test.ts index 21d06bb14b..80fcf0cebf 100644 --- a/src/annotation-context/__integ__/switching-pages.test.ts +++ b/src/annotation-context/__integ__/switching-pages.test.ts @@ -12,7 +12,7 @@ const annotationWrapper = wrapper.findAnnotation(); test( 'should open a next hotspot on a next page after loading', useBrowser(async browser => { - await browser.url('#/light/annotation-context/with-switching-pages'); + await browser.url('#/annotation-context/with-switching-pages'); const page = new BasePageObject(browser); await page.click(annotationWrapper.findNextButton().toSelector()); await page.click('[data-testid="next-page"]'); diff --git a/src/app-layout-toolbar/__integ__/multi-app-layout-toolbar-navigation.test.ts b/src/app-layout-toolbar/__integ__/multi-app-layout-toolbar-navigation.test.ts index f363ea7806..ff3a20007b 100644 --- a/src/app-layout-toolbar/__integ__/multi-app-layout-toolbar-navigation.test.ts +++ b/src/app-layout-toolbar/__integ__/multi-app-layout-toolbar-navigation.test.ts @@ -17,7 +17,7 @@ describe('Multi page layout navigation', () => { const setupTest = (testFn: (page: PageObject) => Promise) => useBrowser(async browser => { const page = new PageObject(browser); - await browser.url('#/light/app-layout-toolbar/multi-layout-with-hidden-instances'); + await browser.url('#/app-layout-toolbar/multi-layout-with-hidden-instances'); await testFn(page); }); diff --git a/src/app-layout/__integ__/ai-drawer.test.ts b/src/app-layout/__integ__/ai-drawer.test.ts index 9a09d49b24..ef6cef4209 100644 --- a/src/app-layout/__integ__/ai-drawer.test.ts +++ b/src/app-layout/__integ__/ai-drawer.test.ts @@ -31,7 +31,7 @@ describe('Visual refresh toolbar only', () => { const page = new PageObject(browser); await browser.url( - `#/light/app-layout/sidecar-demo?${getUrlParams('refresh-toolbar', { + `#/app-layout/sidecar-demo?${getUrlParams('refresh-toolbar', { hasDrawers: 'false', hasTools: 'true', splitPanelPosition: 'side', diff --git a/src/app-layout/__integ__/app-layout-drawers.test.ts b/src/app-layout/__integ__/app-layout-drawers.test.ts index 4b7fcfd585..758c3768df 100644 --- a/src/app-layout/__integ__/app-layout-drawers.test.ts +++ b/src/app-layout/__integ__/app-layout-drawers.test.ts @@ -109,7 +109,7 @@ const setupTest = ( visualRefresh: `${theme !== 'classic'}`, appLayoutToolbar: `${theme === 'refresh-toolbar'}`, }).toString(); - await browser.url(`#/light/app-layout/with-drawers?${params}`); + await browser.url(`#/app-layout/with-drawers?${params}`); await page.waitForVisible(wrapper.findContentRegion().toSelector()); await testFn(page); }); diff --git a/src/app-layout/__integ__/app-layout-focus-delegation.test.ts b/src/app-layout/__integ__/app-layout-focus-delegation.test.ts index f439b8c607..ad3fde2637 100644 --- a/src/app-layout/__integ__/app-layout-focus-delegation.test.ts +++ b/src/app-layout/__integ__/app-layout-focus-delegation.test.ts @@ -35,7 +35,7 @@ function setupTest( : {} ); await page.setWindowSize(mobile ? viewports.mobile : viewports.desktop); - await browser.url(`#/light/app-layout/${pageName}?${params}`); + await browser.url(`#/app-layout/${pageName}?${params}`); await page.waitForVisible(wrapper.findContentRegion().toSelector()); await testFn(page); }); diff --git a/src/app-layout/__integ__/app-layout-refresh-content-width.test.ts b/src/app-layout/__integ__/app-layout-refresh-content-width.test.ts index caa47c0bf7..6eb58638d8 100644 --- a/src/app-layout/__integ__/app-layout-refresh-content-width.test.ts +++ b/src/app-layout/__integ__/app-layout-refresh-content-width.test.ts @@ -43,7 +43,7 @@ describe.each(['refresh', 'refresh-toolbar'] as Theme[])('%s', theme => { return useBrowser(async browser => { const page = new AppLayoutRefreshNotoficationsPage(browser); await page.setWindowSize({ ...viewports.desktop, width: viewportWidth }); - await browser.url(`#/light/app-layout/refresh-content-width/?${getUrlParams(theme)}`); + await browser.url(`#/app-layout/refresh-content-width/?${getUrlParams(theme)}`); await page.waitForVisible(wrapper.findContentRegion().toSelector()); await testFn(page); }); diff --git a/src/app-layout/__integ__/app-layout-refresh-edge-controls.test.ts b/src/app-layout/__integ__/app-layout-refresh-edge-controls.test.ts index 0b45eba712..011c96e838 100644 --- a/src/app-layout/__integ__/app-layout-refresh-edge-controls.test.ts +++ b/src/app-layout/__integ__/app-layout-refresh-edge-controls.test.ts @@ -21,7 +21,7 @@ describe.each(['refresh', 'refresh-toolbar'] as Theme[])('%s', theme => { return useBrowser(async browser => { const page = new AppLayoutRefreshEdgeControlsPage(browser); await page.setWindowSize(viewports.desktop); - await browser.url(`#/light/app-layout/disable-paddings-edge-controls/?${getUrlParams(theme)}`); + await browser.url(`#/app-layout/disable-paddings-edge-controls/?${getUrlParams(theme)}`); await page.waitForVisible(wrapper.findContentRegion().toSelector()); await testFn(page); }); diff --git a/src/app-layout/__integ__/app-layout-refresh-notifications.test.ts b/src/app-layout/__integ__/app-layout-refresh-notifications.test.ts index d967e36a56..a1b7805a9e 100644 --- a/src/app-layout/__integ__/app-layout-refresh-notifications.test.ts +++ b/src/app-layout/__integ__/app-layout-refresh-notifications.test.ts @@ -49,7 +49,7 @@ describe.each(['refresh', 'refresh-toolbar'] as Theme[])('%s', theme => { const page = new AppLayoutRefreshNotoficationsPage(browser); await page.setWindowSize(viewport); await browser.url( - `#/light/app-layout/notifications-refresh/?${getUrlParams(theme)}${removeNotifications ? `&removeNotifications` : ''}` + `#/app-layout/notifications-refresh/?${getUrlParams(theme)}${removeNotifications ? `&removeNotifications` : ''}` ); await page.waitForVisible(wrapper.findContentRegion().toSelector()); await testFn(page); diff --git a/src/app-layout/__integ__/app-layout-split-panel-forced-position.test.ts b/src/app-layout/__integ__/app-layout-split-panel-forced-position.test.ts index bc71a21bd3..912673203d 100644 --- a/src/app-layout/__integ__/app-layout-split-panel-forced-position.test.ts +++ b/src/app-layout/__integ__/app-layout-split-panel-forced-position.test.ts @@ -27,7 +27,7 @@ const setupTest = ( const page = new AppLayoutSplitViewPage(browser); await page.setWindowSize({ ...viewports.desktop, width: initialViewportWidth }); - const url = `#/light/app-layout/with-split-panel-and-body-scroll?${params.toString()}`; + const url = `#/app-layout/with-split-panel-and-body-scroll?${params.toString()}`; await browser.url(url); const content = createWrapper().findAppLayout().findContentRegion(); diff --git a/src/app-layout/__integ__/app-layout-split-panel.test.ts b/src/app-layout/__integ__/app-layout-split-panel.test.ts index 21cf05bf4c..9eb3ccbc3a 100644 --- a/src/app-layout/__integ__/app-layout-split-panel.test.ts +++ b/src/app-layout/__integ__/app-layout-split-panel.test.ts @@ -15,10 +15,7 @@ const scrollbarSelector = `.${tableScrollbarStyles['sticky-scrollbar-visible']}` const wrapper = createWrapper().findAppLayout(); describe.each(['classic', 'refresh', 'refresh-toolbar'] as const)('%s', theme => { - function setupTest( - testFn: (page: AppLayoutSplitViewPage) => Promise, - url = '#/light/app-layout/with-split-panel' - ) { + function setupTest(testFn: (page: AppLayoutSplitViewPage) => Promise, url = '#/app-layout/with-split-panel') { return useBrowser(async browser => { const page = new AppLayoutSplitViewPage(browser); await page.setWindowSize(viewports.desktop); @@ -70,7 +67,7 @@ describe.each(['classic', 'refresh', 'refresh-toolbar'] as const)('%s', theme => setupTest(async page => { await page.click('button=Add widget'); await expect(page.isFocused(wrapper.findSplitPanel().findSlider().toSelector())).resolves.toBe(true); - }, '#/light/app-layout/dashboard-content-type') + }, '#/app-layout/dashboard-content-type') ); (theme === 'classic' ? test : test.skip).each([ @@ -101,7 +98,7 @@ describe.each(['classic', 'refresh', 'refresh-toolbar'] as const)('%s', theme => useBrowser(async browser => { const page = new AppLayoutSplitViewPage(browser); await page.setWindowSize(viewports.desktop); - await browser.url(`#/light/app-layout/with-split-panel?visualRefresh=false&splitPanelPosition=side`); + await browser.url(`#/app-layout/with-split-panel?visualRefresh=false&splitPanelPosition=side`); await page.waitForVisible(wrapper.findContentRegion().toSelector()); await page.openPanel(); await expect(page.getPanelPosition()).resolves.toEqual('side'); @@ -170,8 +167,8 @@ describe.each(['classic', 'refresh', 'refresh-toolbar'] as const)('%s', theme => ); [ - { url: '#/light/app-layout/disable-paddings-with-split-panel', name: 'paddings disabled' }, - { url: '#/light/app-layout/with-split-panel', name: 'paddings enabled' }, + { url: '#/app-layout/disable-paddings-with-split-panel', name: 'paddings disabled' }, + { url: '#/app-layout/with-split-panel', name: 'paddings enabled' }, ].forEach(({ url, name }) => { test( `should not allow resize split panel beyond min and max limits (side position) (${name})`, @@ -292,7 +289,7 @@ describe.each(['classic', 'refresh', 'refresh-toolbar'] as const)('%s', theme => await expect(page.getContentOffsetBottom(theme)).resolves.toEqual(windowHeight / 2 + splitPanelPadding + 'px'); await page.switchPosition('side'); await expect(page.getContentOffsetBottom(theme)).resolves.toEqual(splitPanelPadding + 'px'); - }, '#/light/app-layout/with-full-page-table-and-split-panel') + }, '#/app-layout/with-full-page-table-and-split-panel') ); test( @@ -303,7 +300,7 @@ describe.each(['classic', 'refresh', 'refresh-toolbar'] as const)('%s', theme => await page.switchPosition('side'); await page.switchPosition('bottom'); await expect(page.getContentOffsetBottom(theme)).resolves.toEqual(windowHeight / 2 + splitPanelPadding + 'px'); - }, '#/light/app-layout/with-full-page-table-and-split-panel') + }, '#/app-layout/with-full-page-table-and-split-panel') ); test( @@ -317,7 +314,7 @@ describe.each(['classic', 'refresh', 'refresh-toolbar'] as const)('%s', theme => page.isDisplayedInViewport(wrapper.findSplitPanel().findOpenPanelBottom().toSelector()) ).resolves.toBe(true); await expect(page.isClickable(scrollbarSelector)).resolves.toBe(true); - }, '#/light/app-layout/with-sticky-table-and-split-panel') + }, '#/app-layout/with-sticky-table-and-split-panel') ); }); }); diff --git a/src/app-layout/__integ__/app-layout-sticky-elements.test.ts b/src/app-layout/__integ__/app-layout-sticky-elements.test.ts index e08e54ae48..b3bca2c492 100644 --- a/src/app-layout/__integ__/app-layout-sticky-elements.test.ts +++ b/src/app-layout/__integ__/app-layout-sticky-elements.test.ts @@ -57,7 +57,7 @@ describe.each(['classic', 'refresh', 'refresh-toolbar'] as Theme[])('%s', theme test( 'correctly stacks table header below notifications in visual refresh', - setupTest({ url: `#/light/app-layout/with-sticky-notifications-and-header?${getUrlParams(theme)}` }, async page => { + setupTest({ url: `#/app-layout/with-sticky-notifications-and-header?${getUrlParams(theme)}` }, async page => { await page.windowScrollTo({ top: viewports.desktop.height }); const { bottom: secondNotificationBottom } = await page.getBoundingBox( @@ -70,7 +70,7 @@ describe.each(['classic', 'refresh', 'refresh-toolbar'] as Theme[])('%s', theme test( 'correctly offsets the table header after dismissing the sticky notifications', - setupTest({ url: `#/light/app-layout/with-sticky-notifications-and-header?${getUrlParams(theme)}` }, async page => { + setupTest({ url: `#/app-layout/with-sticky-notifications-and-header?${getUrlParams(theme)}` }, async page => { await page.dismissAllNotifications(); await page.windowScrollTo({ top: viewports.desktop.height }); @@ -87,7 +87,7 @@ describe.each(['classic', 'refresh', 'refresh-toolbar'] as Theme[])('%s', theme test( 'properly restores vertical offset for sticky headers when resizing to mobile and back to desktop', - setupTest({ url: `#/light/app-layout/with-sticky-notifications-and-header?${getUrlParams(theme)}` }, async page => { + setupTest({ url: `#/app-layout/with-sticky-notifications-and-header?${getUrlParams(theme)}` }, async page => { await page.windowScrollTo({ top: viewports.desktop.height }); const stickyHeaderSelector = wrapper.findContentRegion().findTable().findHeaderSlot().toSelector(); const { top: oldTop } = await page.getBoundingBox(stickyHeaderSelector); @@ -105,7 +105,7 @@ describe.each(['classic', 'refresh', 'refresh-toolbar'] as Theme[])('%s', theme testIf(theme === 'classic')( 'sets sticky notifications offset to zero when notifications are not sticky', setupTest( - { viewport: { width: 1200, height: 300 }, url: '#/light/app-layout/with-table?visualRefresh=false' }, + { viewport: { width: 1200, height: 300 }, url: '#/app-layout/with-table?visualRefresh=false' }, async page => { await page.windowScrollTo({ top: 200 }); const { bottom: pageHeaderBottom } = await page.getBoundingBox('header'); @@ -119,7 +119,7 @@ describe.each(['classic', 'refresh', 'refresh-toolbar'] as Theme[])('%s', theme 'should render popover from split panel above sticky header', setupTest( { - url: `#/light/app-layout/with-full-page-table-and-split-panel?${getUrlParams(theme)}&splitPanelPosition=side`, + url: `#/app-layout/with-full-page-table-and-split-panel?${getUrlParams(theme)}&splitPanelPosition=side`, }, async page => { const popover = createWrapper().findPopover('[data-testid="split-panel"]'); @@ -134,7 +134,7 @@ describe.each(['classic', 'refresh', 'refresh-toolbar'] as Theme[])('%s', theme 'should render popover from help panel above sticky header', setupTest( { - url: `#/light/app-layout/with-full-page-table-and-split-panel?${getUrlParams(theme)}&splitPanelPosition=side`, + url: `#/app-layout/with-full-page-table-and-split-panel?${getUrlParams(theme)}&splitPanelPosition=side`, }, async page => { // close split panel which is open by default @@ -154,7 +154,7 @@ describe.each(['classic', 'refresh', 'refresh-toolbar'] as Theme[])('%s', theme 'should not leave any space between page header and sticky header in content layout', setupTest( { - url: `#/light/app-layout/with-sticky-header-table-in-content-layout?${getUrlParams(theme)}`, + url: `#/app-layout/with-sticky-header-table-in-content-layout?${getUrlParams(theme)}`, }, async page => { const pageHeaderSelector = '#h'; diff --git a/src/app-layout/__integ__/awsui-applayout-sticky.test.ts b/src/app-layout/__integ__/awsui-applayout-sticky.test.ts index fc022508cf..4cbe1e1dd5 100644 --- a/src/app-layout/__integ__/awsui-applayout-sticky.test.ts +++ b/src/app-layout/__integ__/awsui-applayout-sticky.test.ts @@ -26,7 +26,7 @@ describe.each(['classic', 'refresh', 'refresh-toolbar'] as Theme[])('%s', theme return useBrowser(async browser => { const page = new AppLayoutStickyPage(browser); await page.setWindowSize(viewport); - await browser.url(`#/light/app-layout/with-sticky-notifications/?${getUrlParams(theme)}`); + await browser.url(`#/app-layout/with-sticky-notifications/?${getUrlParams(theme)}`); await page.waitForVisible(wrapper.findContentRegion().toSelector()); await testFn(page); }); diff --git a/src/app-layout/__integ__/awsui-applayout.test.ts b/src/app-layout/__integ__/awsui-applayout.test.ts index ec75d8772f..07d3b93181 100644 --- a/src/app-layout/__integ__/awsui-applayout.test.ts +++ b/src/app-layout/__integ__/awsui-applayout.test.ts @@ -36,7 +36,7 @@ describe.each(['classic', 'refresh', 'refresh-toolbar'] as Theme[])('%s', theme return useBrowser(async browser => { const page = new AppLayoutPage(browser); await page.setWindowSize(viewport); - await page.visit(`#/light/app-layout/${pageName}?${getUrlParams(theme, extraParams)}`); + await page.visit(`#/app-layout/${pageName}?${getUrlParams(theme, extraParams)}`); await testFn(page); }); } @@ -177,9 +177,7 @@ describe.each(['classic', 'refresh', 'refresh-toolbar'] as Theme[])('%s', theme // get reference offset on a page with notifications disabled const { top: expectedOffset } = await page.getBoundingBox('[data-testid="content-root"]'); // visit the same page with notifications enabled to compare - await page.visit( - `#/light/app-layout/with-notifications?${getUrlParams(theme, { disableNotifications: 'false' })}` - ); + await page.visit(`#/app-layout/with-notifications?${getUrlParams(theme, { disableNotifications: 'false' })}`); await page.click(wrapper.findNotifications().findFlashbar().findItems().get(1).findDismissButton().toSelector()); await expect(page.isExisting(wrapper.findNotifications().findFlashbar().toSelector())).resolves.toBe(true); await expect( diff --git a/src/app-layout/__integ__/global-breadcrumbs.test.ts b/src/app-layout/__integ__/global-breadcrumbs.test.ts index 9b1e281ea7..675ac12874 100644 --- a/src/app-layout/__integ__/global-breadcrumbs.test.ts +++ b/src/app-layout/__integ__/global-breadcrumbs.test.ts @@ -39,7 +39,7 @@ describe.each(['classic', 'refresh'])('%s', theme => { 'does not work in this design', setupTest( { - url: `#/light/app-layout/global-breadcrumbs/?${new URLSearchParams({ visualRefresh, hasOwnBreadcrumbs: 'true' }).toString()}`, + url: `#/app-layout/global-breadcrumbs/?${new URLSearchParams({ visualRefresh, hasOwnBreadcrumbs: 'true' }).toString()}`, }, async page => { await expect(page.getRootBreadcrumbText()).resolves.toEqual('Own'); @@ -58,7 +58,7 @@ describe('classic', () => { 'does not react to the feature flag even if it is enabled', setupTest( { - url: `#/light/app-layout/global-breadcrumbs/?${new URLSearchParams({ visualRefresh: 'false', appLayoutToolbar: 'true', hasOwnBreadcrumbs: 'true' }).toString()}`, + url: `#/app-layout/global-breadcrumbs/?${new URLSearchParams({ visualRefresh: 'false', appLayoutToolbar: 'true', hasOwnBreadcrumbs: 'true' }).toString()}`, }, async page => { await page.toggleExtraBreadcrumb(); @@ -74,7 +74,7 @@ describe('refresh-toolbar', () => { 'deduplicates breadcrumbs', setupTest( { - url: `#/light/app-layout/global-breadcrumbs/?${getUrlParams('refresh-toolbar', { hasOwnBreadcrumbs: 'false' })}`, + url: `#/app-layout/global-breadcrumbs/?${getUrlParams('refresh-toolbar', { hasOwnBreadcrumbs: 'false' })}`, }, async page => { await expect(page.getRootBreadcrumbText()).resolves.toEqual('Default'); @@ -95,7 +95,7 @@ describe('refresh-toolbar', () => { 'does not deduplicate breadcrumbs if breadcrumbs slot is not empty', setupTest( { - url: `#/light/app-layout/global-breadcrumbs/?${getUrlParams('refresh-toolbar', { hasOwnBreadcrumbs: 'true' })}`, + url: `#/app-layout/global-breadcrumbs/?${getUrlParams('refresh-toolbar', { hasOwnBreadcrumbs: 'true' })}`, }, async page => { await expect(page.getRootBreadcrumbText()).resolves.toEqual('Own'); diff --git a/src/app-layout/__integ__/mobile.test.ts b/src/app-layout/__integ__/mobile.test.ts index 9bc801e999..945044c559 100644 --- a/src/app-layout/__integ__/mobile.test.ts +++ b/src/app-layout/__integ__/mobile.test.ts @@ -16,7 +16,7 @@ describe.each(['classic', 'visual-refresh', 'visual-refresh-toolbar'] as const)( visualRefresh: `${theme.startsWith('visual-refresh')}`, appLayoutToolbar: `${theme === 'visual-refresh-toolbar'}`, }); - await this.browser.url(`#/light/app-layout/${pageName}?${params.toString()}`); + await this.browser.url(`#/app-layout/${pageName}?${params.toString()}`); await this.waitForVisible(wrapper.toSelector()); } diff --git a/src/app-layout/__integ__/multi-app-layout-global-drawer-child.test.ts b/src/app-layout/__integ__/multi-app-layout-global-drawer-child.test.ts index 3c528bb980..3e482c61f8 100644 --- a/src/app-layout/__integ__/multi-app-layout-global-drawer-child.test.ts +++ b/src/app-layout/__integ__/multi-app-layout-global-drawer-child.test.ts @@ -18,7 +18,7 @@ describe('Visual refresh toolbar only', () => { const page = new BasePageObject(browser); await browser.url( - `#/light/app-layout/multi-layout-global-drawer-child-layout?${new URLSearchParams({ + `#/app-layout/multi-layout-global-drawer-child-layout?${new URLSearchParams({ visualRefresh: 'true', appLayoutToolbar: 'true', }).toString()}` diff --git a/src/app-layout/__integ__/multi-app-layout-navigation.test.ts b/src/app-layout/__integ__/multi-app-layout-navigation.test.ts index 760c29058d..c03985fa5b 100644 --- a/src/app-layout/__integ__/multi-app-layout-navigation.test.ts +++ b/src/app-layout/__integ__/multi-app-layout-navigation.test.ts @@ -26,7 +26,7 @@ describe('Multi app layout navigation', () => { useBrowser(async browser => { const page = new PageObject(browser); await browser.url( - `#/light/app-layout/multi-layout-with-hidden-instances${iframe ? '-iframe' : ''}?${getUrlParams(theme)}` + `#/app-layout/multi-layout-with-hidden-instances${iframe ? '-iframe' : ''}?${getUrlParams(theme)}` ); await testFn(page); }); diff --git a/src/app-layout/__integ__/multi-app-layout.test.ts b/src/app-layout/__integ__/multi-app-layout.test.ts index 1763af54f8..390592ce8f 100644 --- a/src/app-layout/__integ__/multi-app-layout.test.ts +++ b/src/app-layout/__integ__/multi-app-layout.test.ts @@ -17,7 +17,7 @@ describe.each(['classic', 'refresh', 'refresh-toolbar'] as Theme[])('%s', theme const setupTest = (testFn: (page: BasePageObject) => Promise) => useBrowser(async browser => { const page = new BasePageObject(browser); - await browser.url(`#/light/app-layout/multi-layout-${iframe ? 'iframe' : 'simple'}?${getUrlParams(theme)}`); + await browser.url(`#/app-layout/multi-layout-${iframe ? 'iframe' : 'simple'}?${getUrlParams(theme)}`); await page.runInsideIframe(iframeId, !!iframe, async () => { await page.waitForVisible(secondaryLayout.findContentRegion().toSelector()); }); diff --git a/src/app-layout/__integ__/navigation.test.ts b/src/app-layout/__integ__/navigation.test.ts index eac18cc313..fc989398ae 100644 --- a/src/app-layout/__integ__/navigation.test.ts +++ b/src/app-layout/__integ__/navigation.test.ts @@ -14,7 +14,7 @@ function setupTest(testFn: (page: BasePageObject) => Promise, theme: Theme return useBrowser(async browser => { const page = new BasePageObject(browser); const params = getUrlParams(theme); - await browser.url(`#/light/app-layout/navigation-with-scrollbar?${params}`); + await browser.url(`#/app-layout/navigation-with-scrollbar?${params}`); await page.waitForVisible(createWrapper().findSideNavigation().toSelector()); await testFn(page); })(); diff --git a/src/app-layout/__integ__/runtime-drawers-controllability.test.ts b/src/app-layout/__integ__/runtime-drawers-controllability.test.ts index 42b6ce4f5a..d9335ce0e7 100644 --- a/src/app-layout/__integ__/runtime-drawers-controllability.test.ts +++ b/src/app-layout/__integ__/runtime-drawers-controllability.test.ts @@ -15,7 +15,7 @@ describe.each(['classic', 'refresh', 'refresh-toolbar'] as const)('%s', theme => const page = new BasePageObject(browser); await browser.url( - `#/light/app-layout/${pageName}?${new URLSearchParams({ + `#/app-layout/${pageName}?${new URLSearchParams({ hasDrawers: 'false', hasTools: 'true', visualRefresh: `${theme !== 'classic'}`, diff --git a/src/app-layout/__integ__/runtime-drawers-with-updates.test.ts b/src/app-layout/__integ__/runtime-drawers-with-updates.test.ts index b805145e64..b8442029f9 100644 --- a/src/app-layout/__integ__/runtime-drawers-with-updates.test.ts +++ b/src/app-layout/__integ__/runtime-drawers-with-updates.test.ts @@ -15,7 +15,7 @@ describe.each(['classic', 'refresh', 'refresh-toolbar'] as Theme[])('%s', theme const page = new BasePageObject(browser); await browser.url( - `#/light/app-layout/runtime-drawers-with-updates?${getUrlParams(theme, { + `#/app-layout/runtime-drawers-with-updates?${getUrlParams(theme, { hasTools: 'true', })}` ); diff --git a/src/app-layout/__integ__/runtime-drawers.test.ts b/src/app-layout/__integ__/runtime-drawers.test.ts index 5a013a75a4..75cd034e08 100644 --- a/src/app-layout/__integ__/runtime-drawers.test.ts +++ b/src/app-layout/__integ__/runtime-drawers.test.ts @@ -38,7 +38,7 @@ describe.each(['classic', 'refresh', 'refresh-toolbar'] as Theme[])('%s', theme const page = new BasePageObject(browser); await browser.url( - `#/light/app-layout/${url}?${getUrlParams(theme, { + `#/app-layout/${url}?${getUrlParams(theme, { hasDrawers: hasDrawers, hasTools: 'true', splitPanelPosition: 'side', @@ -173,7 +173,7 @@ describe('Visual refresh toolbar only', () => { const page = new PageObject(browser); await browser.url( - `#/light/app-layout/runtime-drawers?${getUrlParams('refresh-toolbar', { + `#/app-layout/runtime-drawers?${getUrlParams('refresh-toolbar', { hasDrawers: 'false', hasTools: 'true', splitPanelPosition, diff --git a/src/app-layout/__integ__/utils.ts b/src/app-layout/__integ__/utils.ts index 14b963ac1a..a071d31759 100644 --- a/src/app-layout/__integ__/utils.ts +++ b/src/app-layout/__integ__/utils.ts @@ -77,7 +77,7 @@ export const setupTest = ( appLayoutToolbar: `${theme === 'refresh-toolbar'}`, ...(splitPanelPosition ? { splitPanelPosition } : {}), }).toString(); - await browser.url(`#/light/app-layout/with-drawers?${params}`); + await browser.url(`#/app-layout/with-drawers?${params}`); await page.waitForVisible(wrapper.findContentRegion().toSelector()); await testFn(page); }); diff --git a/src/app-layout/__integ__/widget-async-loading.test.ts b/src/app-layout/__integ__/widget-async-loading.test.ts index 9b08961a51..c79869011c 100644 --- a/src/app-layout/__integ__/widget-async-loading.test.ts +++ b/src/app-layout/__integ__/widget-async-loading.test.ts @@ -12,7 +12,7 @@ describe.each(['desktop', 'mobile'] as const)('%s', size => { useBrowser(size === 'desktop' ? viewports.desktop : viewports.mobile, async browser => { const page = new BasePageObject(browser); await browser.url( - `#/light/app-layout/runtime-drawers?${getUrlParams('refresh-toolbar', { + `#/app-layout/runtime-drawers?${getUrlParams('refresh-toolbar', { appLayoutWidget: 'true', appLayoutDelayedWidget: 'true', })}` diff --git a/src/area-chart/__integ__/area-chart.test.ts b/src/area-chart/__integ__/area-chart.test.ts index c00f34598e..c585d07f79 100644 --- a/src/area-chart/__integ__/area-chart.test.ts +++ b/src/area-chart/__integ__/area-chart.test.ts @@ -19,7 +19,7 @@ function setupTest(url: string, name: string, testFn: (page: AreaChartPageObject describe('Filter', () => { test( 'can hide/un-hide series with a filter', - setupTest('#/light/area-chart/test', 'Linear latency chart', async page => { + setupTest('#/area-chart/test', 'Linear latency chart', async page => { await expect(page.getSeriesCount()).resolves.toBe(6); await expect(page.getSeriesLabel(1)).resolves.toEqual('p90'); await expect(page.getSeriesLabel(2)).resolves.toEqual('p80'); @@ -52,7 +52,7 @@ describe('Filter', () => { describe('Legend', () => { test( 'can hover on the legend items to highlight the underlying series', - setupTest('#/light/area-chart/test', 'Linear latency chart', async page => { + setupTest('#/area-chart/test', 'Linear latency chart', async page => { await expect(page.getHighlightedSeriesLabel()).resolves.toBe(null); // Scroll down to get access to the legend. @@ -65,7 +65,7 @@ describe('Legend', () => { test( 'can focus on the legend items to highlight the underlying series', - setupTest('#/light/area-chart/test', 'Linear latency chart', async page => { + setupTest('#/area-chart/test', 'Linear latency chart', async page => { await expect(page.getHighlightedSeriesLabel()).resolves.toBe(null); await page.focusLegend(); @@ -81,7 +81,7 @@ describe('Legend', () => { test( 'when legend is focused series hover can move the focus target', - setupTest('#/light/area-chart/test', 'Linear latency chart', async page => { + setupTest('#/area-chart/test', 'Linear latency chart', async page => { await expect(page.getHighlightedSeriesLabel()).resolves.toBe(null); await page.focusLegend(); @@ -96,7 +96,7 @@ describe('Legend', () => { ); test( 'highlighted legend elements should be not be highlighted when user hovers away', - setupTest('#/light/area-chart/test', 'Linear latency chart', async page => { + setupTest('#/area-chart/test', 'Linear latency chart', async page => { // Scroll down to get access to the legend. await page.windowScrollTo({ top: 200 }); @@ -111,7 +111,7 @@ describe('Legend', () => { describe('Popover', () => { test( 'popover is shown when mouseover non-empty chart plot', - setupTest('#/light/area-chart/test', 'Linear latency chart', async page => { + setupTest('#/area-chart/test', 'Linear latency chart', async page => { await expect(page.hasPopover()).resolves.toBe(false); await page.hoverElement(page.chart.toSelector()); @@ -122,7 +122,7 @@ describe('Popover', () => { test( 'popover is shown when chart plot is focused', - setupTest('#/light/area-chart/test', 'Linear latency chart', async page => { + setupTest('#/area-chart/test', 'Linear latency chart', async page => { await expect(page.hasPopover()).resolves.toBe(false); await page.focusPlot(); @@ -133,7 +133,7 @@ describe('Popover', () => { test( 'popover is shown when mouse is over popover', - setupTest('#/light/area-chart/test', 'Linear latency chart', async page => { + setupTest('#/area-chart/test', 'Linear latency chart', async page => { await page.setWindowSize({ width: 2000, height: 800 }); await expect(page.hasPopover()).resolves.toBe(false); @@ -147,7 +147,7 @@ describe('Popover', () => { test( 'popover can be pinned/unpinned by clicking on the plot', - setupTest('#/light/area-chart/test', 'Linear latency chart', async page => { + setupTest('#/area-chart/test', 'Linear latency chart', async page => { await page.focusPlot(); await expect(page.hasPopover()).resolves.toBe(true); @@ -169,7 +169,7 @@ describe('Popover', () => { test( 'popover can be pinned by pressing Enter when plot point is focused', - setupTest('#/light/area-chart/test', 'Linear latency chart', async page => { + setupTest('#/area-chart/test', 'Linear latency chart', async page => { await page.focusPlot(); await page.keys(['Enter']); @@ -180,7 +180,7 @@ describe('Popover', () => { test( 'popover should have the same details order as declared series do', - setupTest('#/light/area-chart/test', 'Linear latency chart', async page => { + setupTest('#/area-chart/test', 'Linear latency chart', async page => { await page.focusPlot(); await page.keys(['ArrowRight']); @@ -196,7 +196,7 @@ describe('Popover', () => { test( 'popover stays in the same position after dismissed', - setupTest('#/light/area-chart/test', 'Linear latency chart', async page => { + setupTest('#/area-chart/test', 'Linear latency chart', async page => { await page.focusPlot(); await page.keys(['ArrowRight', 'ArrowRight', 'ArrowRight', 'ArrowRight']); await page.keys(['Enter']); @@ -213,7 +213,7 @@ describe('Popover', () => { test( 'popover can be closed when Escape is pressed after hover', - setupTest('#/light/area-chart/test', 'Linear latency chart', async page => { + setupTest('#/area-chart/test', 'Linear latency chart', async page => { await expect(page.hasPopover()).resolves.toBe(false); await page.hoverElement(page.chart.toSelector()); await expect(page.hasPopover()).resolves.toBe(true); @@ -224,7 +224,7 @@ describe('Popover', () => { test( 'popover can be closed when Escape is pressed after chart plot is focused', - setupTest('#/light/area-chart/test', 'Linear latency chart', async page => { + setupTest('#/area-chart/test', 'Linear latency chart', async page => { await page.focusPlot(); await expect(page.hasPopover()).resolves.toBe(true); await page.keys(['Escape']); @@ -234,7 +234,7 @@ describe('Popover', () => { test( 'popover can be closed by moving focus away', - setupTest('#/light/area-chart/test', 'Controlled linear latency chart', async page => { + setupTest('#/area-chart/test', 'Controlled linear latency chart', async page => { await page.focusPlot(); await expect(page.hasPopover()).resolves.toBe(true); const popover = page.getPopover(); @@ -250,7 +250,7 @@ describe('Popover', () => { test( 'tabbing from the popover back to the chart keeps the highlights', - setupTest('#/light/area-chart/test', 'Controlled linear latency chart', async page => { + setupTest('#/area-chart/test', 'Controlled linear latency chart', async page => { await page.focusPlot(); await expect(page.hasPopover()).resolves.toBe(true); const popover = page.getPopover(); @@ -277,7 +277,7 @@ describe('Popover', () => { describe('Keyboard navigation', () => { test( 'can navigate between data points within series', - setupTest('#/light/area-chart/test', 'Linear latency chart', async page => { + setupTest('#/area-chart/test', 'Linear latency chart', async page => { await page.setWindowSize({ width: 2000, height: 800 }); await page.focusPlot(); @@ -295,7 +295,7 @@ describe('Keyboard navigation', () => { test( 'can navigate between series', - setupTest('#/light/area-chart/test', 'Linear latency chart', async page => { + setupTest('#/area-chart/test', 'Linear latency chart', async page => { await page.focusPlot(); await expect(page.getHighlightedSeriesLabel()).resolves.toBe(null); @@ -320,7 +320,7 @@ describe('Keyboard navigation', () => { test( 'maintains X coordinate after switching between focusing a single series and all series', - setupTest('#/light/area-chart/test', 'Linear latency chart', async page => { + setupTest('#/area-chart/test', 'Linear latency chart', async page => { await page.focusPlot(); await expect(page.getPopoverTitle()).resolves.toBe('1s'); @@ -352,7 +352,7 @@ describe('Keyboard navigation', () => { describe('Focus delegation', () => { test( 'when unpinning the popover the previously highlighted data point is focused', - setupTest('#/light/area-chart/test', 'Linear latency chart', async page => { + setupTest('#/area-chart/test', 'Linear latency chart', async page => { await page.focusPlot(); await page.keys(['ArrowUp', 'ArrowRight', 'ArrowRight', 'Enter']); @@ -371,7 +371,7 @@ describe('Focus delegation', () => { test( 'when unpinning the popover the previously highlighted data point group is focused', - setupTest('#/light/area-chart/test', 'Linear latency chart', async page => { + setupTest('#/area-chart/test', 'Linear latency chart', async page => { await page.focusPlot(); await page.keys(['ArrowRight', 'ArrowRight', 'Enter']); @@ -390,7 +390,7 @@ describe('Focus delegation', () => { test( 'preserves series highlight when focused away from plot', - setupTest('#/light/area-chart/test', 'Linear latency chart', async page => { + setupTest('#/area-chart/test', 'Linear latency chart', async page => { await page.setWindowSize({ width: 2000, height: 800 }); await page.focusPlot(); @@ -408,7 +408,7 @@ describe('Focus delegation', () => { test( 'clears series highlight when focused away from chart', - setupTest('#/light/area-chart/test', 'Linear latency chart', async page => { + setupTest('#/area-chart/test', 'Linear latency chart', async page => { await page.focusPlot(); await page.keys(['ArrowDown', 'ArrowRight']); @@ -426,7 +426,7 @@ describe('Focus delegation', () => { test( 'when focusing away from plot and popover is pinned the highlight stays', - setupTest('#/light/area-chart/test', 'Linear latency chart', async page => { + setupTest('#/area-chart/test', 'Linear latency chart', async page => { await page.focusPlot(); await page.keys(['ArrowDown', 'ArrowRight', 'Enter']); @@ -445,7 +445,7 @@ describe('Focus delegation', () => { describe('Controlled', () => { test( 'can use filter series same as in uncontrolled chart', - setupTest('#/light/area-chart/test', 'Controlled linear latency chart', async page => { + setupTest('#/area-chart/test', 'Controlled linear latency chart', async page => { await expect(page.getSeriesCount()).resolves.toBe(6); await page.toggleFilterOption(1); @@ -461,7 +461,7 @@ describe('Controlled', () => { test( 'can use highlight X same as in uncontrolled chart', - setupTest('#/light/area-chart/test', 'Controlled linear latency chart', async page => { + setupTest('#/area-chart/test', 'Controlled linear latency chart', async page => { await page.focusPlot(); await expect(page.getPopoverTitle()).resolves.toBe('1s'); @@ -476,7 +476,7 @@ describe('Controlled', () => { test( 'can use highlight series same as in uncontrolled chart', - setupTest('#/light/area-chart/test', 'Controlled linear latency chart', async page => { + setupTest('#/area-chart/test', 'Controlled linear latency chart', async page => { await page.focusPlot(); await page.keys(['ArrowUp']); @@ -494,7 +494,7 @@ describe('Controlled', () => { describe('Loading state', () => { test( 'height of the chart is displayed correctly after changing loading state to finished', - setupTest('#/light/area-chart/loading', 'chart', async page => { + setupTest('#/area-chart/loading', 'chart', async page => { await page.setWindowSize({ width: 500, height: 800 }); // the loading is about 1000ms in the loading page and then the // statusType becomes 'finished'. This just waits for it. @@ -510,7 +510,7 @@ describe('Loading state', () => { describe('Labels', () => { test( 'log labels have no intersections', - setupTest('#/light/area-chart/test', 'Log-x latency chart', async page => { + setupTest('#/area-chart/test', 'Log-x latency chart', async page => { await page.setWindowSize({ width: 500, height: 800 }); let lastEdge = 0; diff --git a/src/attribute-editor/__integ__/attribute-editor.test.ts b/src/attribute-editor/__integ__/attribute-editor.test.ts index 9626dc1aae..9f960c7e17 100644 --- a/src/attribute-editor/__integ__/attribute-editor.test.ts +++ b/src/attribute-editor/__integ__/attribute-editor.test.ts @@ -88,7 +88,7 @@ class AttributeEditorPage extends BasePageObject { const setupTest = (testFn: (page: AttributeEditorPage) => Promise) => { return useBrowser(async browser => { const page = new AttributeEditorPage(browser); - await browser.url('#/light/attribute-editor/simple'); + await browser.url('#/attribute-editor/simple'); await page.waitForVisible(attributeEditorWrapper.findAddButton().toSelector()); await testFn(page); }); diff --git a/src/autosuggest/__integ__/async-autosuggest.test.ts b/src/autosuggest/__integ__/async-autosuggest.test.ts index a29581e0d9..fe065913a2 100644 --- a/src/autosuggest/__integ__/async-autosuggest.test.ts +++ b/src/autosuggest/__integ__/async-autosuggest.test.ts @@ -20,7 +20,7 @@ function setup( return useBrowser(async browser => { const page = new AsyncDropdownComponentPage(browser, autosuggest, opts.expandToViewport); await page.setWindowSize({ width: 800, height: 300 }); - await browser.url('/#/light/autosuggest/async'); + await browser.url('/#/autosuggest/async'); await page.waitForVisible(autosuggest.findNativeInput().toSelector()); if (opts.virtualScrolling) { await page.enableVirtualScrolling(); diff --git a/src/autosuggest/__integ__/autosuggest.test.ts b/src/autosuggest/__integ__/autosuggest.test.ts index ae588e9c9d..3299369301 100644 --- a/src/autosuggest/__integ__/autosuggest.test.ts +++ b/src/autosuggest/__integ__/autosuggest.test.ts @@ -5,7 +5,7 @@ import useBrowser from '@cloudscape-design/browser-test-tools/use-browser'; import createWrapper from '../../../lib/components/test-utils/selectors'; import AutosuggestPage from './page-objects/autosuggest-page'; -function setupTest(testFn: (page: AutosuggestPage) => Promise, url = '/#/light/autosuggest/simple') { +function setupTest(testFn: (page: AutosuggestPage) => Promise, url = '/#/autosuggest/simple') { return useBrowser(async browser => { const page = new AutosuggestPage(browser); await browser.url(url); @@ -157,6 +157,6 @@ describe(`Simple Autosuggest`, () => { await expect(page.isFocused(inputSelector)).resolves.toBe(true); await page.keys(['Shift', 'Tab', 'Null']); await expect(page.isExisting(dropdownSelector)).resolves.toBe(false); - }, '/#/light/autosuggest/recovery-test') + }, '/#/autosuggest/recovery-test') ); }); diff --git a/src/autosuggest/__integ__/events-autosuggest.test.ts b/src/autosuggest/__integ__/events-autosuggest.test.ts index 42d695c65b..568e2a4335 100644 --- a/src/autosuggest/__integ__/events-autosuggest.test.ts +++ b/src/autosuggest/__integ__/events-autosuggest.test.ts @@ -8,7 +8,7 @@ describe.each([false, true])('Autosuggest events (expandToViewport=%s)' function setupTest(testFn: (page: EventsAutosuggestPage) => Promise) { return useBrowser(async browser => { const page = new EventsAutosuggestPage(browser, expandToViewport); - await browser.url(`/#/light/autosuggest/events?expandToViewport=${expandToViewport}`); + await browser.url(`/#/autosuggest/events?expandToViewport=${expandToViewport}`); await testFn(page); }); } diff --git a/src/autosuggest/__integ__/form-submit.test.ts b/src/autosuggest/__integ__/form-submit.test.ts index 0763ed52bd..e2b419e4f9 100644 --- a/src/autosuggest/__integ__/form-submit.test.ts +++ b/src/autosuggest/__integ__/form-submit.test.ts @@ -18,7 +18,7 @@ class FormSubmitPageObject extends BasePageObject { function setupTest(testFn: (page: FormSubmitPageObject) => Promise) { return useBrowser(async browser => { const page = new FormSubmitPageObject(browser); - await browser.url('#/light/autosuggest/form-submit'); + await browser.url('#/autosuggest/form-submit'); await testFn(page); }); } diff --git a/src/autosuggest/__integ__/virtual-resize.test.ts b/src/autosuggest/__integ__/virtual-resize.test.ts index 42ae8bf8d8..14b37da846 100644 --- a/src/autosuggest/__integ__/virtual-resize.test.ts +++ b/src/autosuggest/__integ__/virtual-resize.test.ts @@ -23,7 +23,7 @@ class ResizeAutosuggestPage extends AutosuggestPage { function setupTest(testFn: (page: ResizeAutosuggestPage) => Promise) { return useBrowser(async browser => { const page = new ResizeAutosuggestPage(browser); - await browser.url('/#/light/autosuggest/virtual-resize'); + await browser.url('/#/autosuggest/virtual-resize'); await testFn(page); }); } diff --git a/src/breadcrumb-group/__integ__/breadcrumb-group.test.ts b/src/breadcrumb-group/__integ__/breadcrumb-group.test.ts index e292d4c94f..5627331f0e 100644 --- a/src/breadcrumb-group/__integ__/breadcrumb-group.test.ts +++ b/src/breadcrumb-group/__integ__/breadcrumb-group.test.ts @@ -67,7 +67,7 @@ const setupTest = ( if (sizes) { page.setWindowSize(sizes); } - await browser.url(`#/light/breadcrumb-group/events`); + await browser.url(`#/breadcrumb-group/events`); await page.waitForVisible(breadcrumbGroupWrapper.toSelector()); await testFn(page, browser); }); diff --git a/src/button-dropdown/__integ__/button-dropdown-disabled-reason.test.ts b/src/button-dropdown/__integ__/button-dropdown-disabled-reason.test.ts index 97a2a52935..9b7467a784 100644 --- a/src/button-dropdown/__integ__/button-dropdown-disabled-reason.test.ts +++ b/src/button-dropdown/__integ__/button-dropdown-disabled-reason.test.ts @@ -40,7 +40,7 @@ const setupTest = (testFn: (page: ButtonDropdownDisabledReasonPage) => Promise Promise) => { return useBrowser(async browser => { const page = new ButtonDropdownPage('testDropdown', browser); - await browser.url('#/light/button-dropdown/events'); + await browser.url('#/button-dropdown/events'); await page.waitForVisible(page.getTrigger()); await expect(page.getDropdownCheckMessage()).resolves.toEqual(''); await page.openDropdown(); @@ -84,7 +84,7 @@ describe('clicking on a ButtonDropdown item', () => { const focusBefore = createWrapper().findButton('[data-testid="focus-before"]'); const page = new BasePageObject(browser); - await browser.url('#/light/button-dropdown/main-action'); + await browser.url('#/button-dropdown/main-action'); await page.waitForVisible(focusBefore.toSelector()); await page.click(focusBefore.toSelector()); diff --git a/src/button-dropdown/__integ__/button-dropdown-expandable.test.ts b/src/button-dropdown/__integ__/button-dropdown-expandable.test.ts index 7576d2915f..94353cd3a3 100644 --- a/src/button-dropdown/__integ__/button-dropdown-expandable.test.ts +++ b/src/button-dropdown/__integ__/button-dropdown-expandable.test.ts @@ -11,7 +11,7 @@ const setupTest = ( ) => { return useBrowser(async browser => { const page = new ButtonDropdownPage(id, browser); - await browser.url('#/light/button-dropdown/expandable'); + await browser.url('#/button-dropdown/expandable'); await page.waitForVisible(page.getTrigger()); if (expandToViewport) { await page.click('#expandToViewport'); diff --git a/src/button-dropdown/__integ__/button-dropdown-items.test.ts b/src/button-dropdown/__integ__/button-dropdown-items.test.ts index 08b5b31f78..a236ca165b 100644 --- a/src/button-dropdown/__integ__/button-dropdown-items.test.ts +++ b/src/button-dropdown/__integ__/button-dropdown-items.test.ts @@ -8,7 +8,7 @@ test( 'follow external link in button dropdown group', useBrowser(async browser => { const page = new ButtonDropdownPage('ButtonDropdown4', browser); - await browser.url('#/light/button-dropdown/simple'); + await browser.url('#/button-dropdown/simple'); await page.waitForVisible(page.getTrigger()); await page.openDropdown(); await expect(page.isDropdownOpen()).resolves.toBe(true); @@ -24,7 +24,7 @@ test( useBrowser(async browser => { const page1 = new ButtonDropdownPage('ButtonDropdown3', browser); const page2 = new ButtonDropdownPage('ButtonDropdown1', browser); - await browser.url('#/light/button-dropdown/simple'); + await browser.url('#/button-dropdown/simple'); await page1.waitForVisible(page1.getTrigger()); await page1.openDropdown(); @@ -39,7 +39,7 @@ test( 'focus on first menu item when dropdown is opened', useBrowser(async browser => { const page = new ButtonDropdownPage('ButtonDropdown1', browser); - await browser.url('#/light/button-dropdown/simple'); + await browser.url('#/button-dropdown/simple'); await page.waitForVisible(page.getTrigger()); await page.openDropdown(); @@ -53,7 +53,7 @@ test( 'focus stays on the trigger on mobiles', useBrowser(async browser => { const page = new ButtonDropdownPage('ButtonDropdown1', browser); - await browser.url('#/light/button-dropdown/simple'); + await browser.url('#/button-dropdown/simple'); await page.setWindowSize({ width: 400, height: 800 }); await page.waitForVisible(page.getTrigger()); @@ -67,7 +67,7 @@ test( 'pressing arrow-down after the dropdown was opened moves the focus to the next item', useBrowser(async browser => { const page = new ButtonDropdownPage('ButtonDropdown3', browser); - await browser.url('#/light/button-dropdown/simple'); + await browser.url('#/button-dropdown/simple'); await page.waitForVisible(page.getTrigger()); await page.openDropdown(); diff --git a/src/button-dropdown/__integ__/button-dropdown-positioning.test.ts b/src/button-dropdown/__integ__/button-dropdown-positioning.test.ts index 587768354d..9303810b65 100644 --- a/src/button-dropdown/__integ__/button-dropdown-positioning.test.ts +++ b/src/button-dropdown/__integ__/button-dropdown-positioning.test.ts @@ -7,7 +7,7 @@ import ButtonDropdownPage from '../../__integ__/page-objects/button-dropdown-pag const setupTest = (id: string, testFn: (page: ButtonDropdownPage) => Promise) => { return useBrowser(async browser => { const page = new ButtonDropdownPage(id, browser); - await browser.url('#/light/button-dropdown/expandable'); + await browser.url('#/button-dropdown/expandable'); await page.waitForVisible(page.getTrigger()); await testFn(page); }); diff --git a/src/button-dropdown/__integ__/performance-marks.test.ts b/src/button-dropdown/__integ__/performance-marks.test.ts index 6f6d05598b..9710eb6f60 100644 --- a/src/button-dropdown/__integ__/performance-marks.test.ts +++ b/src/button-dropdown/__integ__/performance-marks.test.ts @@ -13,7 +13,7 @@ function setupTest( ) { return useBrowser(async browser => { const page = new BasePageObject(browser); - await browser.url(`#/light/button-dropdown/${pageName}`); + await browser.url(`#/button-dropdown/${pageName}`); const getMarks = async () => { await new Promise(r => setTimeout(r, 200)); const marks = await browser.execute(() => performance.getEntriesByType('mark') as PerformanceMark[]); diff --git a/src/button-group/__integ__/button-group.test.ts b/src/button-group/__integ__/button-group.test.ts index 0ea51e0ce2..0b0806acfc 100644 --- a/src/button-group/__integ__/button-group.test.ts +++ b/src/button-group/__integ__/button-group.test.ts @@ -26,7 +26,7 @@ function setup(options: { dropdownExpandToViewport?: boolean }, testFn: (page: B const query = new URLSearchParams({ dropdownExpandToViewport: String(options.dropdownExpandToViewport), }); - await browser.url(`/#/light/button-group/test?${query.toString()}`); + await browser.url(`/#/button-group/test?${query.toString()}`); await testFn(page); }); } diff --git a/src/button/__integ__/button.test.ts b/src/button/__integ__/button.test.ts index f73b8152cc..08fddedd0b 100644 --- a/src/button/__integ__/button.test.ts +++ b/src/button/__integ__/button.test.ts @@ -17,7 +17,7 @@ describe('Button', () => { test( 'enter key in form triggers button click', useBrowser(async browser => { - await browser.url('#/light/button/form-submit'); + await browser.url('#/button/form-submit'); const page = new ButtonPageObject(browser); await page.waitForVisible('#keyInput'); await expect(page.getClickMessage()).resolves.toBe(''); @@ -30,7 +30,7 @@ describe('Button', () => { test( 'switches to next button by tab skipping the disabled ones', useBrowser(async browser => { - await browser.url('#/light/button/tab-navigation'); + await browser.url('#/button/tab-navigation'); const page = new ButtonPageObject(browser); await page.waitForVisible(wrapper.findButton('#focusButton').toSelector()); await page.click(wrapper.findButton('#focusButton').toSelector()); @@ -50,7 +50,7 @@ describe('Button Style API', () => { test( 'active, hover and focus states', useBrowser(async browser => { - await browser.url('#/light/button/style-custom-types'); + await browser.url('#/button/style-custom-types'); const page = new ButtonPageObject(browser); const buttonSelector = '[data-testid=default]'; diff --git a/src/button/__integ__/performance-marks.test.ts b/src/button/__integ__/performance-marks.test.ts index b2f5edf020..4ec508f265 100644 --- a/src/button/__integ__/performance-marks.test.ts +++ b/src/button/__integ__/performance-marks.test.ts @@ -18,7 +18,7 @@ function setupTest( ) { return useBrowser(async browser => { const page = new BasePageObject(browser); - await browser.url(`#/light/button/${pageName}`); + await browser.url(`#/button/${pageName}`); await page.waitForVisible(wrapper.toSelector()); if (process.env.REACT_VERSION === '18') { return; diff --git a/src/calendar/__integ__/calendar.test.ts b/src/calendar/__integ__/calendar.test.ts index 1cdf2d4442..2ce7affb99 100644 --- a/src/calendar/__integ__/calendar.test.ts +++ b/src/calendar/__integ__/calendar.test.ts @@ -12,7 +12,7 @@ describe('Date picker calendar interactions', () => { return useBrowser(async browser => { const page = new BasePageObject(browser); - await browser.url('#/light/calendar/integ'); + await browser.url('#/calendar/integ'); await testFn(page); }); }; diff --git a/src/cards/__integ__/preferences-integration.test.ts b/src/cards/__integ__/preferences-integration.test.ts index 6f97fcba40..494d4d418f 100644 --- a/src/cards/__integ__/preferences-integration.test.ts +++ b/src/cards/__integ__/preferences-integration.test.ts @@ -11,7 +11,7 @@ const preferences = wrapper.findCollectionPreferences(); test( 'changes page size on confirm', useBrowser(async browser => { - await browser.url('#/light/cards/hooks'); + await browser.url('#/cards/hooks'); const page = new BasePageObject(browser); await page.waitForVisible(wrapper.findItems().toSelector()); await expect(page.getElementsCount(wrapper.findItems().toSelector())).resolves.toEqual(20); @@ -28,7 +28,7 @@ test( test( 'does not change page size on cancel', useBrowser(async browser => { - await browser.url('#/light/cards/hooks'); + await browser.url('#/cards/hooks'); const page = new BasePageObject(browser); await page.waitForVisible(wrapper.findItems().toSelector()); await expect(page.getElementsCount(wrapper.findItems().toSelector())).resolves.toEqual(20); @@ -45,7 +45,7 @@ test( test( 'changes visible sections', useBrowser(async browser => { - await browser.url('#/light/cards/hooks'); + await browser.url('#/cards/hooks'); const page = new BasePageObject(browser); await page.waitForVisible(wrapper.findItems().toSelector()); await expect(page.getElementsCount(wrapper.findItems().get(1).findSections().toSelector())).resolves.toEqual(2); diff --git a/src/cards/__integ__/responsive.test.ts b/src/cards/__integ__/responsive.test.ts index 801bc3705a..da3d3f2b55 100644 --- a/src/cards/__integ__/responsive.test.ts +++ b/src/cards/__integ__/responsive.test.ts @@ -36,7 +36,7 @@ class CardsPage extends BasePageObject { function setupTest(testFn: (page: CardsPage) => Promise) { return useBrowser(async browser => { const page = new CardsPage(browser); - await browser.url('/#/light/cards/basic'); + await browser.url('/#/cards/basic'); await testFn(page); }); } diff --git a/src/cards/__integ__/selection.test.ts b/src/cards/__integ__/selection.test.ts index 8eb0665ed0..41d0d82153 100644 --- a/src/cards/__integ__/selection.test.ts +++ b/src/cards/__integ__/selection.test.ts @@ -21,7 +21,7 @@ class CardsPage extends BasePageObject { function setupTest(testFn: (page: CardsPage) => Promise) { return useBrowser(async browser => { const page = new CardsPage(browser); - await browser.url('/#/light/cards/selection'); + await browser.url('/#/cards/selection'); await testFn(page); }); } diff --git a/src/cards/__integ__/sticky-header.test.ts b/src/cards/__integ__/sticky-header.test.ts index bbb224313e..1773ba6861 100644 --- a/src/cards/__integ__/sticky-header.test.ts +++ b/src/cards/__integ__/sticky-header.test.ts @@ -14,7 +14,7 @@ class StickyHeaderCardsPage extends BasePageObject { } async navigateToPage(compact?: boolean) { - let url = '/#/light/cards/sticky-header?visualRefresh=false'; + let url = '/#/cards/sticky-header?visualRefresh=false'; if (compact) { url += '&density=compact'; } diff --git a/src/cards/__integ__/tall-cards.test.ts b/src/cards/__integ__/tall-cards.test.ts index 32e8efc9df..8feb1adba5 100644 --- a/src/cards/__integ__/tall-cards.test.ts +++ b/src/cards/__integ__/tall-cards.test.ts @@ -7,7 +7,7 @@ const setupTest = (testFn: (page: BasePageObject) => Promise) => { return useBrowser(async browser => { const page = new BasePageObject(browser); await page.setWindowSize({ width: 1000, height: 1600 }); - await browser.url('#/light/cards/tall-cards'); + await browser.url('#/cards/tall-cards'); await testFn(page); }); }; diff --git a/src/checkbox/__integ__/checkbox.test.ts b/src/checkbox/__integ__/checkbox.test.ts index 1f560d023f..76bf0bcf4b 100644 --- a/src/checkbox/__integ__/checkbox.test.ts +++ b/src/checkbox/__integ__/checkbox.test.ts @@ -14,7 +14,7 @@ class CheckboxPage extends BasePageObject {} const setupTest = (testFn: (page: CheckboxPage) => Promise) => { return useBrowser(async browser => { const page = new CheckboxPage(browser); - await browser.url('#/light/checkbox/simple'); + await browser.url('#/checkbox/simple'); await testFn(page); }); }; @@ -32,7 +32,7 @@ test( test( 'style api focus state', useBrowser(async browser => { - await browser.url('#/light/checkbox/style-custom/'); + await browser.url('#/checkbox/style-custom/'); const page = new CheckboxPage(browser); await page.click('[data-testid="1"]'); diff --git a/src/checkbox/__integ__/label-styling.test.ts b/src/checkbox/__integ__/label-styling.test.ts index e5bc617a66..d57547a18d 100644 --- a/src/checkbox/__integ__/label-styling.test.ts +++ b/src/checkbox/__integ__/label-styling.test.ts @@ -12,7 +12,7 @@ class CheckboxPage extends BasePageObject {} const setupTest = (testFn: (page: CheckboxPage) => Promise) => { return useBrowser(async browser => { const page = new CheckboxPage(browser); - await browser.url('#/light/checkbox/labels-highlight'); + await browser.url('#/checkbox/labels-highlight'); await testFn(page); }); }; diff --git a/src/code-editor/__integ__/code-editor.test.ts b/src/code-editor/__integ__/code-editor.test.ts index 80ddaeabd8..6677988330 100644 --- a/src/code-editor/__integ__/code-editor.test.ts +++ b/src/code-editor/__integ__/code-editor.test.ts @@ -79,9 +79,9 @@ class CodeEditorPageObject extends BasePageObject { } } -const simplePage = '#/light/code-editor/simple'; -const verticalScrollPage = '#/light/code-editor/vertical-scroll'; -const controllableHeightPage = '#/light/code-editor/controllable-height'; +const simplePage = '#/code-editor/simple'; +const verticalScrollPage = '#/code-editor/vertical-scroll'; +const controllableHeightPage = '#/code-editor/controllable-height'; const setupTest = (pageUrl: string, testFn: (page: CodeEditorPageObject) => Promise) => { return useBrowser(async browser => { diff --git a/src/collection-preferences/__integ__/collection-preferences.test.ts b/src/collection-preferences/__integ__/collection-preferences.test.ts index dd6a553ef1..97b2c2603b 100644 --- a/src/collection-preferences/__integ__/collection-preferences.test.ts +++ b/src/collection-preferences/__integ__/collection-preferences.test.ts @@ -8,7 +8,7 @@ import CollectionPreferencesPageObject from './pages/collection-preferences-page const setupTest = (testFn: (page: CollectionPreferencesPageObject) => Promise) => { return useBrowser(async browser => { const page = new CollectionPreferencesPageObject(browser); - await browser.url('#/light/collection-preferences/simple'); + await browser.url('#/collection-preferences/simple'); await page.setWindowSize({ width: 1200, height: 1200 }); await testFn(page); }); diff --git a/src/collection-preferences/content-display/__integ__/content-reordering.test.ts b/src/collection-preferences/content-display/__integ__/content-reordering.test.ts index e9e91ee67d..3b8e35b6fc 100644 --- a/src/collection-preferences/content-display/__integ__/content-reordering.test.ts +++ b/src/collection-preferences/content-display/__integ__/content-reordering.test.ts @@ -14,7 +14,7 @@ const windowDimensions = { const setupTest = (testFn: (page: ContentDisplayPageObject) => Promise) => { return useBrowser(async browser => { const page = new ContentDisplayPageObject(browser); - await browser.url('#/light/collection-preferences/reorder-content'); + await browser.url('#/collection-preferences/reorder-content'); await page.setWindowSize(windowDimensions); await testFn(page); }); diff --git a/src/container/__integ__/awsui-applayout-sticky.test.ts b/src/container/__integ__/awsui-applayout-sticky.test.ts index d840773e4a..781ca244b0 100644 --- a/src/container/__integ__/awsui-applayout-sticky.test.ts +++ b/src/container/__integ__/awsui-applayout-sticky.test.ts @@ -31,7 +31,7 @@ function setupTest({ viewport = viewports.desktop }, testFn: (page: AppLayoutSti return useBrowser(async browser => { const page = new AppLayoutStickyPage(browser); await page.setWindowSize(viewport); - await browser.url('#/light/container/sticky-with-app-layout?visualRefresh=false'); + await browser.url('#/container/sticky-with-app-layout?visualRefresh=false'); await page.waitForVisible(appLayoutWrapper.findContentRegion().toSelector()); await testFn(page); }); diff --git a/src/container/__integ__/awsui-legacy-applayout-sticky.test.ts b/src/container/__integ__/awsui-legacy-applayout-sticky.test.ts index 73612578fc..ef0d3bb083 100644 --- a/src/container/__integ__/awsui-legacy-applayout-sticky.test.ts +++ b/src/container/__integ__/awsui-legacy-applayout-sticky.test.ts @@ -25,9 +25,7 @@ describe.each(['classic', 'visualRefresh'])('In %s', type => { return useBrowser(async browser => { const page = new AppLayoutLegacyStickyPage(browser); await page.setWindowSize(viewport); - await browser.url( - `#/light/app-layout/legacy-table-sticky-notifications/?visualRefresh=${type === 'visualRefresh'}` - ); + await browser.url(`#/app-layout/legacy-table-sticky-notifications/?visualRefresh=${type === 'visualRefresh'}`); await page.waitForVisible(appLayoutWrapper.findContentRegion().toSelector()); await testFn(page); }); diff --git a/src/container/__integ__/header-cover.test.ts b/src/container/__integ__/header-cover.test.ts index b858b98edd..3fce50bcd5 100644 --- a/src/container/__integ__/header-cover.test.ts +++ b/src/container/__integ__/header-cover.test.ts @@ -29,7 +29,7 @@ function setupTest( return useBrowser(async browser => { const page = new ContainerStickyPage(browser); await page.setWindowSize(viewport); - await browser.url(`#/light/container/sticky-permutations?visualRefresh=${visualRefresh}&${search}`); + await browser.url(`#/container/sticky-permutations?visualRefresh=${visualRefresh}&${search}`); await page.waitForVisible(tableWrapper.findBodyCell(1, 1).toSelector()); await testFn(page); }); diff --git a/src/date-input/__integ__/date-input.test.ts b/src/date-input/__integ__/date-input.test.ts index e42432dcdb..c3128e8f94 100644 --- a/src/date-input/__integ__/date-input.test.ts +++ b/src/date-input/__integ__/date-input.test.ts @@ -66,7 +66,7 @@ const createSetupTest = (url: string) => (testFn: (page: DateInputPage) => Promi }); }; -const setupTest = createSetupTest('#/light/date-input/simple'); +const setupTest = createSetupTest('#/date-input/simple'); describe('Date Input', () => { test( diff --git a/src/date-picker/__integ__/blur-event.test.ts b/src/date-picker/__integ__/blur-event.test.ts index 7027e4a99d..d635998cbe 100644 --- a/src/date-picker/__integ__/blur-event.test.ts +++ b/src/date-picker/__integ__/blur-event.test.ts @@ -28,7 +28,7 @@ describe.each([false, true])('DatePicker blur events (expandToViewport= const setupTest = (testFn: (page: DatePickerBlurPage) => Promise) => { return useBrowser(async browser => { const page = new DatePickerBlurPage(createWrapper().findDatePicker().getElement(), browser, expandToViewport); - await browser.url(`#/light/date-picker/with-event-handlers?expandToViewport=${expandToViewport}`); + await browser.url(`#/date-picker/with-event-handlers?expandToViewport=${expandToViewport}`); await page.waitForLoad(); await testFn(page); }); diff --git a/src/date-picker/__integ__/date-picker-dropdown.test.ts b/src/date-picker/__integ__/date-picker-dropdown.test.ts index 182be1a18f..2d52c94fb7 100644 --- a/src/date-picker/__integ__/date-picker-dropdown.test.ts +++ b/src/date-picker/__integ__/date-picker-dropdown.test.ts @@ -11,7 +11,7 @@ describe('Date picker Dropdown interactions', () => { const setupTest = (testFn: (page: DatePickerPage) => Promise) => { return useBrowser(async browser => { const page = new DatePickerPage(createWrapper().findDatePicker().getElement(), browser); - await browser.url('#/light/date-picker/simple'); + await browser.url('#/date-picker/simple'); await page.waitForLoad(); await testFn(page); }); @@ -138,7 +138,7 @@ describe('Dropdown with default value', () => { const setupTest = (testFn: (page: DatePickerPage) => Promise) => { return useBrowser(async browser => { const page = new DatePickerPage(createWrapper().findDatePicker().getElement(), browser); - await browser.url('#/light/date-picker/simple?hasValue=true&locale=en-GB'); + await browser.url('#/date-picker/simple?hasValue=true&locale=en-GB'); await page.waitForLoad(); await testFn(page); }); diff --git a/src/date-picker/__integ__/date-picker.test.ts b/src/date-picker/__integ__/date-picker.test.ts index 9bbffb3a2b..f12dfcc65d 100644 --- a/src/date-picker/__integ__/date-picker.test.ts +++ b/src/date-picker/__integ__/date-picker.test.ts @@ -9,7 +9,7 @@ describe('Date Picker', () => { const setupTest = (testFn: (page: DatePickerPage) => Promise) => { return useBrowser(async browser => { const page = new DatePickerPage(createWrapper().findDatePicker().getElement(), browser); - await browser.url('#/light/date-picker/simple'); + await browser.url('#/date-picker/simple'); await page.waitForLoad(); await testFn(page); }); diff --git a/src/date-picker/__integ__/fit-dropdown.test.ts b/src/date-picker/__integ__/fit-dropdown.test.ts index 11410eff62..47f1ea6060 100644 --- a/src/date-picker/__integ__/fit-dropdown.test.ts +++ b/src/date-picker/__integ__/fit-dropdown.test.ts @@ -44,7 +44,7 @@ describe('Dropdown fitHandler', () => { const setupTest = (testFn: (page: DatePickerDropdownTestPage) => Promise) => { return useBrowser(async browser => { const page = new DatePickerDropdownTestPage(createWrapper().findDatePicker().getElement(), browser); - await browser.url('#/light/date-picker/positioning'); + await browser.url('#/date-picker/positioning'); await page.waitForLoad(); await testFn(page); }); diff --git a/src/date-picker/__integ__/month-granularity.test.ts b/src/date-picker/__integ__/month-granularity.test.ts index 673172985e..79a76c0b4c 100644 --- a/src/date-picker/__integ__/month-granularity.test.ts +++ b/src/date-picker/__integ__/month-granularity.test.ts @@ -9,7 +9,7 @@ describe('Date picker at month granularity', () => { test( 'announces the year without the month when opening the calendar', useBrowser(async browser => { - await browser.url('#/light/date-picker/month-picker'); + await browser.url('#/date-picker/month-picker'); const page = new DatePickerPage(createWrapper().findDatePicker().getElement(), browser); await page.initLiveAnnouncementsObserver(); await page.waitForLoad(); diff --git a/src/date-range-picker/__integ__/date-range-picker-tz.test.ts b/src/date-range-picker/__integ__/date-range-picker-tz.test.ts index 6237e9ca94..a530c4a997 100644 --- a/src/date-range-picker/__integ__/date-range-picker-tz.test.ts +++ b/src/date-range-picker/__integ__/date-range-picker-tz.test.ts @@ -15,7 +15,7 @@ describe('Date Range Picker in America/Los_Angeles timezone', () => { }); const page = new DateRangePickerPage(createWrapper().findDateRangePicker().getElement(), browser); await browser.setTimeZone('America/Los_Angeles'); - await browser.url(`#/light/date-range-picker/with-value?${params}`); + await browser.url(`#/date-range-picker/with-value?${params}`); await page.waitForLoad(); await testFn(page); }); diff --git a/src/date-range-picker/__integ__/date-range-picker.test.ts b/src/date-range-picker/__integ__/date-range-picker.test.ts index 1e8bb09ab1..ef6bf05e1e 100644 --- a/src/date-range-picker/__integ__/date-range-picker.test.ts +++ b/src/date-range-picker/__integ__/date-range-picker.test.ts @@ -12,7 +12,7 @@ describe('Date Range Picker', () => { monthOnly: granularity === 'month' ? 'true' : 'false', }); const page = new DateRangePickerPage(createWrapper().findDateRangePicker().getElement(), browser); - await browser.url(`#/light/date-range-picker/with-value?${params}`); + await browser.url(`#/date-range-picker/with-value?${params}`); await page.waitForLoad(); await testFn(page); }); diff --git a/src/date-range-picker/__integ__/events.test.ts b/src/date-range-picker/__integ__/events.test.ts index fe8d95ef2b..a31e7ce8bf 100644 --- a/src/date-range-picker/__integ__/events.test.ts +++ b/src/date-range-picker/__integ__/events.test.ts @@ -40,7 +40,7 @@ describe('Date Range Picker', () => { monthOnly: granularity === 'month' ? 'true' : 'false', expandToViewport: `${expandToViewport}`, }); - await browser.url(`#/light/date-range-picker/with-event-handlers?${params}`); + await browser.url(`#/date-range-picker/with-event-handlers?${params}`); await page.waitForLoad(); await testFn(page); }); diff --git a/src/expandable-section/__integ__/expandable-section.test.ts b/src/expandable-section/__integ__/expandable-section.test.ts index 6ea2b608b5..0ed2c27343 100644 --- a/src/expandable-section/__integ__/expandable-section.test.ts +++ b/src/expandable-section/__integ__/expandable-section.test.ts @@ -13,7 +13,7 @@ const headerButtonSelector = expandableSectionWrapper.findHeader().find('[role=" const setupTest = (testFn: (page: BasePageObject) => Promise) => { return useBrowser(async browser => { const page = new BasePageObject(browser); - await browser.url('#/light/expandable-section/test'); + await browser.url('#/expandable-section/test'); await page.waitForVisible(expandableSectionWrapper.toSelector()); await testFn(page); }); diff --git a/src/file-input/__integ__/file-input.test.ts b/src/file-input/__integ__/file-input.test.ts index 2e587c57f8..1457d35b3d 100644 --- a/src/file-input/__integ__/file-input.test.ts +++ b/src/file-input/__integ__/file-input.test.ts @@ -11,7 +11,7 @@ const fileInputWrapper = wrapper.findFileInput(); const setupTest = (testFn: (page: BasePageObject) => Promise) => { return useBrowser(async browser => { const page = new BasePageObject(browser); - await browser.url('#/light/file-input/integ'); + await browser.url('#/file-input/integ'); await page.waitForVisible(fileInputWrapper.toSelector()); await testFn(page); }); diff --git a/src/file-upload/__integ__/file-upload.test.ts b/src/file-upload/__integ__/file-upload.test.ts index 021c2a63e6..cf386936da 100644 --- a/src/file-upload/__integ__/file-upload.test.ts +++ b/src/file-upload/__integ__/file-upload.test.ts @@ -20,7 +20,7 @@ class FileUploadPageObject extends BasePageObject { const setupTest = (testFn: (page: FileUploadPageObject) => Promise) => { return useBrowser(async browser => { const page = new FileUploadPageObject(browser); - await browser.url('/#/light/file-upload/test'); + await browser.url('/#/file-upload/test'); await testFn(page); }); }; diff --git a/src/flashbar/__integ__/collapsible.test.ts b/src/flashbar/__integ__/collapsible.test.ts index c2e1f0d23b..c997b602f0 100644 --- a/src/flashbar/__integ__/collapsible.test.ts +++ b/src/flashbar/__integ__/collapsible.test.ts @@ -148,7 +148,7 @@ describe('Flashbar Style API', () => { test( 'active, hover and focus states', useBrowser(async browser => { - await browser.url('#/light/flashbar/style-custom'); + await browser.url('#/flashbar/style-custom'); const page = new FlashbarBasePage(browser); const dismissButton = page.getDismissButton(); diff --git a/src/flashbar/__integ__/persistence-integ.test.ts b/src/flashbar/__integ__/persistence-integ.test.ts index 2b7bb9e02e..7fc414086d 100644 --- a/src/flashbar/__integ__/persistence-integ.test.ts +++ b/src/flashbar/__integ__/persistence-integ.test.ts @@ -30,7 +30,7 @@ const setupTest = ( if (params.dismissedKeys !== undefined) { urlParams.set('dismissedKeys', params.dismissedKeys); } - const url = `#/light/flashbar/persistence${urlParams.toString() ? '?' + urlParams.toString() : ''}`; + const url = `#/flashbar/persistence${urlParams.toString() ? '?' + urlParams.toString() : ''}`; await browser.url(url); await page.waitForVisible(flashbar.toSelector()); await testFn(page); diff --git a/src/flashbar/__motion__/collapsible-flashbar.test.ts b/src/flashbar/__motion__/collapsible-flashbar.test.ts index 9b82cb34f2..b984f5c880 100644 --- a/src/flashbar/__motion__/collapsible-flashbar.test.ts +++ b/src/flashbar/__motion__/collapsible-flashbar.test.ts @@ -8,7 +8,7 @@ import { FlashbarInteractivePage } from '../__integ__/pages/interactive-page'; const setupTest = (options: { visualRefresh?: boolean }, testFn: (page: FlashbarInteractivePage) => Promise) => { return useBrowser(async browser => { const page = new FlashbarInteractivePage(browser); - const baseUrl = '#/light/flashbar/interactive'; + const baseUrl = '#/flashbar/interactive'; const url = options.visualRefresh === undefined ? baseUrl diff --git a/src/i18n/__integ__/i18n.test.ts b/src/i18n/__integ__/i18n.test.ts index af8f93de8a..98933fb0e2 100644 --- a/src/i18n/__integ__/i18n.test.ts +++ b/src/i18n/__integ__/i18n.test.ts @@ -12,7 +12,7 @@ const wrapper = createWrapper().findTagEditor(); const setupTest = (testFn: (page: BasePageObject) => Promise) => { return useBrowser(async browser => { const page = new BasePageObject(browser); - await browser.url('/#/light/i18n/dynamic'); + await browser.url('/#/i18n/dynamic'); await testFn(page); }); }; diff --git a/src/icon/__integ__/icon.test.ts b/src/icon/__integ__/icon.test.ts index 78f2463f0e..c401709f14 100644 --- a/src/icon/__integ__/icon.test.ts +++ b/src/icon/__integ__/icon.test.ts @@ -37,7 +37,7 @@ describe('Icon', () => { const setupTest = (testFn: (page: IconSizeInherit) => Promise) => { return useBrowser(async browser => { const page = new IconSizeInherit(browser); - await browser.url('#/light/icon/size-inherit'); + await browser.url('#/icon/size-inherit'); await page.waitForVisible(dynamicIconSelector); // The default theme is VR by default, so we toggle once to go to classic mode await page.toggleMode(); diff --git a/src/input/__integ__/input.test.ts b/src/input/__integ__/input.test.ts index 97844aafbf..bbde32acfc 100644 --- a/src/input/__integ__/input.test.ts +++ b/src/input/__integ__/input.test.ts @@ -9,7 +9,7 @@ describe('Input', () => { const setupTest = (testFn: (page: InputPage) => Promise) => { return useBrowser(async browser => { const page = new InputPage(browser); - await page.visit('#/light/input/input-integ'); + await page.visit('#/input/input-integ'); await testFn(page); }); }; @@ -36,7 +36,7 @@ describe('Input', () => { test( 'Clicking on form field label should focus the input', useBrowser(async browser => { - await browser.url('#/light/input/inputs'); + await browser.url('#/input/inputs'); const page = new InputPage(browser); const wrapper = createWrapper(); await page.click(wrapper.findFormField().findLabel().toSelector()); diff --git a/src/internal/analytics/__integ__/static-multi-page-create.test.ts b/src/internal/analytics/__integ__/static-multi-page-create.test.ts index 492ec83a20..8627c188b6 100644 --- a/src/internal/analytics/__integ__/static-multi-page-create.test.ts +++ b/src/internal/analytics/__integ__/static-multi-page-create.test.ts @@ -48,7 +48,7 @@ describe.each(['refresh', 'refresh-toolbar'] as Theme[])('%s', theme => { return; } const page = new MultiPageCreate(browser); - await browser.url(`#/light/funnel-analytics/static-multi-page-flow?${getUrlParams(theme, {})}`); + await browser.url(`#/funnel-analytics/static-multi-page-flow?${getUrlParams(theme, {})}`); await testFn(page); }); } diff --git a/src/internal/analytics/__integ__/static-single-page-flow.test.ts b/src/internal/analytics/__integ__/static-single-page-flow.test.ts index e14b0b2e9f..498e2da063 100644 --- a/src/internal/analytics/__integ__/static-single-page-flow.test.ts +++ b/src/internal/analytics/__integ__/static-single-page-flow.test.ts @@ -41,7 +41,7 @@ describe.each(['refresh', 'refresh-toolbar'] as Theme[])('%s', theme => { function setupTest(testFn: (page: SinglePageCreate) => Promise) { return useBrowser(async browser => { const page = new SinglePageCreate(browser); - await page.visit(`#/light/funnel-analytics/static-single-page-flow?${getUrlParams(theme, {})}`); + await page.visit(`#/funnel-analytics/static-single-page-flow?${getUrlParams(theme, {})}`); await new Promise(r => setTimeout(r, 10)); await testFn(page); }); diff --git a/src/internal/components/autosuggest-input/__integ__/autosuggest-input.test.ts b/src/internal/components/autosuggest-input/__integ__/autosuggest-input.test.ts index 13eb3fc023..be9ec195b7 100644 --- a/src/internal/components/autosuggest-input/__integ__/autosuggest-input.test.ts +++ b/src/internal/components/autosuggest-input/__integ__/autosuggest-input.test.ts @@ -8,7 +8,7 @@ import AutosuggestInputWrapper from '../../../../../lib/components/test-utils/se const wrapper = new AutosuggestInputWrapper('*'); -function setupTest(testFn: (page: BasePageObject) => Promise, url = '/#/light/autosuggest/autosuggest-input') { +function setupTest(testFn: (page: BasePageObject) => Promise, url = '/#/autosuggest/autosuggest-input') { return useBrowser(async browser => { const page = new BasePageObject(browser); await browser.url(url); diff --git a/src/internal/components/chart-popover/__integ__/chart-popover.test.ts b/src/internal/components/chart-popover/__integ__/chart-popover.test.ts index 2f721d4acf..6afffd7888 100644 --- a/src/internal/components/chart-popover/__integ__/chart-popover.test.ts +++ b/src/internal/components/chart-popover/__integ__/chart-popover.test.ts @@ -11,7 +11,7 @@ describe.each([false, true])('iframe=%s', iframe => { 'can be unpinned by clicking outside', useBrowser(async browser => { const page = new BasePageObject(browser); - await browser.url(`#/light/charts.test?iframe=${iframe}`); + await browser.url(`#/charts.test?iframe=${iframe}`); await page.runInsideIframe('#content-iframe', iframe, async () => { const chart = createWrapper().findLineChart(); const popover = chart.findDetailPopover(); diff --git a/src/internal/components/dropdown/__integ__/alignment.test.ts b/src/internal/components/dropdown/__integ__/alignment.test.ts index e77b2f2a08..49d61701df 100644 --- a/src/internal/components/dropdown/__integ__/alignment.test.ts +++ b/src/internal/components/dropdown/__integ__/alignment.test.ts @@ -12,7 +12,7 @@ describe('Dropdown and trigger element alignment', () => { function setupTest(testFn: (page: BasePageObject) => Promise) { return useBrowser(async browser => { - await browser.url(`#/light/dropdown/${pageName}?expandToViewport=${expandToViewport}`); + await browser.url(`#/dropdown/${pageName}?expandToViewport=${expandToViewport}`); const page = new BasePageObject(browser); await page.runInsideIframe('#expandable-dropdowns-iframe', pageName === 'expandable-iframe', async () => { await page.waitForVisible(createWrapper().findAutosuggest().toSelector()); diff --git a/src/internal/components/dropdown/__integ__/child-dropdown.test.ts b/src/internal/components/dropdown/__integ__/child-dropdown.test.ts index e683e21c5f..eed06c7a3c 100644 --- a/src/internal/components/dropdown/__integ__/child-dropdown.test.ts +++ b/src/internal/components/dropdown/__integ__/child-dropdown.test.ts @@ -27,7 +27,7 @@ describe('Child dropdown', () => { test( 'opens to the bottom right', setupChildTest( - '#/light/dropdown/interior-fitting', + '#/dropdown/interior-fitting', 'parentDropdown1', 'childDropdown1', async (parentDropdown, childDropdown) => { @@ -42,7 +42,7 @@ describe('Child dropdown', () => { test( 'opens to the bottom left', setupChildTest( - '#/light/dropdown/interior-fitting', + '#/dropdown/interior-fitting', 'parentDropdown2', 'childDropdown2', async (parentDropdown, childDropdown) => { @@ -57,7 +57,7 @@ describe('Child dropdown', () => { test( 'opens to the top right', setupChildTest( - '#/light/dropdown/interior-fitting', + '#/dropdown/interior-fitting', 'parentDropdown3', 'childDropdown3', async (parentDropdown, childDropdown) => { @@ -72,7 +72,7 @@ describe('Child dropdown', () => { test( 'opens to the top left', setupChildTest( - '#/light/dropdown/interior-fitting', + '#/dropdown/interior-fitting', 'parentDropdown4', 'childDropdown4', async (parentDropdown, childDropdown) => { @@ -87,7 +87,7 @@ describe('Child dropdown', () => { test( 'opens to the bottom right and wraps text', setupChildTest( - '#/light/dropdown/interior-with-wrapping', + '#/dropdown/interior-with-wrapping', 'parentDropdown5', 'childDropdown5', async (parentDropdown, childDropdown) => { @@ -103,7 +103,7 @@ describe('Child dropdown', () => { test( 'opens to the top left and wraps text', setupChildTest( - '#/light/dropdown/interior-with-wrapping', + '#/dropdown/interior-with-wrapping', 'parentDropdown6', 'childDropdown6', async (parentDropdown, childDropdown) => { diff --git a/src/internal/components/dropdown/__integ__/dropdown-focus-trap.test.ts b/src/internal/components/dropdown/__integ__/dropdown-focus-trap.test.ts index cc587d78a1..1605510038 100644 --- a/src/internal/components/dropdown/__integ__/dropdown-focus-trap.test.ts +++ b/src/internal/components/dropdown/__integ__/dropdown-focus-trap.test.ts @@ -17,7 +17,7 @@ function setupTest(settings: PageSettings, testFn: (page: DropdownPageObject) => for (const [key, value] of Object.entries(settings)) { query.set(key, value); } - await browser.url(`#/light/dropdown/focus-trap?${query.toString()}`); + await browser.url(`#/dropdown/focus-trap?${query.toString()}`); const page = new DropdownPageObject('test-target', browser); await page.waitForVisible(page.getDropdown()); await page.click(page.getTrigger()); diff --git a/src/internal/components/dropdown/__integ__/dropdown.test.ts b/src/internal/components/dropdown/__integ__/dropdown.test.ts index bdaaca4327..48a8dfae9b 100644 --- a/src/internal/components/dropdown/__integ__/dropdown.test.ts +++ b/src/internal/components/dropdown/__integ__/dropdown.test.ts @@ -17,7 +17,7 @@ function setupTest(url: string, dropdownId: string, testFn: (page: DropdownPageO describe('Dropdown', () => { test( 'dropdown opens down, if there is enough space below it', - setupTest('#/light/dropdown/simple', 'smallDropDown', async page => { + setupTest('#/dropdown/simple', 'smallDropDown', async page => { const { top: dropdownTop } = await page.getBoundingBox(page.getOpenDropdown()); const { top: triggerTop } = await page.getBoundingBox(page.getTrigger()); expect(dropdownTop).toBeGreaterThan(triggerTop); @@ -25,13 +25,13 @@ describe('Dropdown', () => { ); test( 'dropdown opens down, if there is more space below than above', - setupTest('#/light/dropdown/simple', 'largeDropDown', async page => { + setupTest('#/dropdown/simple', 'largeDropDown', async page => { await expect(page.getDropdownVerticalDirection()).resolves.toEqual('down'); }) ); test( 'dropdown opens up, if there is more space above than below', - setupTest('#/light/dropdown/simple', 'largeDropUp', async page => { + setupTest('#/dropdown/simple', 'largeDropUp', async page => { const { top: dropdownTop } = await page.getBoundingBox(page.getOpenDropdown()); expect(dropdownTop).toBeGreaterThan(0); await expect(page.getDropdownVerticalDirection()).resolves.toEqual('up'); @@ -39,7 +39,7 @@ describe('Dropdown', () => { ); test( 'dropdown opens to the right, if there is enough space on the right side', - setupTest('#/light/dropdown/positioning', 'topLeftDropDown', async page => { + setupTest('#/dropdown/positioning', 'topLeftDropDown', async page => { const { left: dropdownLeft, right: dropdownRight } = await page.getBoundingBox(page.getOpenDropdown()); const { left: triggerLeft, right: triggerRight } = await page.getBoundingBox(page.getTrigger()); expect(dropdownRight).toBeGreaterThan(triggerRight); @@ -48,7 +48,7 @@ describe('Dropdown', () => { ); test( 'dropdown width is equal trigger width, if dropdown content is narrower than trigger', - setupTest('#/light/dropdown/positioning', 'bottomLeftDropDown', async page => { + setupTest('#/dropdown/positioning', 'bottomLeftDropDown', async page => { const { width: dropdownWidth } = await page.getBoundingBox(page.getOpenDropdown()); const { width: triggerWidth } = await page.getBoundingBox(page.getTrigger()); expect(dropdownWidth).toEqual(triggerWidth); @@ -56,7 +56,7 @@ describe('Dropdown', () => { ); test( 'dropdown opens down in a container with fixed position', - setupTest('#/light/dropdown/fixed-container', 'fixedDropdown', async page => { + setupTest('#/dropdown/fixed-container', 'fixedDropdown', async page => { const { height: windowHeight, pageHeight } = await page.getViewportSize(); await expect(page.getDropdownVerticalDirection()).resolves.toEqual('down'); await page.click(page.getTrigger()); // close already open dropdown @@ -73,14 +73,14 @@ describe('Dropdown', () => { const MIN_WIDTH = 800; test( 'is used as a minimum width of the dropdown instead of the trigger width', - setupTest('#/light/dropdown/min-width', 'minWidthDropdown', async page => { + setupTest('#/dropdown/min-width', 'minWidthDropdown', async page => { const { width: dropdownWidth } = await page.getBoundingBox(page.getOpenDropdown()); expect(dropdownWidth).toEqual(MIN_WIDTH); }) ); test( 'does nothing, if trigger width is smaller than the provided minWidth', - setupTest('#/light/dropdown/min-width', 'minWidthDropdown', async page => { + setupTest('#/dropdown/min-width', 'minWidthDropdown', async page => { await page.setWindowSize({ width: 600, height: 600 }); // reopen the dropdown after the window got resized await page.click(page.getTrigger()); @@ -94,7 +94,7 @@ describe('Dropdown', () => { }); test( 'dropdown opens to the left, if there is not enough space on the right side and enough on the left', - setupTest('#/light/dropdown/positioning', 'topRightDropDown', async page => { + setupTest('#/dropdown/positioning', 'topRightDropDown', async page => { const { left: dropdownLeft, right: dropdownRight } = await page.getBoundingBox(page.getOpenDropdown()); const { left: triggerLeft, right: triggerRight } = await page.getBoundingBox(page.getTrigger()); expect(dropdownLeft).toBeLessThan(triggerLeft); @@ -103,7 +103,7 @@ describe('Dropdown', () => { ); test( 'dropdown opens to the right, if there is not enough space on both sides, but more space on the right', - setupTest('#/light/dropdown/positioning', 'topMiddleDropDown', async page => { + setupTest('#/dropdown/positioning', 'topMiddleDropDown', async page => { const { left: dropdownLeft, right: dropdownRight } = await page.getBoundingBox(page.getOpenDropdown()); const { left: triggerLeft, right: triggerRight } = await page.getBoundingBox(page.getTrigger()); expect(dropdownLeft).toEqual(triggerLeft); @@ -112,7 +112,7 @@ describe('Dropdown', () => { ); test( 'dropdown opens to the left, if there is not enough space on both sides, but more space on the left', - setupTest('#/light/dropdown/positioning', 'bottomRightDropDown', async page => { + setupTest('#/dropdown/positioning', 'bottomRightDropDown', async page => { const { left: dropdownLeft, right: dropdownRight } = await page.getBoundingBox(page.getOpenDropdown()); const { left: triggerLeft, right: triggerRight } = await page.getBoundingBox(page.getTrigger()); expect(dropdownRight).toEqual(triggerRight); @@ -121,7 +121,7 @@ describe('Dropdown', () => { ); it( 'stretch height: vertically stretch to fit the content and overflow to the bottom and not to the right', - setupTest('#/light/dropdown/interior-stretch-height', 'dropdown1', async page => { + setupTest('#/dropdown/interior-stretch-height', 'dropdown1', async page => { const { bottom: containerBottom, right: containerRight } = await page.getBoundingBox('#container-1'); const { bottom: dropdownBottom, right: dropdownRight } = await page.getBoundingBox(page.getOpenDropdown()); expect(dropdownRight).toBeLessThan(containerRight); @@ -130,7 +130,7 @@ describe('Dropdown', () => { ); it( 'do not stretch height: content does not fit vertically, dropdown adds scrollbar and do not overlap', - setupTest('#/light/dropdown/interior-stretch-height', 'dropdown2', async page => { + setupTest('#/dropdown/interior-stretch-height', 'dropdown2', async page => { const { bottom: containerBottom, right: containerRight } = await page.getBoundingBox('#container-2'); const { bottom: dropdownBottom, right: dropdownRight } = await page.getBoundingBox(page.getOpenDropdown()); expect(dropdownRight).toBeLessThan(containerRight); @@ -139,7 +139,7 @@ describe('Dropdown', () => { ); test( 'dropdown reserves 50px space on right side', - setupTest('#/light/dropdown/interior-stretch-height', 'dropdown2', async page => { + setupTest('#/dropdown/interior-stretch-height', 'dropdown2', async page => { const { right: containerRight } = await page.getBoundingBox('#container-2'); const { right: dropdownRight } = await page.getBoundingBox(page.getOpenDropdown()); expect(containerRight - dropdownRight).toEqual(50); @@ -147,7 +147,7 @@ describe('Dropdown', () => { ); test( 'dropdown reserves 20px on right side on small screen', - setupTest('#/light/dropdown/interior-stretch-height', 'dropdown2', async page => { + setupTest('#/dropdown/interior-stretch-height', 'dropdown2', async page => { await page.setWindowSize({ width: 500, height: 800 }); const { right: containerRight } = await page.getBoundingBox('#container-2'); const { right: dropdownRight } = await page.getBoundingBox(page.getOpenDropdown()); @@ -156,7 +156,7 @@ describe('Dropdown', () => { ); test( 'dropdown reserves 31px less at bottom on small screen', - setupTest('#/light/dropdown/interior-stretch-height', 'dropdown2', async page => { + setupTest('#/dropdown/interior-stretch-height', 'dropdown2', async page => { const { bottom: containerBottom } = await page.getBoundingBox('#container-2'); const { bottom: dropdownBottom } = await page.getBoundingBox(page.getOpenDropdown()); const bottomPadding = containerBottom - dropdownBottom; @@ -169,7 +169,7 @@ describe('Dropdown', () => { ); it( 'stretch height and width: content does not fit vertically and horizontally, overflow to the bottom and to the right', - setupTest('#/light/dropdown/interior-stretch-height', 'dropdown3', async page => { + setupTest('#/dropdown/interior-stretch-height', 'dropdown3', async page => { const { bottom: containerBottom, right: containerRight } = await page.getBoundingBox('#container-3'); const { bottom: dropdownBottom, right: dropdownRight } = await page.getBoundingBox(page.getOpenDropdown()); expect(dropdownRight).toBeGreaterThan(containerRight); @@ -180,7 +180,7 @@ describe('Dropdown', () => { describe('with preferred center position', () => { it( 'is centered when there is enough space', - setupTest('#/light/dropdown/prefer-center', 'centerDropdown', async page => { + setupTest('#/dropdown/prefer-center', 'centerDropdown', async page => { const { left: dropdownLeft, right: dropdownRight } = await page.getBoundingBox(page.getOpenDropdown()); const { left: triggerLeft, right: triggerRight } = await page.getBoundingBox(page.getTrigger()); @@ -191,7 +191,7 @@ describe('Dropdown', () => { it( 'drops to the left if it cannot be centered and there is more space to the left', - setupTest('#/light/dropdown/prefer-center', 'rightDropdown', async page => { + setupTest('#/dropdown/prefer-center', 'rightDropdown', async page => { const { left: dropdownLeft, right: dropdownRight } = await page.getBoundingBox(page.getOpenDropdown()); const { left: triggerLeft, right: triggerRight } = await page.getBoundingBox(page.getTrigger()); @@ -202,7 +202,7 @@ describe('Dropdown', () => { it( 'drops to the right if it cannot be centered and there is more space to the right', - setupTest('#/light/dropdown/prefer-center', 'leftDropdown', async page => { + setupTest('#/dropdown/prefer-center', 'leftDropdown', async page => { const { left: dropdownLeft, right: dropdownRight } = await page.getBoundingBox(page.getOpenDropdown()); const { left: triggerLeft, right: triggerRight } = await page.getBoundingBox(page.getTrigger()); diff --git a/src/internal/components/dropdown/__integ__/width.test.ts b/src/internal/components/dropdown/__integ__/width.test.ts index 7deb4a393f..809c7e8b6f 100644 --- a/src/internal/components/dropdown/__integ__/width.test.ts +++ b/src/internal/components/dropdown/__integ__/width.test.ts @@ -55,7 +55,7 @@ function setupTest( ) { return useBrowser({ width: pageWidth, height: 1000 }, async browser => { await browser.url( - `#/light/dropdown/width?component=${componentId}&expandToViewport=${expandToViewport}&triggerWidth=${triggerWidth}px&asyncLoading=${asyncLoading}&manualServerMock=${asyncLoading}` + `#/dropdown/width?component=${componentId}&expandToViewport=${expandToViewport}&triggerWidth=${triggerWidth}px&asyncLoading=${asyncLoading}&manualServerMock=${asyncLoading}` ); const page = new DropdownPageObject(browser); await page.waitForVisible(page.getWrapperAndTrigger(componentId).wrapper.toSelector()); diff --git a/src/internal/components/focus-lock/__integ__/focus-lock.test.ts b/src/internal/components/focus-lock/__integ__/focus-lock.test.ts index 17de85fbb6..7911a96077 100644 --- a/src/internal/components/focus-lock/__integ__/focus-lock.test.ts +++ b/src/internal/components/focus-lock/__integ__/focus-lock.test.ts @@ -7,7 +7,7 @@ import createWrapper, { ElementWrapper } from '../../../../../lib/components/tes function setupTest(testFn: (page: BasePageObject, wrapper: ElementWrapper) => Promise) { return useBrowser(async browser => { - await browser.url('#/light/focus-lock'); + await browser.url('#/focus-lock'); const page = new BasePageObject(browser); const wrapper = createWrapper(); await page.waitForVisible(wrapper.findButton().toSelector()); diff --git a/src/internal/components/options-list/__integ__/options-list.test.ts b/src/internal/components/options-list/__integ__/options-list.test.ts index f0ecbfec60..e81617b6b2 100644 --- a/src/internal/components/options-list/__integ__/options-list.test.ts +++ b/src/internal/components/options-list/__integ__/options-list.test.ts @@ -30,7 +30,7 @@ describe('OptionList "LoadMore" Event', () => { test( 'fires loadMore event when the content is scrolled to the end', useBrowser(async browser => { - await browser.url('#/light/options-list/simple'); + await browser.url('#/options-list/simple'); const page = new OptionsListPageObject(browser); await page.waitForVisible(page.getTrigger()); await page.click(page.getTrigger()); diff --git a/src/internal/components/tooltip/__integ__/tooltip.test.ts b/src/internal/components/tooltip/__integ__/tooltip.test.ts index 79f80594a6..81fa8d1fed 100644 --- a/src/internal/components/tooltip/__integ__/tooltip.test.ts +++ b/src/internal/components/tooltip/__integ__/tooltip.test.ts @@ -10,7 +10,7 @@ import tooltipStyles from '../../../../../lib/components/internal/components/too test( 'should not close any wrapping modals when the tooltip detects an Escape keypress', useBrowser(async browser => { - await browser.url('/#/light/modal/with-tooltip'); + await browser.url('/#/modal/with-tooltip'); const page = new BasePageObject(browser); const openButtonSelector = createWrapper().findButton().toSelector(); diff --git a/src/internal/hooks/container-queries/__integ__/use-breakpoint-query.test.ts b/src/internal/hooks/container-queries/__integ__/use-breakpoint-query.test.ts index 312ceeb408..060f71f641 100644 --- a/src/internal/hooks/container-queries/__integ__/use-breakpoint-query.test.ts +++ b/src/internal/hooks/container-queries/__integ__/use-breakpoint-query.test.ts @@ -8,7 +8,7 @@ describe('use-breakpoint-query', () => { const setupTest = (testFn: (page: PageObject) => Promise) => { return useBrowser(async browser => { const page = new PageObject(browser); - await browser.url('#/light/container-queries'); + await browser.url('#/container-queries'); await testFn(page); }); }; diff --git a/src/internal/hooks/use-scroll-sync/__integ__/use-scroll-sync.test.ts b/src/internal/hooks/use-scroll-sync/__integ__/use-scroll-sync.test.ts index a144a30dc0..42c939f24e 100644 --- a/src/internal/hooks/use-scroll-sync/__integ__/use-scroll-sync.test.ts +++ b/src/internal/hooks/use-scroll-sync/__integ__/use-scroll-sync.test.ts @@ -20,7 +20,7 @@ describe('use-scroll-sync', () => { const setupTest = (testFn: (page: ScrollSyncPage) => Promise) => { return useBrowser(async browser => { const page = new ScrollSyncPage(browser); - await browser.url('#/light/sync-scrolls'); + await browser.url('#/sync-scrolls'); await page.waitForVisible('#element1'); await testFn(page); }); diff --git a/src/line-chart/__integ__/line-chart.test.ts b/src/line-chart/__integ__/line-chart.test.ts index 4c97fe21bd..0ccc30356a 100644 --- a/src/line-chart/__integ__/line-chart.test.ts +++ b/src/line-chart/__integ__/line-chart.test.ts @@ -30,7 +30,7 @@ function setupTest(url: string, testFn: (page: LineChartPageObject) => Promise { describe('with one single series', () => { - const testPath = '#/light/line-chart/single-series'; + const testPath = '#/line-chart/single-series'; test( 'line series is navigable with keyboard', @@ -55,7 +55,7 @@ describe('Keyboard navigation', () => { test( 'retains focus after dismissing popover', - setupTest('#/light/line-chart/single-series', async page => { + setupTest('#/line-chart/single-series', async page => { await focusChart(page); // First series is highlighted @@ -78,7 +78,7 @@ describe('Keyboard navigation', () => { }); describe('with multiple series', () => { - const testPath = '#/light/line-chart/test'; + const testPath = '#/line-chart/test'; test( 'line series are navigable with keyboard', diff --git a/src/link/__integ__/link.test.ts b/src/link/__integ__/link.test.ts index 707ebceee7..41e6caac73 100644 --- a/src/link/__integ__/link.test.ts +++ b/src/link/__integ__/link.test.ts @@ -18,7 +18,7 @@ describe('Link', () => { test( 'enter key triggers link', useBrowser(async browser => { - await browser.url('#/light/link/integration'); + await browser.url('#/link/integration'); const page = new LinkPageObject(browser); await page.waitForVisible(wrapper.findLink('#role-link').toSelector()); await expect(page.getClickMessage()).resolves.toBe('0 times clicked'); @@ -31,7 +31,7 @@ describe('Link', () => { test( 'space key does not trigger link', useBrowser(async browser => { - await browser.url('#/light/link/integration'); + await browser.url('#/link/integration'); const page = new LinkPageObject(browser); await page.waitForVisible(wrapper.findLink('#role-link').toSelector()); await expect(page.getClickMessage()).resolves.toBe('0 times clicked'); @@ -46,7 +46,7 @@ describe('Link', () => { test( 'enter key and space key trigger link', useBrowser(async browser => { - await browser.url('#/light/link/integration'); + await browser.url('#/link/integration'); const page = new LinkPageObject(browser); await page.waitForVisible(wrapper.findLink('#role-button').toSelector()); await expect(page.getClickMessage()).resolves.toBe('0 times clicked'); diff --git a/src/live-region/__integ__/live-region.test.ts b/src/live-region/__integ__/live-region.test.ts index dac39f1c14..55a2238e03 100644 --- a/src/live-region/__integ__/live-region.test.ts +++ b/src/live-region/__integ__/live-region.test.ts @@ -13,7 +13,7 @@ class LiveRegionPageObject extends BasePageObject { function setupTest(testFn: (pageObject: LiveRegionPageObject) => Promise) { return useBrowser(async browser => { - await browser.url('#/light/live-region'); + await browser.url('#/live-region'); const pageObject = new LiveRegionPageObject(browser); await pageObject.waitForVisible('h1'); return testFn(pageObject); diff --git a/src/mixed-line-bar-chart/__integ__/announcements.test.ts b/src/mixed-line-bar-chart/__integ__/announcements.test.ts index 71fb051898..6d4d56932b 100644 --- a/src/mixed-line-bar-chart/__integ__/announcements.test.ts +++ b/src/mixed-line-bar-chart/__integ__/announcements.test.ts @@ -16,7 +16,7 @@ describe('Popover content is announced as plain text on hover', () => { test( 'without expandable sub-items', - setupTest(`#/light/mixed-line-bar-chart/drilldown?useLinks=${useLinks}&expandableSubItems=false`, async page => { + setupTest(`#/mixed-line-bar-chart/drilldown?useLinks=${useLinks}&expandableSubItems=false`, async page => { const wrapper = createWrapper().findMixedLineBarChart(); const bar = wrapper.findBarGroups().get(3).toSelector(); const getLabel = () => page.getElementAttribute(bar, 'aria-label'); @@ -36,7 +36,7 @@ describe('Popover content is announced as plain text on hover', () => { (process.env.REACT_VERSION !== '18' ? test : test.skip)( 'with expandable sub-items', - setupTest(`#/light/mixed-line-bar-chart/drilldown?useLinks=${useLinks}&expandableSubItems=true`, async page => { + setupTest(`#/mixed-line-bar-chart/drilldown?useLinks=${useLinks}&expandableSubItems=true`, async page => { const wrapper = createWrapper().findMixedLineBarChart(); const barGroup = wrapper.findBarGroups().get(3).toSelector(); const nextBarGroup = wrapper.findBarGroups().get(4).toSelector(); @@ -80,7 +80,7 @@ describe('Application aria label', () => { const chartWrapper = createWrapper().findMixedLineBarChart('#chart'); test( 'is updated when navigating in a bar chart with keyboard', - setupTest('#/light/bar-chart/test', async page => { + setupTest('#/bar-chart/test', async page => { // Hover over first group in the first chart await page.click('#focus-target'); await page.keys(['Tab', 'Tab', 'ArrowRight']); diff --git a/src/mixed-line-bar-chart/__integ__/detail-popover-series-content.test.ts b/src/mixed-line-bar-chart/__integ__/detail-popover-series-content.test.ts index 1a948db4b1..8d85549c5f 100644 --- a/src/mixed-line-bar-chart/__integ__/detail-popover-series-content.test.ts +++ b/src/mixed-line-bar-chart/__integ__/detail-popover-series-content.test.ts @@ -8,7 +8,7 @@ describe('Detail popover series content keeps expanded state independently for e test.each(['hover', 'click'])('on %s', interaction => useBrowser(async browser => { const page = new MixedChartPage(browser); - await browser.url('#/light/mixed-line-bar-chart/drilldown?expandableSubItems=true'); + await browser.url('#/mixed-line-bar-chart/drilldown?expandableSubItems=true'); const textUnderFirstExpandableSection = 'AWS Config'; const textUnderSecondExpandableSection = 'Amazon Elastic Container Service'; diff --git a/src/mixed-line-bar-chart/__integ__/mixed-line-bar-chart.test.ts b/src/mixed-line-bar-chart/__integ__/mixed-line-bar-chart.test.ts index ff4b734bdd..0cce3ec318 100644 --- a/src/mixed-line-bar-chart/__integ__/mixed-line-bar-chart.test.ts +++ b/src/mixed-line-bar-chart/__integ__/mixed-line-bar-chart.test.ts @@ -31,7 +31,7 @@ const legendWrapper = chartWrapper.findLegend(); describe('Legend', () => { test( 'can be controlled with mouse', - setupTest('#/light/mixed-line-bar-chart/test', async page => { + setupTest('#/mixed-line-bar-chart/test', async page => { // Scroll down to get access to the legend await page.windowScrollTo({ top: 200 }); @@ -45,7 +45,7 @@ describe('Legend', () => { test( 'can be controlled with keyboard', - setupTest('#/light/mixed-line-bar-chart/test', async page => { + setupTest('#/mixed-line-bar-chart/test', async page => { await page.click('#focus-target'); // Tab to first legend item @@ -63,7 +63,7 @@ describe('Legend', () => { test( 'highlighted legend elements should be not be highlighted when user hovers away', - setupTest('#/light/mixed-line-bar-chart/test', async page => { + setupTest('#/mixed-line-bar-chart/test', async page => { // Scroll down to get access to the legend await page.windowScrollTo({ top: 200 }); @@ -80,7 +80,7 @@ describe('Legend', () => { describe('Filter', () => { test( 'can filter out segments', - setupTest('#/light/mixed-line-bar-chart/test', async page => { + setupTest('#/mixed-line-bar-chart/test', async page => { await expect(page.getElementsCount(chartWrapper.findSeries().toSelector())).resolves.toBe(3); await expect(page.getElementsCount(legendWrapper.findItems().toSelector())).resolves.toBe(3); @@ -103,7 +103,7 @@ describe('Filter', () => { test( 'maintains series order', - setupTest('#/light/mixed-line-bar-chart/test', async page => { + setupTest('#/mixed-line-bar-chart/test', async page => { // Open filter await page.click(chartWrapper.findDefaultFilter().findTrigger().toSelector()); await page.waitForVisible(chartWrapper.findDefaultFilter().findDropdown().findOpenDropdown().toSelector()); @@ -133,7 +133,7 @@ describe('Filter', () => { describe('Series', () => { test( 'grouped bar chart can be highlighted with keyboard', - setupTest('#/light/bar-chart/test', async page => { + setupTest('#/bar-chart/test', async page => { await page.click('#focus-target'); await page.keys(['Tab', 'Tab', 'ArrowRight']); @@ -168,7 +168,7 @@ describe('Series', () => { test( 'stacked bar chart can be highlighted with keyboard', - setupTest('#/light/bar-chart/test', async page => { + setupTest('#/bar-chart/test', async page => { // Scroll down to the other charts await page.windowScrollTo({ top: 650 }); @@ -195,7 +195,7 @@ describe('Series', () => { test( 'horizontal bar chart can be highlighted with keyboard', - setupTest('#/light/bar-chart/test', async page => { + setupTest('#/bar-chart/test', async page => { // Scroll down to the other charts await page.windowScrollTo({ top: 650 }); @@ -219,7 +219,7 @@ describe('Series', () => { test( 'mixed bar/line chart can be highlighted with keyboard', - setupTest('#/light/mixed-line-bar-chart/test', async page => { + setupTest('#/mixed-line-bar-chart/test', async page => { await page.click('#focus-target'); await page.keys(['Tab', 'Tab', 'ArrowRight']); @@ -255,7 +255,7 @@ describe('Series', () => { test( 'clicking outside of the chart removes all highlights for pinned element', - setupTest('#/light/bar-chart/test', async page => { + setupTest('#/bar-chart/test', async page => { // Click on it to reveal the dismiss button await page.hoverElement(chartWrapper.findBarGroups().get(3).toSelector()); await page.click(chartWrapper.toSelector()); @@ -270,7 +270,7 @@ describe('Series', () => { describe('Details popover', () => { test( 'shows on hover in bar charts', - setupTest('#/light/bar-chart/test', async page => { + setupTest('#/bar-chart/test', async page => { // Hover over third group in the first chart await page.hoverElement(chartWrapper.findBarGroups().get(3).toSelector()); await expect(page.getText(popoverHeaderSelector())).resolves.toContain('Chocolate'); @@ -304,7 +304,7 @@ describe('Details popover', () => { test( 'shows on hover in a mixed line/bar chart inside modal', - setupTest('#/light/mixed-line-bar-chart/in-modal', async page => { + setupTest('#/mixed-line-bar-chart/in-modal', async page => { // Hover over first group await page.hoverElement(chartWrapper.findBarGroups().get(1).toSelector()); await expect(page.getText(popoverHeaderSelector())).resolves.toContain('Potatoes'); @@ -313,7 +313,7 @@ describe('Details popover', () => { test( 'shows on hover in a mixed line/bar chart', - setupTest('#/light/mixed-line-bar-chart/test', async page => { + setupTest('#/mixed-line-bar-chart/test', async page => { // Hover over first group await page.hoverElement(chartWrapper.findBarGroups().get(1).toSelector()); await expect(page.getText(popoverHeaderSelector())).resolves.toContain('Potatoes'); @@ -335,7 +335,7 @@ describe('Details popover', () => { test( 'can be pinned and unpinned in a bar chart with mouse', - setupTest('#/light/bar-chart/test', async page => { + setupTest('#/bar-chart/test', async page => { // Hover over third group in the first chart await page.hoverElement(chartWrapper.findBarGroups().get(3).toSelector()); await expect(page.getText(popoverHeaderSelector())).resolves.toContain('Chocolate'); @@ -359,7 +359,7 @@ describe('Details popover', () => { test( 'can be pinned and unpinned in a chart with mouse when rendered inside tabs', - setupTest('#/light/mixed-line-bar-chart/in-tabs', async page => { + setupTest('#/mixed-line-bar-chart/in-tabs', async page => { // Hover over third group in the first chart await page.hoverElement(chartWrapper.findBarGroups().get(3).toSelector()); await expect(page.getText(popoverHeaderSelector())).resolves.toContain('Chocolate'); @@ -386,7 +386,7 @@ describe('Details popover', () => { test( 'can be hidden after hover by pressing Escape', - setupTest('#/light/mixed-line-bar-chart/test', async page => { + setupTest('#/mixed-line-bar-chart/test', async page => { // Hover over first group await page.hoverElement(chartWrapper.findBarGroups().get(1).toSelector()); await expect(page.getText(popoverHeaderSelector())).resolves.toContain('Potatoes'); @@ -400,7 +400,7 @@ describe('Details popover', () => { test( 'can be hidden after keyboard navigation by pressing Escape', - setupTest('#/light/bar-chart/test', async page => { + setupTest('#/bar-chart/test', async page => { // Navigate first group in the first chart await page.click('#focus-target'); await page.keys(['Tab', 'Tab', 'ArrowRight']); @@ -415,7 +415,7 @@ describe('Details popover', () => { test( 'can be hidden by moving focus away', - setupTest('#/light/mixed-line-bar-chart/test', async page => { + setupTest('#/mixed-line-bar-chart/test', async page => { await page.click('#focus-target'); await page.keys(['Tab', 'Tab', 'ArrowRight']); await expect(page.getText(popoverHeaderSelector())).resolves.toContain('Potatoes'); @@ -429,7 +429,7 @@ describe('Details popover', () => { test( 'tabbing from the popover back to the chart keeps the highlights', - setupTest('#/light/bar-chart/test', async page => { + setupTest('#/bar-chart/test', async page => { await page.click('#focus-target'); await page.keys(['Tab', 'Tab', 'ArrowRight']); @@ -455,7 +455,7 @@ describe('Details popover', () => { test( 'can be pinned by clicking on chart background and dismissed by clicking outside chart area in line chart', - setupTest('#/light/line-chart/test', async page => { + setupTest('#/line-chart/test', async page => { // Hovers to open popover await page.hoverElement(chartWrapper.findChart().toSelector()); // Clicks background to pin @@ -473,7 +473,7 @@ describe('Details popover', () => { test( 'can be pinned and unpinned in a bar chart with keyboard', - setupTest('#/light/bar-chart/test', async page => { + setupTest('#/bar-chart/test', async page => { // Hover over first group in the first chart await page.click('#focus-target'); await page.keys(['Tab', 'Tab', 'ArrowRight']); @@ -499,7 +499,7 @@ describe('Details popover', () => { (process.env.REACT_VERSION !== '18' ? test : test.skip)( 'scrolls if necessary on click', - setupTest('#/light/bar-chart/drilldown', async page => { + setupTest('#/bar-chart/drilldown', async page => { await page.setWindowSize({ width: 360, height: 650 }); await page.windowScrollTo({ top: 150 }); const barChart = createWrapper().findBarChart(); @@ -514,7 +514,7 @@ describe('Details popover', () => { (process.env.REACT_VERSION !== '18' ? test : test.skip)( 'does not scroll on hover', - setupTest('#/light/bar-chart/drilldown', async page => { + setupTest('#/bar-chart/drilldown', async page => { await page.setWindowSize({ width: 360, height: 650 }); await page.windowScrollTo({ top: 150 }); const barChart = createWrapper().findBarChart(); @@ -534,7 +534,7 @@ describe('Details popover', () => { (process.env.REACT_VERSION !== '18' ? test : test.skip)( 'scrolls if necessary on click inside a scrollable container', - setupTest('#/light/bar-chart/in-modal', async page => { + setupTest('#/bar-chart/in-modal', async page => { await page.setWindowSize({ width: 360, height: 650 }); const wrapper = createWrapper(); await page.click(wrapper.findButton().toSelector()); @@ -571,7 +571,7 @@ describe('Details popover', () => { test( 'Allow mouse to enter popover when a group is hovering over a point', - setupTest('#/light/mixed-line-bar-chart/test', async page => { + setupTest('#/mixed-line-bar-chart/test', async page => { // Hover over first group await page.hoverElement(chartWrapper.findBarGroups().get(1).toSelector()); await expect(page.getText(popoverHeaderSelector())).resolves.toContain('Potatoes'); @@ -583,7 +583,7 @@ describe('Details popover', () => { test( 'Should still open popver when focus move out then move in again with keyboard', - setupTest('#/light/bar-chart/test', async page => { + setupTest('#/bar-chart/test', async page => { await page.click('#focus-target'); // Should open popver when focus on a bar with keyboard await page.keys(['Tab', 'Tab', 'ArrowRight']); @@ -601,7 +601,7 @@ describe('Details popover', () => { describe('Chart container', () => { test( 'Series with computed domain do not overflow', - setupTest('#/light/mixed-line-bar-chart/test', async page => { + setupTest('#/mixed-line-bar-chart/test', async page => { const seriesSVGBox = await page.getBoundingBox(seriesSVGSelector(computedDomainChartWrapper)); const numberOfSeries = await page.getElementsCount(computedDomainChartWrapper.findSeries().toSelector()); diff --git a/src/mixed-line-bar-chart/__integ__/popover-position-page.ts b/src/mixed-line-bar-chart/__integ__/popover-position-page.ts index 79233eaa51..9d8cb9a7d6 100644 --- a/src/mixed-line-bar-chart/__integ__/popover-position-page.ts +++ b/src/mixed-line-bar-chart/__integ__/popover-position-page.ts @@ -34,7 +34,7 @@ class PopoverPositionPage extends BasePageObject { export function setupPopoverPositionTest(testFn: (page: PopoverPositionPage) => Promise) { return useBrowser(async browser => { const page = new PopoverPositionPage(browser); - await browser.url('#/light/mixed-line-bar-chart/popover-position'); + await browser.url('#/mixed-line-bar-chart/popover-position'); await testFn(page); }); } diff --git a/src/modal/__integ__/modal.test.ts b/src/modal/__integ__/modal.test.ts index 922f9a9a03..3e74d27c9e 100644 --- a/src/modal/__integ__/modal.test.ts +++ b/src/modal/__integ__/modal.test.ts @@ -10,7 +10,7 @@ test( 'Should focus input after opening the modal', useBrowser(async browser => { const page = new BasePageObject(browser); - await browser.url('#/light/modal/with-input-focus'); + await browser.url('#/modal/with-input-focus'); await page.click('#open-modal'); const inputSelector = createWrapper().findInput('#input').findNativeInput().toSelector(); @@ -21,7 +21,7 @@ test( test.each(['destructible', 'controlled'])(`should reset focus to previously active element (%s)`, name => useBrowser(async browser => { const page = new BasePageObject(browser); - await browser.url('#/light/modal/focus-restoration'); + await browser.url('#/modal/focus-restoration'); await page.click(`#${name}`); await page.keys('Enter'); await expect(page.isFocused(`#${name}`)).resolves.toBe(true); @@ -32,7 +32,7 @@ test( 'should not move focus to the modal close button when content focus gets lost', useBrowser(async browser => { const page = new BasePageObject(browser); - await browser.url('#/light/modal/focus-restoration'); + await browser.url('#/modal/focus-restoration'); // Open modal await page.click('#destructible'); @@ -59,7 +59,7 @@ test( 'should not let the sticky footer cover focused elements', useBrowser(async browser => { const page = new BasePageObject(browser); - await browser.url('#/light/modal/scroll-padding'); + await browser.url('#/modal/scroll-padding'); // Open modal await page.click('[data-testid="modal-trigger"]'); @@ -86,7 +86,7 @@ test( 'should not let content with z-index overlap footer', useBrowser(async browser => { const page = new BasePageObject(browser); - await browser.url('#/light/modal/vertical-scroll'); + await browser.url('#/modal/vertical-scroll'); // Open modal await page.click('[data-testid="modal-trigger"]'); @@ -104,7 +104,7 @@ test( const page = new BasePageObject(browser); const modal = createWrapper().findModal(); - await browser.url('#/light/modal/async-modal-root'); + await browser.url('#/modal/async-modal-root'); // Open modal await page.click('[data-testid="modal-trigger"]'); @@ -122,7 +122,7 @@ test( 'should emit modal performance metrics when all components are loaded', useBrowser(async browser => { const page = new BasePageObject(browser); - await browser.url('#/light/modal/with-component-load'); + await browser.url('#/modal/with-component-load'); const getModalPerformanceMetrics = () => browser.execute(() => ((window as any).modalPerformanceMetrics ?? []) as ModalPerformanceDataProps[]); await page.click('[data-testid="modal-trigger"]'); @@ -149,7 +149,7 @@ test( 'should emit modal performance metrics with timeToContentReadyInModal 0 when components are already loaded', useBrowser(async browser => { const page = new BasePageObject(browser); - await browser.url('#/light/modal/with-component-load'); + await browser.url('#/modal/with-component-load'); const getModalPerformanceMetrics = () => browser.execute(() => ((window as any).modalPerformanceMetrics ?? []) as ModalPerformanceDataProps[]); @@ -177,7 +177,7 @@ test( 'should not emit modal performance metrics more than once', useBrowser(async browser => { const page = new BasePageObject(browser); - await browser.url('#/light/modal/with-component-load'); + await browser.url('#/modal/with-component-load'); const getModalPerformanceMetrics = () => browser.execute(() => ((window as any).modalPerformanceMetrics ?? []) as ModalPerformanceDataProps[]); await page.click('[data-testid="modal-trigger"]'); diff --git a/src/multiselect/__integ__/multiselect-embedded.test.ts b/src/multiselect/__integ__/multiselect-embedded.test.ts index f5816a8c6a..5b1be4d2b8 100644 --- a/src/multiselect/__integ__/multiselect-embedded.test.ts +++ b/src/multiselect/__integ__/multiselect-embedded.test.ts @@ -11,7 +11,7 @@ function setup(testFn: (page: BasePageObject) => Promise) { return useBrowser(async browser => { const page = new BasePageObject(browser); await page.setWindowSize({ height: 1000, width: 1000 }); - await browser.url(`/#/light/multiselect/multiselect.async.example?embedded=true&randomErrors=false`); + await browser.url(`/#/multiselect/multiselect.async.example?embedded=true&randomErrors=false`); await page.waitForVisible('input[placeholder="Find security group"]'); await testFn(page); }); diff --git a/src/multiselect/__integ__/multiselect.test.ts b/src/multiselect/__integ__/multiselect.test.ts index af60db983e..61508965a1 100644 --- a/src/multiselect/__integ__/multiselect.test.ts +++ b/src/multiselect/__integ__/multiselect.test.ts @@ -8,7 +8,7 @@ import MultiselectPageObject from './page-objects/multiselect-page'; const createSetupTest = (wrapper: MultiselectWrapper) => (testFn: (page: MultiselectPageObject) => Promise) => { return useBrowser(async browser => { const page = new MultiselectPageObject(browser, wrapper); - await browser.url('/#/light/multiselect/multiselect.test'); + await browser.url('/#/multiselect/multiselect.test'); await page.setWindowSize({ width: 400, height: 1200 }); await page.waitForVisible(wrapper.findTrigger().toSelector()); await testFn(page); diff --git a/src/multiselect/__integ__/select-all.test.ts b/src/multiselect/__integ__/select-all.test.ts index 13d7421789..93d586a4e5 100644 --- a/src/multiselect/__integ__/select-all.test.ts +++ b/src/multiselect/__integ__/select-all.test.ts @@ -23,7 +23,7 @@ function setup( const page = new BasePageObject(browser); await page.setWindowSize({ width: 950, height: 300 }); const params = new URLSearchParams({ visualRefresh: String(visualRefresh) }).toString(); - await browser.url(`/#/light/multiselect/select-all?${params}`); + await browser.url(`/#/multiselect/select-all?${params}`); await page.click(multiselect.findTrigger().toSelector()); await testFn(page); }); diff --git a/src/pie-chart/__integ__/pie-chart.test.ts b/src/pie-chart/__integ__/pie-chart.test.ts index 8b9ca10e7c..5035948d93 100644 --- a/src/pie-chart/__integ__/pie-chart.test.ts +++ b/src/pie-chart/__integ__/pie-chart.test.ts @@ -39,7 +39,7 @@ class PieChartPageObject extends BasePageObject { const createSetupTest = (wrapper: PieChartWrapper) => (testFn: (page: PieChartPageObject) => Promise) => { return useBrowser(async browser => { const page = new PieChartPageObject(browser, wrapper); - await browser.url('#/light/pie-chart/test'); + await browser.url('#/pie-chart/test'); await testFn(page); }); }; diff --git a/src/pie-chart/__integ__/with-links.test.ts b/src/pie-chart/__integ__/with-links.test.ts index 7f3b4c5a4a..04bbdd0762 100644 --- a/src/pie-chart/__integ__/with-links.test.ts +++ b/src/pie-chart/__integ__/with-links.test.ts @@ -7,7 +7,7 @@ import useBrowser from '@cloudscape-design/browser-test-tools/use-browser'; function setupTest(linksIn: string, testFn: (page: BasePageObject) => Promise) { return useBrowser(async browser => { const page = new BasePageObject(browser); - await browser.url(`#/light/pie-chart/with-links-in-${linksIn}`); + await browser.url(`#/pie-chart/with-links-in-${linksIn}`); await testFn(page); }); } diff --git a/src/popover/__integ__/container.test.ts b/src/popover/__integ__/container.test.ts index 9a228d43cb..c5e4f0453f 100644 --- a/src/popover/__integ__/container.test.ts +++ b/src/popover/__integ__/container.test.ts @@ -6,7 +6,7 @@ import useBrowser from '@cloudscape-design/browser-test-tools/use-browser'; const setupTest = (testFn: (page: BasePageObject) => Promise) => { return useBrowser(async browser => { const page = new BasePageObject(browser); - await browser.url('#/light/popover/container-test'); + await browser.url('#/popover/container-test'); await testFn(page); }); }; diff --git a/src/popover/__integ__/in-modal-popover.test.ts b/src/popover/__integ__/in-modal-popover.test.ts index 9d84144d57..86ed83c5c3 100644 --- a/src/popover/__integ__/in-modal-popover.test.ts +++ b/src/popover/__integ__/in-modal-popover.test.ts @@ -15,7 +15,7 @@ import createWrapper from '../../../lib/components/test-utils/selectors'; const targetButton = createWrapper().findPopover().findContent({ renderWithPortal }).findButton().toSelector(); const page = new BasePageObject(browser); - await browser.url(`#/light/popover/in-modal-test?renderWithPortal=${renderWithPortal}`); + await browser.url(`#/popover/in-modal-test?renderWithPortal=${renderWithPortal}`); await page.click(modalTrigger); await page.click(popoverTrigger); await page.click(targetButton); diff --git a/src/popover/__integ__/in-split-panel.popover.test.ts b/src/popover/__integ__/in-split-panel.popover.test.ts index 6bf52ae0f0..cc5df9a3fb 100644 --- a/src/popover/__integ__/in-split-panel.popover.test.ts +++ b/src/popover/__integ__/in-split-panel.popover.test.ts @@ -15,7 +15,7 @@ const popoverContainerSelector = wrapper.findPopover().findByClassName(styles.co const setupTest = (testFn: (page: BasePageObject) => Promise) => useBrowser(async browser => { const page = new BasePageObject(browser); - await browser.url('#/light/app-layout/with-popover-in-split-panel'); + await browser.url('#/app-layout/with-popover-in-split-panel'); await testFn(page); }); diff --git a/src/popover/__integ__/internal-popover.test.ts b/src/popover/__integ__/internal-popover.test.ts index 2bfd377db0..dd3001f2a6 100644 --- a/src/popover/__integ__/internal-popover.test.ts +++ b/src/popover/__integ__/internal-popover.test.ts @@ -8,7 +8,7 @@ import createWrapper from '../../../lib/components/test-utils/selectors'; const setupTest = (testFn: (page: BasePageObject) => Promise) => { return useBrowser(async browser => { const page = new BasePageObject(browser); - await browser.url('#/light/popover/internal-test'); + await browser.url('#/popover/internal-test'); await testFn(page); }); }; diff --git a/src/popover/__integ__/popover-placement.test.ts b/src/popover/__integ__/popover-placement.test.ts index 4d07bc8ad3..377d7640ee 100644 --- a/src/popover/__integ__/popover-placement.test.ts +++ b/src/popover/__integ__/popover-placement.test.ts @@ -107,7 +107,7 @@ const setupTest = ( return useBrowser(async browser => { const page = new BasePageObject(browser); await page.setWindowSize({ width, height }); - await browser.url(`#/light/popover/placement-test?position=${position}&placement=${placement}`); + await browser.url(`#/popover/placement-test?position=${position}&placement=${placement}`); await page.windowScrollTo({ left: scrollLeft, top: scrollTop }); await testFn(page); }); @@ -163,7 +163,7 @@ test( `Large size popover should fallback to medium size in mobile`, useBrowser(async browser => { const page = new BasePageObject(browser); - await browser.url('#/light/popover/scenarios'); + await browser.url('#/popover/scenarios'); const wrapper = createWrapper(); const largePopover = wrapper.findPopover('#large-popover'); diff --git a/src/popover/__integ__/popover.test.ts b/src/popover/__integ__/popover.test.ts index c5e98e72a7..696a075f64 100644 --- a/src/popover/__integ__/popover.test.ts +++ b/src/popover/__integ__/popover.test.ts @@ -14,7 +14,7 @@ class PopoverFocusPage extends BasePageObject { const setupTest = (renderWithPortal: boolean, testFn: (page: PopoverFocusPage) => Promise) => { return useBrowser(async browser => { const page = new PopoverFocusPage(browser); - await browser.url('#/light/popover/focus-test'); + await browser.url('#/popover/focus-test'); if (renderWithPortal) { await page.enableRenderWithPortal(); } diff --git a/src/popover/__integ__/use-position-observer.test.ts b/src/popover/__integ__/use-position-observer.test.ts index ab1978f8d7..926547c5fa 100644 --- a/src/popover/__integ__/use-position-observer.test.ts +++ b/src/popover/__integ__/use-position-observer.test.ts @@ -40,7 +40,7 @@ class UsePositionObserverPageObject extends BasePageObject { const setupTest = (testFn: (page: UsePositionObserverPageObject) => Promise) => { return useBrowser(async browser => { const page = new UsePositionObserverPageObject(browser); - await browser.url('#/light/popover/use-position-observer'); + await browser.url('#/popover/use-position-observer'); await testFn(page); }); }; diff --git a/src/prompt-input/__integ__/prompt-input-form-submit.test.ts b/src/prompt-input/__integ__/prompt-input-form-submit.test.ts index 1efabdd1f7..bad2a90307 100644 --- a/src/prompt-input/__integ__/prompt-input-form-submit.test.ts +++ b/src/prompt-input/__integ__/prompt-input-form-submit.test.ts @@ -27,7 +27,7 @@ class PromptInputPage extends BasePageObject { const setupTest = (testFn: (page: PromptInputPage) => Promise) => { return useBrowser(async browser => { const page = new PromptInputPage(browser); - await browser.url(`#/light/prompt-input/prompt-input-integ`); + await browser.url(`#/prompt-input/prompt-input-integ`); await page.waitForVisible(promptInputWrapper.toSelector()); await testFn(page); }); diff --git a/src/prompt-input/__integ__/prompt-input.test.ts b/src/prompt-input/__integ__/prompt-input.test.ts index 0e35ce11f6..a8a178d9c2 100644 --- a/src/prompt-input/__integ__/prompt-input.test.ts +++ b/src/prompt-input/__integ__/prompt-input.test.ts @@ -29,7 +29,7 @@ const setupTest = ( isReadOnly: String(isReadOnly), hasInfiniteMaxRows: String(hasInfiniteMaxRows), }); - await browser.url(`#/light/prompt-input/simple/?${params}`); + await browser.url(`#/prompt-input/simple/?${params}`); await page.waitForVisible(getPromptInputWrapper().toSelector()); await testFn(page); }); diff --git a/src/property-filter/__a11y__/token-editor.test.ts b/src/property-filter/__a11y__/token-editor.test.ts index 4e41813b57..fd710357e9 100644 --- a/src/property-filter/__a11y__/token-editor.test.ts +++ b/src/property-filter/__a11y__/token-editor.test.ts @@ -11,7 +11,7 @@ const popoverWrapper = createWrapper(wrapper.findTokens().get(1).toSelector()).f function setupTest(testFn: (page: A11yPageObject) => Promise) { return useBrowser(async browser => { const page = new A11yPageObject(browser); - await browser.url('#/light/property-filter/async-loading.integ?token=property'); + await browser.url('#/property-filter/async-loading.integ?token=property'); await page.waitForVisible('main'); await testFn(page); }); diff --git a/src/property-filter/__integ__/async-loading.test.ts b/src/property-filter/__integ__/async-loading.test.ts index 669b2ade18..37537f250e 100644 --- a/src/property-filter/__integ__/async-loading.test.ts +++ b/src/property-filter/__integ__/async-loading.test.ts @@ -85,7 +85,7 @@ function setupTest( ) { return useBrowser(async browser => { const page = new AsyncPropertyFilterPage(browser); - await browser.url(`#/light/property-filter/async-loading.integ?asyncProperties=${asyncProperties}&token=${token}`); + await browser.url(`#/property-filter/async-loading.integ?asyncProperties=${asyncProperties}&token=${token}`); await page.waitForVisible('main'); await testFn(page); }); diff --git a/src/radio-group/__integ__/label-styling.test.ts b/src/radio-group/__integ__/label-styling.test.ts index a96626c384..31e4351fa9 100644 --- a/src/radio-group/__integ__/label-styling.test.ts +++ b/src/radio-group/__integ__/label-styling.test.ts @@ -12,7 +12,7 @@ class RadioPage extends BasePageObject {} const setupTest = (testFn: (page: RadioPage) => Promise) => { return useBrowser(async browser => { const page = new RadioPage(browser); - await browser.url('#/light/radio-group/labels-highlight'); + await browser.url('#/radio-group/labels-highlight'); await page.waitForVisible(radioGroupWrapper.findButtons().toSelector()); await testFn(page); }); diff --git a/src/radio-group/__integ__/radio-group.test.ts b/src/radio-group/__integ__/radio-group.test.ts index 37d37f7a37..15a8244854 100644 --- a/src/radio-group/__integ__/radio-group.test.ts +++ b/src/radio-group/__integ__/radio-group.test.ts @@ -22,7 +22,7 @@ class RadioPage extends BasePageObject { const setupTest = (testFn: (page: RadioPage) => Promise) => { return useBrowser(async browser => { const page = new RadioPage(browser); - await browser.url('#/light/radio-group/index'); + await browser.url('#/radio-group/index'); await page.waitForVisible(radioGroupWrapper.findButtons().toSelector()); await testFn(page); }); @@ -70,7 +70,7 @@ test( test( 'style api focus state', useBrowser(async browser => { - await browser.url('#/light/radio-group/style-custom/'); + await browser.url('#/radio-group/style-custom/'); const page = new RadioPage(browser); await page.click('[data-testid="1"]'); diff --git a/src/s3-resource-selector/__integ__/focus-interactions.test.ts b/src/s3-resource-selector/__integ__/focus-interactions.test.ts index edd66b4156..3a4f74344b 100644 --- a/src/s3-resource-selector/__integ__/focus-interactions.test.ts +++ b/src/s3-resource-selector/__integ__/focus-interactions.test.ts @@ -21,7 +21,7 @@ const getTableLinkSelector = (rowIndex: number) => wrapper.findTable().findBodyC const setupTest = (testFn: (page: BasePageObject) => Promise) => { return useBrowser(async browser => { const page = new BasePageObject(browser); - await browser.url(`#/light/s3-resource-selector/main`); + await browser.url(`#/s3-resource-selector/main`); await page.waitForVisible(uriInputSelector); // set focus for deterministic tab navigation await page.click('#focus-start'); diff --git a/src/segmented-control/__integ__/segmented-control-edge-case.test.ts b/src/segmented-control/__integ__/segmented-control-edge-case.test.ts index 5dee6873ed..7a1fabaf7f 100644 --- a/src/segmented-control/__integ__/segmented-control-edge-case.test.ts +++ b/src/segmented-control/__integ__/segmented-control-edge-case.test.ts @@ -23,7 +23,7 @@ class SegmentedControlPage extends BasePageObject { const setupTest = (testFn: (page: SegmentedControlPage) => Promise) => { return useBrowser(async browser => { const page = new SegmentedControlPage(browser); - await browser.url('#/light/segmented-control/edge-case'); + await browser.url('#/segmented-control/edge-case'); await page.waitForVisible(segmentedControlWrapper.toSelector()); await testFn(page); }); diff --git a/src/segmented-control/__integ__/segmented-control-two-segment.test.ts b/src/segmented-control/__integ__/segmented-control-two-segment.test.ts index 9516d72aa6..8eb211c724 100644 --- a/src/segmented-control/__integ__/segmented-control-two-segment.test.ts +++ b/src/segmented-control/__integ__/segmented-control-two-segment.test.ts @@ -11,7 +11,7 @@ test( 'allows to move focus using right arrow when segment to the right was last focused', useBrowser(async browser => { const page = new BasePageObject(browser); - await browser.url('#/light/segmented-control/two-segment?selectedId=seg-1'); + await browser.url('#/segmented-control/two-segment?selectedId=seg-1'); await page.waitForVisible(control.toSelector()); // Focus seg-2 @@ -32,7 +32,7 @@ test( 'allows to move focus using left arrow when segment to the left was last focused', useBrowser(async browser => { const page = new BasePageObject(browser); - await browser.url('#/light/segmented-control/two-segment?selectedId=seg-2'); + await browser.url('#/segmented-control/two-segment?selectedId=seg-2'); await page.waitForVisible(control.toSelector()); // Focus seg-1 diff --git a/src/segmented-control/__integ__/segmented-control.test.ts b/src/segmented-control/__integ__/segmented-control.test.ts index 7b84daf903..b64a8b882a 100644 --- a/src/segmented-control/__integ__/segmented-control.test.ts +++ b/src/segmented-control/__integ__/segmented-control.test.ts @@ -81,7 +81,7 @@ class SegmentedControlPage extends BasePageObject { const setupTest = (testFn: (page: SegmentedControlPage) => Promise) => { return useBrowser(async browser => { const page = new SegmentedControlPage(browser); - await browser.url('#/light/segmented-control/simple'); + await browser.url('#/segmented-control/simple'); await page.waitForVisible(segmentedControlWrapper.toSelector()); await testFn(page); }); diff --git a/src/select/__integ__/async-select.test.ts b/src/select/__integ__/async-select.test.ts index bcf0be2ac3..692ffdf39d 100644 --- a/src/select/__integ__/async-select.test.ts +++ b/src/select/__integ__/async-select.test.ts @@ -24,7 +24,7 @@ function setup( const page = new AsyncDropdownComponentPage(browser, select); await page.setWindowSize({ width: 950, height: 300 }); const params = new URLSearchParams({ visualRefresh: String(visualRefresh) }).toString(); - await browser.url(`/#/light/select/select.test.async?${params}`); + await browser.url(`/#/select/select.test.async?${params}`); await page.waitForVisible(select.findTrigger().toSelector()); if (virtualScrolling) { await page.enableVirtualScrolling(); diff --git a/src/select/__integ__/disabled-reason.test.ts b/src/select/__integ__/disabled-reason.test.ts index a8d1148557..1eeb954695 100644 --- a/src/select/__integ__/disabled-reason.test.ts +++ b/src/select/__integ__/disabled-reason.test.ts @@ -7,7 +7,7 @@ import SelectPageObject from './page-objects/select-page'; function setupTest(testFn: (page: SelectPageObject) => Promise) { return useBrowser(async browser => { - await browser.url('/#/light/select/disabled-reason'); + await browser.url('/#/select/disabled-reason'); const select = createWrapper().findSelect(); const page = new SelectPageObject(browser, select); await testFn(page); diff --git a/src/select/__integ__/events-select.test.ts b/src/select/__integ__/events-select.test.ts index 3d5ed84bb6..542d764b6c 100644 --- a/src/select/__integ__/events-select.test.ts +++ b/src/select/__integ__/events-select.test.ts @@ -13,7 +13,7 @@ function setupTest( return useBrowser(async browser => { const wrapper = createWrapper().findSelect(); const page = new EventsSelectPage(browser, wrapper); - await browser.url('/#/light/select/select.test.events'); + await browser.url('/#/select/select.test.events'); if (expandToViewport) { await page.expandToViewport(); } diff --git a/src/select/__integ__/select-native-search.test.ts b/src/select/__integ__/select-native-search.test.ts index 57d6deece3..c2cc50eb51 100644 --- a/src/select/__integ__/select-native-search.test.ts +++ b/src/select/__integ__/select-native-search.test.ts @@ -9,7 +9,7 @@ describe(`Select (Native Search)`, () => { const setupTest = (selectorType: string, testFn: (page: SelectPageObject) => Promise) => { return useBrowser(async browser => { const wrapper = createWrapper().findSelect(`#select_native_search_${selectorType}`); - await browser.url('/#/light/select/select.test'); + await browser.url('/#/select/select.test'); const page = new SelectPageObject(browser, wrapper); await page.waitForVisible(wrapper.findTrigger().toSelector()); await testFn(page); diff --git a/src/select/__integ__/select.test.ts b/src/select/__integ__/select.test.ts index bce2c12aba..4a42fc4b0b 100644 --- a/src/select/__integ__/select.test.ts +++ b/src/select/__integ__/select.test.ts @@ -9,7 +9,7 @@ import SelectPageObject from './page-objects/select-page'; test( 'allows filtering for options which have labels with spaces', useBrowser(async browser => { - await browser.url('/#/light/select/select.test'); + await browser.url('/#/select/select.test'); const page = new BasePageObject(browser); const select = createWrapper().findSelect('#simple_select'); const optionsSelector = select.findDropdown().findOptions().toSelector(); @@ -22,7 +22,7 @@ test( test( 'closes the dropdown only after the mouse button is released', useBrowser(async browser => { - await browser.url('/#/light/select/select.test'); + await browser.url('/#/select/select.test'); const select = createWrapper().findSelect('#simple_select'); const page = new SelectPageObject(browser, select); await page.clickSelect(); @@ -36,7 +36,7 @@ test( test( 'should support drag-to-select interaction', useBrowser(async browser => { - await browser.url('/#/light/select/select.test'); + await browser.url('/#/select/select.test'); const select = createWrapper().findSelect('#simple_select'); const page = new SelectPageObject(browser, select); await expect(page.getTriggerLabel()).resolves.toEqual('Choose option'); @@ -48,7 +48,7 @@ test( test( 'should allow selecting text in the filtering input', useBrowser(async browser => { - await browser.url('/#/light/select/select.test'); + await browser.url('/#/select/select.test'); const select = createWrapper().findSelect('#simple_select'); const page = new SelectPageObject(browser, select); await page.clickSelect(); @@ -62,7 +62,7 @@ test( test( 'allows space to select an option', useBrowser(async browser => { - await browser.url('/#/light/select/select.test'); + await browser.url('/#/select/select.test'); const select = createWrapper().findSelect('#simple_select'); const page = new SelectPageObject(browser, select); await page.clickSelect(); @@ -78,7 +78,7 @@ test( test( 'input aria-activedescendant is same as highlighted option id', useBrowser(async browser => { - await browser.url('/#/light/select/select.test'); + await browser.url('/#/select/select.test'); const wrapper = createWrapper().findSelect('#simple_select'); const page = new SelectPageObject(browser, wrapper); await page.focusSelect(); @@ -98,7 +98,7 @@ test( test( 'cuts the dropdown to fit the viewport [inside containers with overflow:hidden]', useBrowser(async browser => { - await browser.url('/#/light/select/select.test'); + await browser.url('/#/select/select.test'); const page = new BasePageObject(browser); const select = createWrapper().findSelect('#select_overflow'); const triggerSelector = select.findTrigger().toSelector(); @@ -117,7 +117,7 @@ test( useBrowser(async browser => { const page = new BasePageObject(browser); await page.setWindowSize({ height: 1000, width: 1100 }); - await browser.url('/#/light/select/select.test'); + await browser.url('/#/select/select.test'); const select = createWrapper().findSelect('#select_overflow'); const triggerSelector = select.findTrigger().toSelector(); const optionsSelector = select.findDropdown().findOpenDropdown().toSelector(); @@ -142,7 +142,7 @@ test( return window.outerHeight - window.innerHeight; }); await page.setWindowSize({ height: 500 + browserUIHeight, width: 1100 }); - await browser.url('/#/light/select/select.test'); + await browser.url('/#/select/select.test'); const select = createWrapper().findSelect('#select_overflow'); const triggerSelector = select.findTrigger().toSelector(); const optionsSelector = select.findDropdown().findOpenDropdown().toSelector(); @@ -159,7 +159,7 @@ test( test( 'allows the select to be opened and closed using space', useBrowser(async browser => { - await browser.url('/#/light/select/select.test'); + await browser.url('/#/select/select.test'); const page = new SelectPageObject(browser, createWrapper().findSelect('#select_native_search_simple')); await page.focusSelect(); await page.keys(['Space']); @@ -172,7 +172,7 @@ test( test( 'allows the select to be closed and reopened using space', useBrowser(async browser => { - await browser.url('/#/light/select/select.test'); + await browser.url('/#/select/select.test'); const page = new SelectPageObject(browser, createWrapper().findSelect('#select_native_search_simple')); await page.focusSelect(); await page.keys(['Space', 'ArrowDown', 'Space']); @@ -185,7 +185,7 @@ test( test( 'allows to focus the first item by pressing down arrow key', useBrowser(async browser => { - await browser.url('/#/light/select/select.test'); + await browser.url('/#/select/select.test'); const page = new SelectPageObject(browser, createWrapper().findSelect('#simple_select')); await page.focusSelect(); await page.keys(['Space']); @@ -198,7 +198,7 @@ test( test( 'allows to focus the last item by pressing up arrow key', useBrowser(async browser => { - await browser.url('/#/light/select/select.test'); + await browser.url('/#/select/select.test'); const page = new SelectPageObject(browser, createWrapper().findSelect('#simple_select')); await page.focusSelect(); await page.keys(['Space']); @@ -211,7 +211,7 @@ test( test( 'allows to focus the last item by pressing up arrow key on first item', useBrowser(async browser => { - await browser.url('/#/light/select/select.test'); + await browser.url('/#/select/select.test'); const page = new SelectPageObject(browser, createWrapper().findSelect('#simple_select')); await page.focusSelect(); await page.keys(['Space']); @@ -226,7 +226,7 @@ test( test( 'allows to focus the first item by pressing down arrow key on last item', useBrowser(async browser => { - await browser.url('/#/light/select/select.test'); + await browser.url('/#/select/select.test'); const page = new SelectPageObject(browser, createWrapper().findSelect('#simple_select')); await page.focusSelect(); await page.keys(['Space']); @@ -242,7 +242,7 @@ test( test( 'allows the select to be closed with space and reopened using mouse', useBrowser(async browser => { - await browser.url('/#/light/select/select.test'); + await browser.url('/#/select/select.test'); const page = new SelectPageObject(browser, createWrapper().findSelect('#select_native_search_simple')); await page.focusSelect(); await page.keys(['Space', 'ArrowDown', 'Space']); @@ -255,7 +255,7 @@ test( test( 'keeps simple select in focus after item was selected', useBrowser(async browser => { - await browser.url('/#/light/select/select.test'); + await browser.url('/#/select/select.test'); const page = new SelectPageObject(browser, createWrapper().findSelect('#simple_select')); await page.focusSelect(); await page.keys(['Space', 'ArrowDown', 'Enter']); @@ -266,7 +266,7 @@ test( test( 'keeps expanded select in focus after item was selected', useBrowser(async browser => { - await browser.url('/#/light/select/select.test'); + await browser.url('/#/select/select.test'); const page = new SelectPageObject(browser, createWrapper().findSelect('#expanded_select')); await page.focusSelect(); await page.keys(['Space', 'ArrowDown', 'Enter']); @@ -277,7 +277,7 @@ test( test( 'should not scroll when opening select upwards with scroll margin', useBrowser(async browser => { - await browser.url('/#/light/select/select.test.scroll-padding'); + await browser.url('/#/select/select.test.scroll-padding'); const page = new SelectPageObject(browser, createWrapper().findSelect()); await page.setWindowSize({ width: 800, height: 250 }); await page.waitForVisible(createWrapper().findSelect().findTrigger().toSelector()); diff --git a/src/select/__integ__/virtual-resize.test.ts b/src/select/__integ__/virtual-resize.test.ts index 85b7612634..189955c591 100644 --- a/src/select/__integ__/virtual-resize.test.ts +++ b/src/select/__integ__/virtual-resize.test.ts @@ -25,7 +25,7 @@ function setupTest(testFn: (page: ResizeSelectPage) => Promise) { return useBrowser(async browser => { const wrapper = createWrapper().findSelect(); const page = new ResizeSelectPage(browser, wrapper); - await browser.url('/#/light/select/virtual-resize'); + await browser.url('/#/select/virtual-resize'); await testFn(page); }); } diff --git a/src/side-navigation/__integ__/side-navigation.test.ts b/src/side-navigation/__integ__/side-navigation.test.ts index cf43378368..ad3d76f304 100644 --- a/src/side-navigation/__integ__/side-navigation.test.ts +++ b/src/side-navigation/__integ__/side-navigation.test.ts @@ -12,7 +12,7 @@ describe('SideNavigation', () => { it( 'stays expanded after opening with enter key', useBrowser(async browser => { - await browser.url('#/light/side-navigation/integration'); + await browser.url('#/side-navigation/integration'); const page = new BasePageObject(browser); const expandableLinkGroupWrapper = wrapper.findItemByIndex(2); diff --git a/src/slider/__integ__/slider.test.ts b/src/slider/__integ__/slider.test.ts index bf41f962c3..b7fe2788f3 100644 --- a/src/slider/__integ__/slider.test.ts +++ b/src/slider/__integ__/slider.test.ts @@ -17,7 +17,7 @@ class SliderPage extends BasePageObject { const setupTest = (testFn: (page: SliderPage) => Promise) => { return useBrowser(async browser => { const page = new SliderPage(browser); - await browser.url(`#/light/slider/basic`); + await browser.url(`#/slider/basic`); await page.waitForVisible(sliderWrapper.toSelector()); await testFn(page); }); diff --git a/src/split-panel/__integ__/header.test.ts b/src/split-panel/__integ__/header.test.ts index b5d14aaddb..be67654100 100644 --- a/src/split-panel/__integ__/header.test.ts +++ b/src/split-panel/__integ__/header.test.ts @@ -8,7 +8,7 @@ import { viewports } from '../../app-layout/__integ__/constants'; import { getUrlParams } from '../../app-layout/__integ__/utils'; const wrapper = createWrapper().findAppLayout(); -const url = '#/light/app-layout/split-panel-with-custom-header'; +const url = '#/app-layout/split-panel-with-custom-header'; describe.each(['refresh', 'refresh-toolbar'] as const)('%s', theme => { describe.each(['desktop', 'mobile'] as const)('%s', viewport => { diff --git a/src/split-panel/__motion__/split-panel.test.ts b/src/split-panel/__motion__/split-panel.test.ts index 9fcb621d23..62fe8ef2f4 100644 --- a/src/split-panel/__motion__/split-panel.test.ts +++ b/src/split-panel/__motion__/split-panel.test.ts @@ -27,7 +27,7 @@ const setupTest = ( visualRefresh: `${theme !== 'classic'}`, appLayoutToolbar: `${theme === 'refresh-toolbar'}`, }).toString(); - await browser.url(`#/light/app-layout/dashboard-content-type?${params}`); + await browser.url(`#/app-layout/dashboard-content-type?${params}`); await page.waitForVisible(appLayout.findContentRegion().toSelector()); await testFn(page); }); diff --git a/src/table/__integ__/component-metrics.test.ts b/src/table/__integ__/component-metrics.test.ts index e9d73b99f3..efa6f20306 100644 --- a/src/table/__integ__/component-metrics.test.ts +++ b/src/table/__integ__/component-metrics.test.ts @@ -111,7 +111,7 @@ const basePropertyFilterConfiguration = { const setupTest = ( testFn: (testFnProps: { page: TableWithAnalyticsPageObject; wrapper: TableWrapper }) => Promise, - url = '#/light/funnel-analytics/with-table' + url = '#/funnel-analytics/with-table' ) => { return useBrowser(async browser => { await browser.url(url); @@ -285,7 +285,7 @@ describe('async loading', () => { }, }, }); - }, '#/light/funnel-analytics/with-async-table') + }, '#/funnel-analytics/with-async-table') ); test( @@ -296,7 +296,7 @@ describe('async loading', () => { const componentsLog = await page.getComponentMetricsLog(); expect(componentsLog.length).toBe(2); expect(componentsLog[1].name).toBe('componentUpdated'); - }, '#/light/funnel-analytics/with-async-table') + }, '#/funnel-analytics/with-async-table') ); }); @@ -355,7 +355,7 @@ describe('filtering', () => { }, }, }); - }, '#/light/funnel-analytics/with-table-property-filter') + }, '#/funnel-analytics/with-table-property-filter') ); test( @@ -384,6 +384,6 @@ describe('filtering', () => { }, }, }); - }, '#/light/funnel-analytics/with-table-property-filter') + }, '#/funnel-analytics/with-table-property-filter') ); }); diff --git a/src/table/__integ__/dynamic-content.test.ts b/src/table/__integ__/dynamic-content.test.ts index 221cee9053..036ef373db 100644 --- a/src/table/__integ__/dynamic-content.test.ts +++ b/src/table/__integ__/dynamic-content.test.ts @@ -19,7 +19,7 @@ class TablePage extends BasePageObject { test( 'column width adjusts when the column content loads', useBrowser(async browser => { - await browser.url('#/light/table/dynamic-content'); + await browser.url('#/table/dynamic-content'); const page = new TablePage(browser); await page.waitForVisible(tableWrapper.findColumnHeaders().toSelector()); diff --git a/src/table/__integ__/empty-state.test.ts b/src/table/__integ__/empty-state.test.ts index a5a24bac8c..f9b59056ae 100644 --- a/src/table/__integ__/empty-state.test.ts +++ b/src/table/__integ__/empty-state.test.ts @@ -9,7 +9,7 @@ test( 'allows tabbing into empty state button when keyboard navigation is active', useBrowser(async browser => { const wrapper = createWrapper().findTable(); - await browser.url('#/light/table/empty-state/?enableKeyboardNavigation=true'); + await browser.url('#/table/empty-state/?enableKeyboardNavigation=true'); const page = new BasePageObject(browser); await page.waitForVisible(wrapper.findEmptySlot().findButton().toSelector()); diff --git a/src/table/__integ__/expandable-rows.test.ts b/src/table/__integ__/expandable-rows.test.ts index 78d82a2f10..b12ddebe60 100644 --- a/src/table/__integ__/expandable-rows.test.ts +++ b/src/table/__integ__/expandable-rows.test.ts @@ -26,7 +26,7 @@ describe('Expandable rows', () => { useServerMock: String(useServerMock), manualServerMock: String(useServerMock), }); - await browser.url(`#/light/table/expandable-rows-test?${query.toString()}`); + await browser.url(`#/table/expandable-rows-test?${query.toString()}`); await page.waitForVisible(tableWrapper.findColumnHeaders().get(1).toSelector()); await testFn(page); }); diff --git a/src/table/__integ__/inline-actions.test.ts b/src/table/__integ__/inline-actions.test.ts index c3cf8fe403..fbabc03087 100644 --- a/src/table/__integ__/inline-actions.test.ts +++ b/src/table/__integ__/inline-actions.test.ts @@ -29,7 +29,7 @@ const setupTest = ( enableKeyboardNavigation: String(enableKeyboardNavigation), stickyActions: String(stickyActions), }); - await browser.url(`#/light/table/inline-actions?${query.toString()}`); + await browser.url(`#/table/inline-actions?${query.toString()}`); await testFn(page); }); }; diff --git a/src/table/__integ__/inline-editing.test.ts b/src/table/__integ__/inline-editing.test.ts index 55528d5e69..c8bc49d644 100644 --- a/src/table/__integ__/inline-editing.test.ts +++ b/src/table/__integ__/inline-editing.test.ts @@ -59,7 +59,7 @@ const setupTest = ( expandableRows: String(expandableRows), renderInModal: String(renderInModal), }); - await browser.url(`#/light/table/editable?${query.toString()}`); + await browser.url(`#/table/editable?${query.toString()}`); await testFn(page); }); }; diff --git a/src/table/__integ__/keyboard-scroll.test.ts b/src/table/__integ__/keyboard-scroll.test.ts index b241fc5fdf..cef0957c45 100644 --- a/src/table/__integ__/keyboard-scroll.test.ts +++ b/src/table/__integ__/keyboard-scroll.test.ts @@ -12,7 +12,7 @@ test( useBrowser({ width: 375, height: 871 }, async browser => { const tableWrapper = createWrapper().findTable('[data-testid="items-table"]'); const wrapperSelector = tableWrapper.findAllByClassName(styles.wrapper).toSelector(); - await browser.url('#/light/table/keyboard-scroll'); + await browser.url('#/table/keyboard-scroll'); const page = new BasePageObject(browser); await page.click('h1'); await page.keys('Tab'); diff --git a/src/table/__integ__/performance-marks.test.ts b/src/table/__integ__/performance-marks.test.ts index 46a9e18e80..b7d4631548 100644 --- a/src/table/__integ__/performance-marks.test.ts +++ b/src/table/__integ__/performance-marks.test.ts @@ -17,7 +17,7 @@ function setupTest( return; } const page = new BasePageObject(browser); - await browser.url(`#/light/table/performance-marks${!inViewport ? '?outsideOfViewport=true' : ''}`); + await browser.url(`#/table/performance-marks${!inViewport ? '?outsideOfViewport=true' : ''}`); const getMarks = async () => { await new Promise(r => setTimeout(r, 200)); const marks = await browser.execute(() => performance.getEntriesByType('mark') as PerformanceMark[]); diff --git a/src/table/__integ__/preferences-integration.test.ts b/src/table/__integ__/preferences-integration.test.ts index bcf7741edb..9a98febdc3 100644 --- a/src/table/__integ__/preferences-integration.test.ts +++ b/src/table/__integ__/preferences-integration.test.ts @@ -13,7 +13,7 @@ const preferences = wrapper.findCollectionPreferences(); test( 'changes page size on confirm', useBrowser(async browser => { - await browser.url('#/light/table/hooks'); + await browser.url('#/table/hooks'); const page = new BasePageObject(browser); await page.waitForVisible(wrapper.findRows().toSelector()); await expect(page.getElementsCount(wrapper.findRows().toSelector())).resolves.toEqual(20); @@ -30,7 +30,7 @@ test( test( 'does not change page size on cancel', useBrowser(async browser => { - await browser.url('#/light/table/hooks'); + await browser.url('#/table/hooks'); const page = new BasePageObject(browser); await page.waitForVisible(wrapper.findRows().toSelector()); await expect(page.getElementsCount(wrapper.findRows().toSelector())).resolves.toEqual(20); @@ -47,7 +47,7 @@ test( test( 'changes column visibility using the visibleColumn property', useBrowser(async browser => { - await browser.url('#/light/table/visible-content'); + await browser.url('#/table/visible-content'); const page = new BasePageObject(browser); await page.waitForVisible(wrapper.findRows().toSelector()); await expect( @@ -68,7 +68,7 @@ test( test( 'changes column visibility using the columnDisplay property', useBrowser(async browser => { - await browser.url('#/light/table/hooks'); + await browser.url('#/table/hooks'); const page = new BasePageObject(browser); await page.waitForVisible(wrapper.findRows().toSelector()); await expect( @@ -91,7 +91,7 @@ test( test( 'changes column order', useBrowser(async browser => { - await browser.url('#/light/table/hooks'); + await browser.url('#/table/hooks'); const page = new BasePageObject(browser); await page.waitForVisible(wrapper.findRows().toSelector()); await expect( diff --git a/src/table/__integ__/resizable-columns-misc.test.ts b/src/table/__integ__/resizable-columns-misc.test.ts index 3da66b7017..0ecf487fcd 100644 --- a/src/table/__integ__/resizable-columns-misc.test.ts +++ b/src/table/__integ__/resizable-columns-misc.test.ts @@ -69,7 +69,7 @@ test( 'should keep table width in flex parent when resizing column to full page width', useBrowser({ width: 1680, height: 800 }, async browser => { const page = new ResizableColumnsPage(browser); - await browser.url('#/light/table/resizable-columns-flex'); + await browser.url('#/table/resizable-columns-flex'); await page.waitForVisible(wrapper.toSelector()); const previousWidth = await page.getTableWidth(); @@ -84,7 +84,7 @@ test( 'should not have oscillating size when the last column has the minimal width', useBrowser(async browser => { const page = new ResizableColumnsPage(browser); - await browser.url('#/light/table/resizable-columns-rounding'); + await browser.url('#/table/resizable-columns-rounding'); await page.waitForVisible(wrapper.toSelector()); await page.installObserver(wrapper.find('table').toSelector()); await page.click('#shrink-container'); @@ -104,7 +104,7 @@ test.skip( 'should not oscillate when resizing table rendered in flex container', useBrowser({ width: 800, height: 800 }, async browser => { const page = new ResizableColumnsPage(browser); - await browser.url('#/light/table/resizable-coloumns-flex-grow/?visualRefresh=true'); + await browser.url('#/table/resizable-coloumns-flex-grow/?visualRefresh=true'); await page.waitForVisible(wrapper.toSelector()); const resizerSelector = wrapper.findColumnResizer(2).toSelector(); diff --git a/src/table/__integ__/resizable-columns.test.ts b/src/table/__integ__/resizable-columns.test.ts index a20bcd45d9..f58911dade 100644 --- a/src/table/__integ__/resizable-columns.test.ts +++ b/src/table/__integ__/resizable-columns.test.ts @@ -138,7 +138,7 @@ const setupTest = (testFn: (page: TablePage) => Promise, config?: PageConf enableKeyboardNavigation: config?.enableKeyboardNavigation !== undefined ? String(config.enableKeyboardNavigation) : 'false', }).toString(); - await browser.url(`#/light/table/resizable-columns?${params}`); + await browser.url(`#/table/resizable-columns?${params}`); await page.waitForVisible(tableWrapper.findBodyCell(2, 1).toSelector()); await testFn(page); }); @@ -210,7 +210,7 @@ describe.each([true, false])('StickyHeader=%s', sticky => { 'should set explicit width for the last column when table width exceeds container width', useBrowser({ width: 620, height: 1000 }, async browser => { const page = new TablePage(browser); - await browser.url('#/light/table/resizable-columns?visualRefresh=true'); + await browser.url('#/table/resizable-columns?visualRefresh=true'); await page.waitForVisible(tableWrapper.findBodyCell(2, 1).toSelector()); await expect(page.getColumnStyle(4)).resolves.toContain('width: 120px;'); @@ -221,7 +221,7 @@ describe.each([true, false])('StickyHeader=%s', sticky => { 'should set explicit width for the last column when full-page table width exceeds container width', useBrowser({ width: 600, height: 1000 }, async browser => { const page = new TablePage(browser); - await browser.url('#/light/table/resizable-columns?visualRefresh=true&fullPage=true'); + await browser.url('#/table/resizable-columns?visualRefresh=true&fullPage=true'); await page.waitForVisible(tableWrapper.findBodyCell(2, 1).toSelector()); await expect(page.getColumnStyle(4)).resolves.toContain('width: 120px;'); diff --git a/src/table/__integ__/selection.test.ts b/src/table/__integ__/selection.test.ts index 2051004cd1..c953864a61 100644 --- a/src/table/__integ__/selection.test.ts +++ b/src/table/__integ__/selection.test.ts @@ -31,7 +31,7 @@ describe('Selection has no effect on table height', () => { const setupTest = (testFn: (page: TablePage) => Promise) => { return useBrowser(async browser => { const page = new TablePage(browser); - await browser.url('#/light/table/shift-selection'); + await browser.url('#/table/shift-selection'); await page.waitForVisible(tableWrapper.findBodyCell(2, 1).toSelector()); await testFn(page); }); diff --git a/src/table/__integ__/shift-selection.test.ts b/src/table/__integ__/shift-selection.test.ts index 5839a097d6..ba938c3a61 100644 --- a/src/table/__integ__/shift-selection.test.ts +++ b/src/table/__integ__/shift-selection.test.ts @@ -75,7 +75,7 @@ describe('Shift selection', () => { return useBrowser(async browser => { const page = new TablePage(browser); const query = new URLSearchParams({ enableKeyboardNavigation: String(enableKeyboardNavigation) }); - await browser.url(`#/light/table/shift-selection?${query.toString()}`); + await browser.url(`#/table/shift-selection?${query.toString()}`); await page.waitForVisible(tableWrapper.findBodyCell(2, 1).toSelector()); await testFn(page); }); diff --git a/src/table/__integ__/sticky-header.test.ts b/src/table/__integ__/sticky-header.test.ts index e407221fef..4235bc4784 100644 --- a/src/table/__integ__/sticky-header.test.ts +++ b/src/table/__integ__/sticky-header.test.ts @@ -52,7 +52,7 @@ const setupTest = (testFn: (page: StickyHeaderPage) => Promise) => { return useBrowser(async browser => { const page = new StickyHeaderPage(browser); await page.setWindowSize(desktopSize); - await browser.url('#/light/table/sticky-header-scrollable-container'); + await browser.url('#/table/sticky-header-scrollable-container'); await page.waitForVisible(tableWrapper.toSelector()); await testFn(page); }); @@ -86,7 +86,7 @@ describe('Sticky header', () => { `syncs column sizes from the hidden column headers when items change`, useBrowser(async browser => { const page = new StickyHeaderPage(browser); - await browser.url('#/light/table/hooks'); + await browser.url('#/table/hooks'); await page.click(tableWrapper.findPagination().findPageNumberByIndex(2).toSelector()); const originalSizes = await page.getElementSizes(originalHeadersSelector); const copySizes = await page.getElementSizes(stickyHeadersSelector); diff --git a/src/table/__integ__/sticky-scrollbar.test.ts b/src/table/__integ__/sticky-scrollbar.test.ts index 1105b5c997..67b59725a0 100644 --- a/src/table/__integ__/sticky-scrollbar.test.ts +++ b/src/table/__integ__/sticky-scrollbar.test.ts @@ -17,9 +17,7 @@ const setupTest = (testFn: (page: BasePageObject) => Promise, isVisualRefr return useBrowser(async browser => { const page = new BasePageObject(browser); await page.setWindowSize({ width: 600, height: 400 }); - await browser.url( - `#/light/table/sticky-scrollbar?${isVisualRefresh ? 'visualRefresh=true' : 'visualRefresh=false'}` - ); + await browser.url(`#/table/sticky-scrollbar?${isVisualRefresh ? 'visualRefresh=true' : 'visualRefresh=false'}`); await testFn(page); }); @@ -50,9 +48,7 @@ describe('Sticky scrollbar', () => { 'sticky scrollbar is at the bottom when rendered inside container with fit-height', useBrowser(async browser => { const page = new BasePageObject(browser); - await browser.url( - `#/light/table/sticky-scrollbar-in-container?visualRefresh=${visualRefresh}&fitHeight=true` - ); + await browser.url(`#/table/sticky-scrollbar-in-container?visualRefresh=${visualRefresh}&fitHeight=true`); const { bottom: containerBottom } = await page.getBoundingBox(containerWrapper.findContent().toSelector()); const { bottom: scrollbarBottom } = await page.getBoundingBox(scrollbarWrapper.toSelector()); expect(scrollbarBottom).toBe(containerBottom); diff --git a/src/table/__integ__/table-interaction-metrics.test.ts b/src/table/__integ__/table-interaction-metrics.test.ts index 2f542724f9..82c8e64d80 100644 --- a/src/table/__integ__/table-interaction-metrics.test.ts +++ b/src/table/__integ__/table-interaction-metrics.test.ts @@ -16,7 +16,7 @@ const setupTest = ( ) => { return useBrowser(async browser => { const wrapper = createWrapper().findTable(); - await browser.url('#/light/table/simulated-server-actions'); + await browser.url('#/table/simulated-server-actions'); const page = new BasePageObject(browser); await page.waitForVisible(wrapper.toSelector()); diff --git a/src/table/__integ__/table-sticky-columns.test.ts b/src/table/__integ__/table-sticky-columns.test.ts index 5d7452d4ea..369d00de1a 100644 --- a/src/table/__integ__/table-sticky-columns.test.ts +++ b/src/table/__integ__/table-sticky-columns.test.ts @@ -14,7 +14,7 @@ test( const tableWrapper = createWrapper().findTable('[data-test-id="small-table"]'); const wrapperSelector = tableWrapper.findAllByClassName(styles.wrapper).toSelector(); await browser.setWindowSize(600, 1000); - await browser.url('#/light/table/sticky-columns/?selectionType=multi&stickyColumnsFirst=1&stickyColumnsLast=1'); + await browser.url('#/table/sticky-columns/?selectionType=multi&stickyColumnsFirst=1&stickyColumnsLast=1'); const page = new BasePageObject(browser); await page.waitForVisible(tableWrapper.findRows().toSelector()); diff --git a/src/table/__integ__/table.test.ts b/src/table/__integ__/table.test.ts index 26389a4612..bece01da98 100644 --- a/src/table/__integ__/table.test.ts +++ b/src/table/__integ__/table.test.ts @@ -13,7 +13,7 @@ test( useBrowser(async browser => { const wrapper = createWrapper().findTable(); const inputSelector = wrapper.findTextFilter().findInput().toSelector(); - await browser.url('#/light/table/hooks'); + await browser.url('#/table/hooks'); const page = new BasePageObject(browser); await page.waitForVisible(wrapper.findRows().toSelector()); await expect(page.getElementsCount(wrapper.findRows().toSelector())).resolves.toEqual(20); @@ -39,7 +39,7 @@ test( return parseInt(height) + parseInt(marginBottom); }; const header = createWrapper().findContainer().findHeader().toSelector(); - await browser.url('#/light/table/full-page-variant?visualRefresh=true'); + await browser.url('#/table/full-page-variant?visualRefresh=true'); const page = new BasePageObject(browser); const heightBefore = await browser.execute(extractHeight, header); await page.windowScrollTo({ top: 100 }); @@ -52,7 +52,7 @@ test( 'body scrolls synchronously with header in visual refresh', useBrowser({ width: 400, height: 800 }, async browser => { const tableWrapper = createWrapper().findTable(); - await browser.url('#/light/table/full-page-variant?visualRefresh=true'); + await browser.url('#/table/full-page-variant?visualRefresh=true'); const page = new BasePageObject(browser); await page.elementScrollTo(tableWrapper.findByClassName(styles['header-secondary']).toSelector(), { left: 50 }); await page.waitForJsTimers(); @@ -66,7 +66,7 @@ test( useBrowser(async browser => { const tableWrapper = createWrapper().findTable(); const tableHeading = 'Full-page table'; - await browser.url('#/light/table/full-page-variant?visualRefresh=true'); + await browser.url('#/table/full-page-variant?visualRefresh=true'); const page = new BasePageObject(browser); // Find the scrollable wrapper element diff --git a/src/table/__integ__/tall-rows.test.ts b/src/table/__integ__/tall-rows.test.ts index fd5d32aa5d..870b5e7f56 100644 --- a/src/table/__integ__/tall-rows.test.ts +++ b/src/table/__integ__/tall-rows.test.ts @@ -12,7 +12,7 @@ const setupTest = (testFn: (page: BasePageObject) => Promise) => { return useBrowser(async browser => { const page = new BasePageObject(browser); await page.setWindowSize({ width: 900, height: 800 }); - await browser.url('#/light/table/tall-rows'); + await browser.url('#/table/tall-rows'); await page.waitForVisible(tableWrapper.findRows().toSelector()); await testFn(page); }); diff --git a/src/table/__integ__/with-frame.test.ts b/src/table/__integ__/with-frame.test.ts index c166cc3c9f..b7ed168e46 100644 --- a/src/table/__integ__/with-frame.test.ts +++ b/src/table/__integ__/with-frame.test.ts @@ -25,7 +25,7 @@ class TablePage extends BasePageObject { const setupTest = (testFn: (page: TablePage) => Promise) => { return useBrowser({ width: 1600, height: 800 }, async browser => { const page = new TablePage(browser); - await browser.url('#/light/table/with-iframe'); + await browser.url('#/table/with-iframe'); await page.runInsideIframe('#inner-iframe', true, async () => { await page.waitForVisible(tableWrapper.findBodyCell(2, 1).toSelector()); }); diff --git a/src/table/selection/__integ__/selection.test.ts b/src/table/selection/__integ__/selection.test.ts index ad10da46f3..3bc2b4a420 100644 --- a/src/table/selection/__integ__/selection.test.ts +++ b/src/table/selection/__integ__/selection.test.ts @@ -13,7 +13,7 @@ class SelectionTestPage extends BasePageObject { const setupTest = (selectionType: 'single' | 'multi', testFn: (page: SelectionTestPage) => Promise) => { return useBrowser(async browser => { const page = new SelectionTestPage(browser); - await browser.url(`#/light/table-fragments/selection-custom?selectionType=${selectionType}`); + await browser.url(`#/table-fragments/selection-custom?selectionType=${selectionType}`); await page.waitForVisible('table'); await testFn(page); }); diff --git a/src/table/table-role/__integ__/grid-navigation.test.ts b/src/table/table-role/__integ__/grid-navigation.test.ts index d0d4c89b5e..ab55f19202 100644 --- a/src/table/table-role/__integ__/grid-navigation.test.ts +++ b/src/table/table-role/__integ__/grid-navigation.test.ts @@ -20,7 +20,7 @@ const setupTest = ( return useBrowser(async browser => { const page = new GridNavigationPageObject(browser); const query = new URLSearchParams({ actionsMode, visibleColumns: visibleColumns.join(',') }); - await browser.url(`#/light/table-fragments/grid-navigation-custom/?${query.toString()}`); + await browser.url(`#/table-fragments/grid-navigation-custom/?${query.toString()}`); await page.waitForVisible('table'); await testFn(page); }); diff --git a/src/tabs/__integ__/content-render-strategy.test.ts b/src/tabs/__integ__/content-render-strategy.test.ts index 44b00e4443..1081410fbb 100644 --- a/src/tabs/__integ__/content-render-strategy.test.ts +++ b/src/tabs/__integ__/content-render-strategy.test.ts @@ -10,7 +10,7 @@ const wrapper = createWrapper(); const setupTest = (testFn: (page: BasePageObject) => Promise) => { return useBrowser(async browser => { const page = new BasePageObject(browser); - await browser.url('#/light/tabs/content-render-strategy-integ'); + await browser.url('#/tabs/content-render-strategy-integ'); await page.waitForVisible(wrapper.findTabs().findTabContent().toSelector()); await testFn(page); }); diff --git a/src/tabs/__integ__/tabs-actions.test.ts b/src/tabs/__integ__/tabs-actions.test.ts index 8e61371fe8..ab00c7ca1d 100644 --- a/src/tabs/__integ__/tabs-actions.test.ts +++ b/src/tabs/__integ__/tabs-actions.test.ts @@ -10,7 +10,7 @@ const wrapper = createWrapper(); const setupTest = (testFn: (page: BasePageObject) => Promise) => { return useBrowser(async browser => { const page = new BasePageObject(browser); - await browser.url('#/light/tabs/actions'); + await browser.url('#/tabs/actions'); await page.waitForVisible(wrapper.findTabs().findTabContent().toSelector()); await testFn(page); }); diff --git a/src/tabs/__integ__/tabs-in-help-panel.test.ts b/src/tabs/__integ__/tabs-in-help-panel.test.ts index 30592b9b92..0972e057cb 100644 --- a/src/tabs/__integ__/tabs-in-help-panel.test.ts +++ b/src/tabs/__integ__/tabs-in-help-panel.test.ts @@ -11,7 +11,7 @@ const tabsWrapper = createWrapper().findTabs(); const setupTest = (visualRefresh = false, testFn: (page: BasePageObject) => Promise) => { return useBrowser(async browser => { const page = new BasePageObject(browser); - await browser.url(`#/light/tabs/in-app-layout-help-panel/?${visualRefresh ? 'visualRefresh=true' : ''}`); + await browser.url(`#/tabs/in-app-layout-help-panel/?${visualRefresh ? 'visualRefresh=true' : ''}`); await page.waitForVisible(appLayoutWrapper.findContentRegion().toSelector()); await testFn(page); }); diff --git a/src/tabs/__integ__/tabs.test.ts b/src/tabs/__integ__/tabs.test.ts index efde1e66e2..198e0b9a00 100644 --- a/src/tabs/__integ__/tabs.test.ts +++ b/src/tabs/__integ__/tabs.test.ts @@ -77,7 +77,7 @@ const setupTest = ( return useBrowser(async browser => { const page = new TabsPage(browser); await browser.url( - `#/light/tabs/${pagePath}${keyboardActivationMode ? `?keyboardActivationMode=${keyboardActivationMode}` : ''}` + `#/tabs/${pagePath}${keyboardActivationMode ? `?keyboardActivationMode=${keyboardActivationMode}` : ''}` ); await page.waitForVisible(wrapper.findTabContent().toSelector()); if (smallViewport) { diff --git a/src/tabs/__integ__/with-iframe.test.ts b/src/tabs/__integ__/with-iframe.test.ts index 027dce35da..a71e72b70c 100644 --- a/src/tabs/__integ__/with-iframe.test.ts +++ b/src/tabs/__integ__/with-iframe.test.ts @@ -11,7 +11,7 @@ const wrapper = createWrapper().findTabs(); const setupTest = (testFn: (page: BasePageObject) => Promise) => { return useBrowser({ width: 1600, height: 800 }, async browser => { const page = new BasePageObject(browser); - await browser.url('#/light/tabs/with-iframe'); + await browser.url('#/tabs/with-iframe'); await page.runInsideIframe('#iframe', true, async () => { await page.waitForVisible(wrapper.findTabContent().toSelector()); await testFn(page); diff --git a/src/tag-editor/__integ__/tag-editor.test.ts b/src/tag-editor/__integ__/tag-editor.test.ts index 702ffb4f6f..79bfc4902b 100644 --- a/src/tag-editor/__integ__/tag-editor.test.ts +++ b/src/tag-editor/__integ__/tag-editor.test.ts @@ -10,7 +10,7 @@ const tagEditorWrapper = createWrapper().findTagEditor(); const setupTest = (testFn: (page: TagEditorPage) => Promise) => { return useBrowser(async browser => { const page = new TagEditorPage(browser); - await browser.url('#/light/tag-editor/integ'); + await browser.url('#/tag-editor/integ'); await page.waitForVisible(tagEditorWrapper.findAddButton().toSelector()); await testFn(page); }); diff --git a/src/textarea/__integ__/textarea.test.ts b/src/textarea/__integ__/textarea.test.ts index c908ada978..280f72b1fe 100644 --- a/src/textarea/__integ__/textarea.test.ts +++ b/src/textarea/__integ__/textarea.test.ts @@ -8,7 +8,7 @@ describe('Textarea', () => { const setupTest = (testFn: (page: TextareaPage) => Promise) => { return useBrowser(async browser => { const page = new TextareaPage(browser); - page.visit('#/light/textarea/integration'); + page.visit('#/textarea/integration'); await testFn(page); }); }; diff --git a/src/theming/__integ__/index.test.ts b/src/theming/__integ__/index.test.ts index 070fbec257..932a55f6e3 100644 --- a/src/theming/__integ__/index.test.ts +++ b/src/theming/__integ__/index.test.ts @@ -43,7 +43,7 @@ class ThemingPage extends BasePageObject { const setupTest = (testFn: (page: ThemingPage) => Promise, vr?: boolean) => { return useBrowser(async browser => { const page = new ThemingPage(browser); - await browser.url(`#/light/theming/integration${!vr ? '?visualRefresh=false' : ''}`); + await browser.url(`#/theming/integration${!vr ? '?visualRefresh=false' : ''}`); await testFn(page); }); }; diff --git a/src/theming/__integ__/tokens.test.ts b/src/theming/__integ__/tokens.test.ts index c21c191534..866c6b56f4 100644 --- a/src/theming/__integ__/tokens.test.ts +++ b/src/theming/__integ__/tokens.test.ts @@ -47,7 +47,7 @@ type ThemeMethod = 'applyTheme' | 'generateThemeStylesheet'; const setupTest = (testFn: (page: ColorTokensMosaikPage) => Promise, vr: boolean, themeMethod: ThemeMethod) => { return useBrowser(async browser => { const page = new ColorTokensMosaikPage(browser); - await browser.url(`#/light/theming/tokens${!vr ? '?visualRefresh=false' : ''}`); + await browser.url(`#/theming/tokens${!vr ? '?visualRefresh=false' : ''}`); await page.switchTheme(); if (themeMethod === 'generateThemeStylesheet') { await page.switchThemeMethod(); diff --git a/src/tiles/__integ__/tiles.test.ts b/src/tiles/__integ__/tiles.test.ts index 73506c4ef5..6c30be2653 100644 --- a/src/tiles/__integ__/tiles.test.ts +++ b/src/tiles/__integ__/tiles.test.ts @@ -20,7 +20,7 @@ class TilesPage extends BasePageObject { const setupTest = (testFn: (page: TilesPage) => Promise) => { return useBrowser(async browser => { const page = new TilesPage(browser); - await browser.url('#/light/tiles/simple'); + await browser.url('#/tiles/simple'); await page.waitForVisible(wrapper.findItems().toSelector()); await testFn(page); }); diff --git a/src/time-input/__integ__/time-input.test.ts b/src/time-input/__integ__/time-input.test.ts index 8cd52b6c2c..06a1151ae4 100644 --- a/src/time-input/__integ__/time-input.test.ts +++ b/src/time-input/__integ__/time-input.test.ts @@ -66,7 +66,7 @@ class TimeInputPage extends BasePageObject { const setupTest = (testFn: (page: TimeInputPage) => Promise) => { return useBrowser(async browser => { const page = new TimeInputPage(browser); - await browser.url('#/light/time-input/simple'); + await browser.url('#/time-input/simple'); await page.waitForLoad(); await testFn(page); }); diff --git a/src/toggle/__integ__/label-styling.test.ts b/src/toggle/__integ__/label-styling.test.ts index b6c97beda1..2c426cbdb8 100644 --- a/src/toggle/__integ__/label-styling.test.ts +++ b/src/toggle/__integ__/label-styling.test.ts @@ -12,7 +12,7 @@ class TogglePage extends BasePageObject {} const setupTest = (testFn: (page: TogglePage) => Promise) => { return useBrowser(async browser => { const page = new TogglePage(browser); - await browser.url('#/light/toggle/labels-highlight'); + await browser.url('#/toggle/labels-highlight'); await testFn(page); }); }; diff --git a/src/toggle/__integ__/toggle.test.ts b/src/toggle/__integ__/toggle.test.ts index 1f25a6e367..33ae6cda3c 100644 --- a/src/toggle/__integ__/toggle.test.ts +++ b/src/toggle/__integ__/toggle.test.ts @@ -14,7 +14,7 @@ class TogglePage extends BasePageObject {} const setupTest = (testFn: (page: TogglePage) => Promise) => { return useBrowser(async browser => { const page = new TogglePage(browser); - await browser.url('#/light/toggle/simple'); + await browser.url('#/toggle/simple'); await testFn(page); }); }; @@ -32,7 +32,7 @@ test( test( 'style api focus state', useBrowser(async browser => { - await browser.url('#/light/toggle/style-custom/'); + await browser.url('#/toggle/style-custom/'); const page = new TogglePage(browser); await page.click('[data-testid="1"]'); diff --git a/src/token-group/__integ__/token-group.test.ts b/src/token-group/__integ__/token-group.test.ts index 43ebb44f7c..4e510385e0 100644 --- a/src/token-group/__integ__/token-group.test.ts +++ b/src/token-group/__integ__/token-group.test.ts @@ -30,7 +30,7 @@ class TokenGroupPage extends BasePageObject { const setupTest = (testFn: (page: TokenGroupPage) => Promise) => { return useBrowser(async browser => { const page = new TokenGroupPage(browser); - await browser.url('#/light/token-group/index'); + await browser.url('#/token-group/index'); await page.waitForVisible(tokenGroupWrapper.findToken(1).toSelector()); await testFn(page); }); diff --git a/src/token/__integ__/token.test.ts b/src/token/__integ__/token.test.ts index ac06929ede..ef9d4b4753 100644 --- a/src/token/__integ__/token.test.ts +++ b/src/token/__integ__/token.test.ts @@ -43,7 +43,7 @@ class TokenPage extends BasePageObject { function setupTest(testFn: (page: TokenPage) => Promise) { return useBrowser(async browser => { - await browser.url('#/light/token/simple'); + await browser.url('#/token/simple'); const page = new TokenPage(browser); await page.waitForVisible('h1'); await testFn(page); diff --git a/src/top-navigation/__integ__/top-navigation.test.ts b/src/top-navigation/__integ__/top-navigation.test.ts index c59aeb5087..81e4bcc57b 100644 --- a/src/top-navigation/__integ__/top-navigation.test.ts +++ b/src/top-navigation/__integ__/top-navigation.test.ts @@ -16,7 +16,7 @@ class TopNavigationPage extends BasePageObject { const setupTest = (pageWidth: number, testFn: (page: TopNavigationPage) => Promise) => { return useBrowser(async browser => { - await browser.url('#/light/top-navigation/integ'); + await browser.url('#/top-navigation/integ'); const page = new TopNavigationPage(browser); await page.setWindowSize({ width: pageWidth, height: 600 }); await page.waitForVisible(wrapper.toSelector()); diff --git a/src/tree-view/__integ__/keyboard-navigation.test.ts b/src/tree-view/__integ__/keyboard-navigation.test.ts index ca70829b74..fa847286e7 100644 --- a/src/tree-view/__integ__/keyboard-navigation.test.ts +++ b/src/tree-view/__integ__/keyboard-navigation.test.ts @@ -8,7 +8,7 @@ import createWrapper from '../../../lib/components/test-utils/selectors'; test( 'Focus moves to the next tree-item toggle when tree-item gets removed', useBrowser(async browser => { - await browser.url('#/light/tree-view/removable-elements'); + await browser.url('#/tree-view/removable-elements'); const page = new BasePageObject(browser); const wrapper = createWrapper().findTreeView('[data-testid="removable-items-tree"]')!; @@ -30,7 +30,7 @@ test( test( 'Focus moves to the tree-item toggle when action button gets removed', useBrowser(async browser => { - await browser.url('#/light/tree-view/removable-elements'); + await browser.url('#/tree-view/removable-elements'); const page = new BasePageObject(browser); const wrapper = createWrapper().findTreeView('[data-testid="removable-action-buttons-tree"]')!; @@ -52,7 +52,7 @@ test( test( 'Focus moves to the tree-item same position action button when action button gets removed', useBrowser(async browser => { - await browser.url('#/light/tree-view/removable-elements'); + await browser.url('#/tree-view/removable-elements'); const page = new BasePageObject(browser); const wrapper = createWrapper().findTreeView('[data-testid="regular-removable-action-buttons-tree"]')!; @@ -75,7 +75,7 @@ test( test( 'Re-focuses on the previously focused tree-item when focus moves outside and back inside', useBrowser(async browser => { - await browser.url('#/light/tree-view/removable-elements'); + await browser.url('#/tree-view/removable-elements'); const page = new BasePageObject(browser); const wrapper = createWrapper(); const treeView = wrapper.findTreeView('[data-testid="removable-items-tree"]')!; @@ -94,7 +94,7 @@ test( test( 'Re-focuses on the tree-item that previously focused element belongs when focus moves outside and back inside', useBrowser(async browser => { - await browser.url('#/light/tree-view/removable-elements'); + await browser.url('#/tree-view/removable-elements'); const page = new BasePageObject(browser); const wrapper = createWrapper(); const treeView = wrapper.findTreeView('[data-testid="removable-items-tree"]')!; diff --git a/src/tree-view/__integ__/tree-view.test.ts b/src/tree-view/__integ__/tree-view.test.ts index b7637538ac..9faa786731 100644 --- a/src/tree-view/__integ__/tree-view.test.ts +++ b/src/tree-view/__integ__/tree-view.test.ts @@ -10,7 +10,7 @@ const wrapper = createWrapper().findTreeView(); test( 'Expands and collapses item', useBrowser(async browser => { - await browser.url('#/light/tree-view/basic'); + await browser.url('#/tree-view/basic'); const page = new BasePageObject(browser); const itemsSelector = wrapper.findItems().toSelector(); diff --git a/src/wizard/__integ__/wizard-form.test.ts b/src/wizard/__integ__/wizard-form.test.ts index 0161149391..b2095da89f 100644 --- a/src/wizard/__integ__/wizard-form.test.ts +++ b/src/wizard/__integ__/wizard-form.test.ts @@ -5,7 +5,7 @@ import useBrowser from '@cloudscape-design/browser-test-tools/use-browser'; function setupTest(testFn: (page: BasePageObject) => Promise) { return useBrowser(async browser => { - await browser.url('/#/light/wizard/wizard-form/'); + await browser.url('/#/wizard/wizard-form/'); const page = new BasePageObject(browser); await page.waitForVisible('#increase-counter'); await testFn(page); diff --git a/src/wizard/__integ__/wizard.test.ts b/src/wizard/__integ__/wizard.test.ts index ad8aaafabf..7627a9626d 100644 --- a/src/wizard/__integ__/wizard.test.ts +++ b/src/wizard/__integ__/wizard.test.ts @@ -24,7 +24,7 @@ class WizardPageObject extends BasePageObject { function setupTest(testFn: (page: WizardPageObject) => Promise) { return useBrowser(async browser => { - await browser.url('/#/light/wizard/simple?visualRefresh=false'); + await browser.url('/#/wizard/simple?visualRefresh=false'); const page = new WizardPageObject(browser); await page.waitForVisible(wizardWrapper.findPrimaryButton().toSelector()); await testFn(page);