cleanup

Author: lerouxb

packages/compass-e2e-tests/tests/auto-update.test.ts

@@ -1,13 +1,10 @@
-import fs from 'fs';
-import path from 'path';
 import { expect } from 'chai';
 import {
   init,
   cleanup,
   Selectors,
   screenshotPathName,
 } from '../helpers/compass';
-import { LOG_PATH } from '../helpers/test-runner-paths';
 
 function wait(ms: number) {
   return new Promise((resolve) => {
@@ -51,30 +48,13 @@ describe('Auto-update', function () {
     } finally {
       await browser.screenshot(screenshotPathName('auto-update-from'));
       await cleanup(compass);
-
-      if (process.platform === 'darwin' && process.env.HOME) {
-        console.log('copying ShipIt dir if it exits');
-        const shipitDir = path.resolve(
-          process.env.HOME,
-          'Library',
-          'Caches',
-          'com.mongodb.compass.dev.ShipIt'
-        );
-
-        if (fs.existsSync(shipitDir)) {
-          console.log(`copying ${shipitDir}`);
-          fs.cpSync(shipitDir, `${LOG_PATH}/ShipIt`, { recursive: true });
-        } else {
-          console.log(`${shipitDir} does not exist`);
-        }
-      }
     }
 
     if (process.env.AUTO_UPDATE_UPDATABLE === 'true') {
       console.log(
         'pause to make sure the app properly exited before starting again'
       );
-      await wait(60_000);
+      await wait(10_000);
 
       console.log('starting compass a second time');
       // run the app again and check that the version changed

packages/compass-smoke-tests/src/cli.ts

@@ -197,7 +197,7 @@ async function run() {
       if (context.platform === 'darwin' && process.env.CI) {
         // Auto-update does not work on mac in CI at the moment. So in that case
         // we just run the E2E tests to make sure the app at least starts up.
-        runE2ETest({
+        runTimeToFirstQuery({
           appName,
           appPath,
         });
@@ -264,7 +264,7 @@ type RunE2ETestOptions = {
   appPath: string;
 };
 
-function runE2ETest({ appName, appPath }: RunE2ETestOptions) {
+function runTimeToFirstQuery({ appName, appPath }: RunE2ETestOptions) {
   execute(
     'npm',
     [

packages/compass-smoke-tests/src/installers/mac-dmg.ts

@@ -15,8 +15,6 @@ export function installMacDMG({
 
   execute('hdiutil', ['attach', filepath]);
 
-  execute('umask', []);
-
   try {
     fs.cpSync(path.resolve(volumePath, appFilename), appPath, {
       recursive: true,
@@ -35,18 +33,10 @@ export function installMacDMG({
       'Application Support',
       appName
     );
-    const shipitDir = path.resolve(
-      process.env.HOME,
-      'Library',
-      'Caches',
-      'com.mongodb.compass.dev.ShipIt'
-    );
 
-    for (const dir of [settingsDir, shipitDir]) {
-      if (fs.existsSync(dir)) {
-        console.log(`${dir} already exists. Removing.`);
-        fs.rmSync(dir, { recursive: true });
-      }
+    if (fs.existsSync(settingsDir)) {
+      console.log(`${settingsDir} already exists. Removing.`);
+      fs.rmSync(settingsDir, { recursive: true });
     }
   }
 

packages/compass-smoke-tests/src/installers/mac-zip.ts

@@ -12,8 +12,6 @@ export function installMacZIP({
   const appFilename = `${appName}.app`;
   const appPath = path.resolve(destinationPath, appFilename);
 
-  execute('umask', []);
-
   execute('ditto', ['-xk', filepath, destinationPath]);
 
   // TODO: Consider instrumenting the app to use a settings directory in the sandbox
@@ -25,18 +23,10 @@ export function installMacZIP({
       'Application Support',
       appName
     );
-    const shipitDir = path.resolve(
-      process.env.HOME,
-      'Library',
-      'Caches',
-      'com.mongodb.compass.dev.ShipIt'
-    );
 
-    for (const dir of [settingsDir, shipitDir]) {
-      if (fs.existsSync(dir)) {
-        console.log(`${dir} already exists. Removing.`);
-        fs.rmSync(dir, { recursive: true });
-      }
+    if (fs.existsSync(settingsDir)) {
+      console.log(`${settingsDir} already exists. Removing.`);
+      fs.rmSync(settingsDir, { recursive: true });
     }
   }