chore: Remove local override to enable scrollbars in integration tests (

#3183)

src/__integ__/scrollbars.ts

@@ -0,0 +1,4 @@
+// Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+// SPDX-License-Identifier: Apache-2.0
+
+export const scrollbarThickness = 15;

src/app-layout/__integ__/app-layout-drawers.test.ts

@@ -1,9 +1,10 @@
 // Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
 // SPDX-License-Identifier: Apache-2.0
 import { BasePageObject } from '@cloudscape-design/browser-test-tools/page-objects';
+import useBrowser from '@cloudscape-design/browser-test-tools/use-browser';
 
 import createWrapper from '../../../lib/components/test-utils/selectors';
-import useBrowser, { scrollbarThickness } from '../../__integ__/use-browser-with-scrollbars';
+import { scrollbarThickness } from '../../__integ__/scrollbars';
 import { viewports } from './constants';
 import { testIf } from './utils';
 

src/app-layout/__integ__/app-layout-refresh-content-width.test.ts

@@ -1,9 +1,10 @@
 // Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
 // SPDX-License-Identifier: Apache-2.0
 import { BasePageObject } from '@cloudscape-design/browser-test-tools/page-objects';
+import useBrowser from '@cloudscape-design/browser-test-tools/use-browser';
 
 import createWrapper from '../../../lib/components/test-utils/selectors';
-import useBrowser, { scrollbarThickness } from '../../__integ__/use-browser-with-scrollbars';
+import { scrollbarThickness } from '../../__integ__/scrollbars';
 import { viewports } from './constants';
 import { getUrlParams, Theme } from './utils';
 

src/app-layout/__integ__/app-layout-split-panel-forced-position.test.ts

@@ -1,7 +1,9 @@
 // Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
 // SPDX-License-Identifier: Apache-2.0
+import useBrowser from '@cloudscape-design/browser-test-tools/use-browser';
+
 import createWrapper from '../../../lib/components/test-utils/selectors';
-import useBrowser from '../../__integ__/use-browser-with-scrollbars';
+import { scrollbarThickness } from '../../__integ__/scrollbars';
 import { viewports } from './constants';
 import { AppLayoutSplitViewPage } from './utils';
 
@@ -42,8 +44,6 @@ describe('Split panel forced position', () => {
       'refresh-toolbar': 907,
     };
 
-    const scrollbarThickness = 15;
-
     const narrow = splitPanelBreakpoints[theme];
 
     // Account 2 times for scrollbarThickness:

src/app-layout/__integ__/app-layout-split-panel.test.ts

@@ -1,7 +1,9 @@
 // Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
 // SPDX-License-Identifier: Apache-2.0
+import useBrowser from '@cloudscape-design/browser-test-tools/use-browser';
+
 import createWrapper from '../../../lib/components/test-utils/selectors';
-import useBrowser, { scrollbarThickness } from '../../__integ__/use-browser-with-scrollbars';
+import { scrollbarThickness } from '../../__integ__/scrollbars';
 import { viewports } from './constants';
 import { AppLayoutSplitViewPage } from './utils';
 

src/app-layout/__integ__/mobile.test.ts

@@ -1,9 +1,9 @@
 // Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
 // SPDX-License-Identifier: Apache-2.0
 import { BasePageObject } from '@cloudscape-design/browser-test-tools/page-objects';
+import useBrowser from '@cloudscape-design/browser-test-tools/use-browser';
 
 import createWrapper from '../../../lib/components/test-utils/selectors';
-import useBrowser from '../../__integ__/use-browser-with-scrollbars';
 import { viewports } from './constants';
 import { testIf } from './utils';
 

src/app-layout/__integ__/navigation.test.ts

@@ -2,15 +2,15 @@
 // SPDX-License-Identifier: Apache-2.0
 
 import { BasePageObject } from '@cloudscape-design/browser-test-tools/page-objects';
+import useBrowser from '@cloudscape-design/browser-test-tools/use-browser';
 
 import createWrapper from '../../../lib/components/test-utils/selectors';
-import useBrowserWithScrollbars from '../../__integ__/use-browser-with-scrollbars';
 import { getUrlParams, Theme } from './utils';
 
 const wrapper = createWrapper().findAppLayout().findNavigation();
 
 function setupTest(testFn: (page: BasePageObject) => Promise<void>, theme: Theme) {
-  return useBrowserWithScrollbars(async browser => {
+  return useBrowser(async browser => {
     const page = new BasePageObject(browser);
     const params = getUrlParams(theme);
     await browser.url(`#/light/app-layout/navigation-with-scrollbar?${params}`);

src/app-layout/__integ__/runtime-drawers-with-updates.test.ts

@@ -1,9 +1,9 @@
 // Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
 // SPDX-License-Identifier: Apache-2.0
 import { BasePageObject } from '@cloudscape-design/browser-test-tools/page-objects';
+import useBrowser from '@cloudscape-design/browser-test-tools/use-browser';
 
 import createWrapper from '../../../lib/components/test-utils/selectors';
-import useBrowser from '../../__integ__/use-browser-with-scrollbars';
 import { getUrlParams, Theme } from './utils';
 
 const wrapper = createWrapper().findAppLayout();

src/app-layout/__integ__/runtime-drawers.test.ts

@@ -1,9 +1,9 @@
 // Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
 // SPDX-License-Identifier: Apache-2.0
 import { BasePageObject } from '@cloudscape-design/browser-test-tools/page-objects';
+import useBrowser from '@cloudscape-design/browser-test-tools/use-browser';
 
 import createWrapper, { AppLayoutWrapper } from '../../../lib/components/test-utils/selectors';
-import useBrowser from '../../__integ__/use-browser-with-scrollbars';
 import { viewports } from './constants';
 import { getUrlParams, Theme } from './utils';
 

src/cards/__integ__/responsive.test.ts

@@ -1,9 +1,9 @@
 // Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
 // SPDX-License-Identifier: Apache-2.0
 import { BasePageObject } from '@cloudscape-design/browser-test-tools/page-objects';
+import useBrowser from '@cloudscape-design/browser-test-tools/use-browser';
 
 import createWrapper, { CardsWrapper } from '../../../lib/components/test-utils/selectors';
-import useBrowser from '../../__integ__/use-browser-with-scrollbars';
 
 class CardsPage extends BasePageObject {
   wrapper = new CardsWrapper(createWrapper('body').find(`.${CardsWrapper.rootSelector}`).getElement());

src/date-picker/__integ__/fit-dropdown.test.ts

@@ -2,8 +2,9 @@
 // SPDX-License-Identifier: Apache-2.0
 import { strict as assert } from 'assert';
 
+import useBrowser from '@cloudscape-design/browser-test-tools/use-browser';
+
 import createWrapper from '../../../lib/components/test-utils/selectors';
-import useBrowser from '../../__integ__/use-browser-with-scrollbars';
 import DatePickerPage from './page-objects/date-picker-page';
 
 class DatePickerDropdownTestPage extends DatePickerPage {