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

Author: Anemy

.evergreen.yml

@@ -619,11 +619,6 @@ tasks:
 
   - name: e2e-coverage
     tags: ['run-on-pr']
-    commands:
-      - func: test-packaged-app
-        vars:
-          compass_distribution: compass
-          debug: 'compass-e2e-tests*,electron*,hadron*,mongo*'
     commands:
       - func: prepare
       - func: install

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

@@ -60,6 +60,19 @@ async function navigateToTab(browser: CompassBrowser, tabName: string) {
   await tabSelectedSelectorElement.waitForDisplayed();
 }
 
+async function waitForJSON(browser: CompassBrowser, element: Element<'async'>) {
+  // Sometimes the line numbers end up in the text for some reason. Probably
+  // because we get the text before the component is properly initialised.
+  await browser.waitUntil(async () => {
+    const text = await element.getText();
+    const isJSON = text.replace(/\s+/g, ' ').startsWith('{');
+    if (!isJSON) {
+      console.log({ text });
+    }
+    return isJSON;
+  });
+}
+
 describe('Collection documents tab', function () {
   let compass: Compass;
   let browser: CompassBrowser;
@@ -338,6 +351,9 @@ FindIterable<Document> result = collection.find(filter);`);
 
     const document = await browser.$(Selectors.DocumentJSONEntry);
     await document.waitForDisplayed();
+
+    await waitForJSON(browser, document);
+
     const json = await document.getText();
     expect(json.replace(/\s+/g, ' ')).to.match(
       /^\{ "_id": \{ "\$oid": "[a-f0-9]{24}" \}, "i": 32, "j": 0 \}$/
@@ -365,6 +381,9 @@ FindIterable<Document> result = collection.find(filter);`);
 
     const modifiedDocument = await browser.$(Selectors.DocumentJSONEntry);
     await modifiedDocument.waitForDisplayed();
+
+    await waitForJSON(browser, modifiedDocument);
+
     expect((await modifiedDocument.getText()).replace(/\s+/g, ' ')).to.match(
       /^\{ "_id": \{ "\$oid": "[a-f0-9]{24}" \}, "i": 32, "j": 1234 \}$/
     );

packages/compass-e2e-tests/tests/logging.test.ts

@@ -11,6 +11,7 @@ describe('Logging and Telemetry integration', function () {
 
     before(async function () {
       telemetry = await startTelemetryServer();
+      process.env.SHOW_TOUR = 'true'; // make this work the same in dev and when releasing
       const compass = await beforeTests({ firstRun: true });
       const { browser } = compass;
       try {
@@ -26,6 +27,7 @@ describe('Logging and Telemetry integration', function () {
       } finally {
         await afterTests(compass);
         await telemetry.stop();
+        delete process.env.SHOW_TOUR;
       }
 
       logs = compass.logs;

packages/compass-e2e-tests/tests/shell.test.ts

@@ -4,7 +4,7 @@ import type { Telemetry } from '../helpers/telemetry';
 import { beforeTests, afterTests, afterTest } from '../helpers/compass';
 import type { Compass } from '../helpers/compass';
 
-describe('Shell', function () {
+describe.skip('Shell', function () {
   let compass: Compass;
   let browser: CompassBrowser;
   let telemetry: Telemetry;

packages/connection-form/src/components/advanced-options-tabs/advanced-tab/url-options-table.tsx

@@ -29,10 +29,6 @@ const optionNameCellStyles = css({
   width: spacing[5] * 9,
 });
 
-const optionValueCellStyles = css({
-  // width: '30%',
-});
-
 const optionValueCellContentStyles = css({
   display: 'flex',
   flexDirection: 'row',
@@ -41,7 +37,7 @@ const optionValueCellContentStyles = css({
 });
 
 const valueInputStyles = css({
-  maxWidth: spacing[7],
+  width: spacing[7],
 });
 
 const deleteOptionButtonStyle = css({
@@ -193,7 +189,7 @@ function UrlOptionsTable({
                 ))}
               </Select>
             </Cell>
-            <Cell className={optionValueCellStyles}>
+            <Cell>
               <div className={optionValueCellContentStyles}>
                 <TextInput
                   onChange={(event: ChangeEvent<HTMLInputElement>) => {

packages/connection-form/src/components/advanced-options-tabs/advanced-tab/url-options.tsx

@@ -14,7 +14,7 @@ import UrlOptionsTable from './url-options-table';
 
 const urlOptionsContainerStyles = css({
   marginTop: spacing[3],
-  width: '70%',
+  width: spacing[6] * 7,
 });
 
 const urlOptionsTableDescriptionStyles = css({