Merge remote-tracking branch 'origin/main' into 1.31-releases

Author: Anemy

THIRD-PARTY-NOTICES.md

@@ -0,0 +1,14 @@
+import React from 'react';
+import LeafyGreenToggle from '@leafygreen-ui/toggle';
+
+import { Theme, useTheme } from '../hooks/use-theme';
+
+function Toggle(
+  props: React.ComponentProps<typeof LeafyGreenToggle>
+): ReturnType<typeof LeafyGreenToggle> {
+  const theme = useTheme();
+
+  return <LeafyGreenToggle darkMode={theme?.theme === Theme.Dark} {...props} />;
+}
+
+export { Toggle };

package-lock.json

@@ -0,0 +1,32 @@
+import React, { createContext, useContext } from 'react';
+
+export enum Theme {
+  Light = 'Light',
+  Dark = 'Dark',
+}
+
+type ThemeState = {
+  theme: Theme;
+};
+
+const ThemeContext = createContext<ThemeState>({
+  theme: Theme.Light,
+});
+
+const ThemeProvider = ({
+  children,
+  theme,
+}: {
+  children: React.ReactChildren;
+  theme: ThemeState;
+}): React.ReactElement => {
+  return (
+    <ThemeContext.Provider value={theme}>{children}</ThemeContext.Provider>
+  );
+};
+
+function useTheme(): ThemeState {
+  return useContext(ThemeContext);
+}
+
+export { useTheme, ThemeProvider };

packages/compass-components/src/components/toggle.tsx

@@ -61,7 +61,8 @@ export {
   default as Toast,
   Variant as ToastVariant,
 } from '@leafygreen-ui/toast';
-export { default as Toggle } from '@leafygreen-ui/toggle';
+export { Toggle } from './components/toggle';
+
 export { breakpoints, spacing } from '@leafygreen-ui/tokens';
 export { Tooltip } from './components/tooltip';
 export {
@@ -92,6 +93,7 @@ export {
   useHoverState,
   FocusState,
 } from './hooks/use-focus-hover';
+export { useTheme, Theme, ThemeProvider } from './hooks/use-theme';
 export {
   ContentWithFallback,
   FadeInPlaceholder,

packages/compass-components/src/hooks/use-theme.tsx

@@ -39,6 +39,12 @@ export async function setAceValue(
   // For whatever reason it is shift-insert and not cmd-v  ¯\_(ツ)_/¯
   // https://twitter.com/webdriverio/status/812034986341789696?lang=en
   // https://bugs.chromium.org/p/chromedriver/issues/detail?id=30
-  await browser.keys(['Shift', 'Insert']);
-  await browser.keys(['Shift']); // shift a second time to release it
+  // https://support.google.com/chrome/thread/15776362/is-shift-insert-to-paste-disabled-when-copying-from-outside-of-chrome?hl=en
+  if (process.platform === 'darwin') {
+    await browser.keys(['Shift', 'Insert']);
+    await browser.keys(['Shift']); // shift a second time to release it
+  } else {
+    await browser.keys(['Control', 'v']);
+    await browser.keys(['Control']); // control a second time to release it
+  }
 }

packages/compass-components/src/index.ts

@@ -308,7 +308,7 @@ async function startCompass(
 
   // https://webdriver.io/docs/options/#webdriverio
   const wdioOptions = {
-    waitforTimeout: 5000, // default is 3000ms
+    waitforTimeout: 10000, // default is 3000ms
     waitforInterval: 100, // default is 500ms
   };
 
@@ -554,12 +554,20 @@ export async function beforeTests(): Promise<Compass> {
   return compass;
 }
 
-export async function afterTests(compass?: Compass): Promise<void> {
+export async function afterTests(
+  compass?: Compass,
+  test?: Mocha.Hook | Mocha.Test
+): Promise<void> {
   if (!compass) {
-    console.log('compas is falsey in afterTests');
     return;
   }
 
+  if (test && test.state === undefined) {
+    // if there's no state, then it is probably because the before() hook failed
+    const filename = screenshotPathName(`${test.fullTitle()}-hook`);
+    await compass.capturePage(filename);
+  }
+
   try {
     await compass.stop();
   } catch (err) {
@@ -595,7 +603,7 @@ export async function afterTest(
   compass: Compass,
   test?: Mocha.Hook | Mocha.Test
 ): Promise<void> {
-  if (test && test.state == 'failed') {
+  if (test && test.state === 'failed') {
     await compass.capturePage(screenshotPathName(test.fullTitle()));
   }
 }

packages/compass-e2e-tests/helpers/commands/set-ace-value.ts

@@ -21,7 +21,7 @@ describe('Collection aggregations tab', function () {
   });
 
   after(async function () {
-    await afterTests(compass);
+    await afterTests(compass, this.currentTest);
   });
 
   afterEach(async function () {

packages/compass-e2e-tests/helpers/compass.ts

@@ -24,7 +24,7 @@ describe('Collection documents tab', function () {
   });
 
   after(async function () {
-    await afterTests(compass);
+    await afterTests(compass, this.currentTest);
     await telemetry.stop();
   });
 

packages/compass-e2e-tests/tests/collection-aggregations-tab.test.ts

@@ -20,7 +20,7 @@ describe('Collection explain plan tab', function () {
   });
 
   after(async function () {
-    await afterTests(compass);
+    await afterTests(compass, this.currentTest);
   });
 
   afterEach(async function () {