remove logError in handlers and fix tests

MetaMask · Nov 14, 2022 · ccfc945 · ccfc945
1 parent 4cd4bef
commit ccfc945
Show file tree

Hide file tree

Showing 6 changed files with 20 additions and 15 deletions.
diff --git a/packages/snaps-cli/src/cmds/eval/evalHandler.test.ts b/packages/snaps-cli/src/cmds/eval/evalHandler.test.ts
@@ -30,7 +30,8 @@ describe('evalHandler', () => {
   it('logs and throws errors', async () => {
     evalBundleMock.mockRejectedValueOnce(new Error('foo'));
 
-    await expect(evalHandler(getMockArgv())).rejects.toThrow('foo');
-    expect(console.error).toHaveBeenCalledWith('Snap evaluation error: foo');
+    await expect(evalHandler(getMockArgv())).rejects.toThrow(
+      'Snap evaluation error: foo',
+    );
   });
 });
diff --git a/packages/snaps-cli/src/cmds/eval/evalHandler.ts b/packages/snaps-cli/src/cmds/eval/evalHandler.ts
@@ -1,6 +1,5 @@
 import { evalBundle } from '@metamask/snaps-utils';
 import { YargsArgs } from '../../types/yargs';
-import { logError } from '../../utils';
 
 /**
  * Runs the snap in a worker, to ensure SES compatibility.
@@ -16,7 +15,6 @@ export async function evalHandler(argv: YargsArgs): Promise<void> {
     await evalBundle(bundlePath as string);
     console.log(`Eval Success: evaluated '${bundlePath}' in SES!`);
   } catch (error) {
-    logError(`Snap evaluation error: ${error.message}`, error);
-    throw error;
+    throw new Error(`Snap evaluation error: ${error.message}`);
   }
 }
diff --git a/packages/snaps-cli/src/cmds/init/init.test.ts b/packages/snaps-cli/src/cmds/init/init.test.ts
@@ -25,6 +25,6 @@ describe('init module', () => {
       manifest: false,
       eval: true,
     });
-    expect(global.console.log).toHaveBeenCalledTimes(2);
+    expect(global.console.log).toHaveBeenCalledTimes(1);
   });
 });
diff --git a/packages/snaps-cli/src/cmds/init/initHandler.test.ts b/packages/snaps-cli/src/cmds/init/initHandler.test.ts
@@ -190,7 +190,7 @@ describe('initialize', () => {
         .mockImplementation(() => false);
 
       await expect(initHandler({ ...getMockArgv() })).rejects.toThrow(
-        'Outdated node version.',
+        'Init Error: You are using an outdated version of Node (v16.15.1). Please update to Node >=16.',
       );
 
       expect(satisfiesVersionRangeMock).toHaveBeenCalledTimes(1);
@@ -206,7 +206,7 @@ describe('initialize', () => {
         .mockImplementation(() => false);
 
       await expect(initHandler({ ...getMockArgv() })).rejects.toThrow(
-        'Git is not installed.',
+        'Init Error: git is not installed. Please install git to continue.',
       );
 
       expect(isGitInstalledMock).toHaveBeenCalledTimes(1);
@@ -226,7 +226,7 @@ describe('initialize', () => {
         });
 
       await expect(initHandler({ ...getMockArgv() })).rejects.toThrow(
-        'error message',
+        'Init Error: Failed to create template.',
       );
 
       expect(cloneTemplateMock).toHaveBeenCalledTimes(1);

diff --git a/packages/snaps-cli/src/cmds/init/initHandler.ts b/packages/snaps-cli/src/cmds/init/initHandler.ts
@@ -68,7 +68,7 @@ export async function initHandler(argv: YargsArgs) {
       recursive: true,
     });
   } catch (err) {
-    throw new Error('Init Error: Failed to create template, cleaning...');
+    throw new Error('Init Error: Failed to create template.');
   }
 
   console.log('Installing dependencies...');

diff --git a/packages/snaps-cli/src/cmds/init/initUtils.test.ts b/packages/snaps-cli/src/cmds/init/initUtils.test.ts
@@ -47,7 +47,7 @@ describe('initUtils', () => {
       });
 
       await expect(prepareWorkingDirectory('bar')).rejects.toThrow(
-        'error message',
+        'Init Error: Failed to prepare working directory with message: Init Error: Failed to create new directory.',
       );
     });
 
@@ -59,7 +59,7 @@ describe('initUtils', () => {
       await fs.appendFile(filePath, 'test');
 
       await expect(prepareWorkingDirectory('bar')).rejects.toThrow(
-        'Directory not empty: bar',
+        'Init Error: Failed to prepare working directory with message: Directory bar not empty.',
       );
     });
   });
@@ -88,7 +88,9 @@ describe('initUtils', () => {
           throw new Error('error message');
         });
 
-      await expect(cloneTemplate('foo')).rejects.toThrow('error message');
+      await expect(cloneTemplate('foo')).rejects.toThrow(
+        'Init Error: Failed to clone the template.',
+      );
       expect(execSyncMock).toHaveBeenCalledTimes(1);
     });
   });
@@ -177,7 +179,9 @@ describe('initUtils', () => {
           throw new Error('error message');
         });
 
-      await expect(gitInit('foo')).rejects.toThrow('error message');
+      await expect(gitInit('foo')).rejects.toThrow(
+        'Init Error: Failed to init a new git repository.',
+      );
       expect(execSyncMock).toHaveBeenCalledTimes(1);
     });
   });
@@ -204,7 +208,9 @@ describe('initUtils', () => {
           throw new Error('error message');
         });
 
-      await expect(yarnInstall('foo')).rejects.toThrow('error message');
+      await expect(yarnInstall('foo')).rejects.toThrow(
+        'Init Error: Failed to install dependencies.',
+      );
       expect(execSyncMock).toHaveBeenCalledTimes(1);
     });
   });