Merge pull request #505 from HubSpot/fail-jasmine-ontest-fail

Fail jasmine ontest fail
HubSpot · May 19, 2021 · 58cc1f1 · 58cc1f1
2 parents 0b1b183 + 23d5fd2
commit 58cc1f1
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 1 deletion.
diff --git a/acceptance-tests/jasmine.json b/acceptance-tests/jasmine.json
@@ -3,5 +3,6 @@
   "spec_files": ["*[sS]pec.js"],
   "helpers": ["helpers/**/*.js"],
   "stopSpecOnExpectationFailure": false,
+  "stopOnSpecFailure": true,
   "random": false
 }
diff --git a/acceptance-tests/run-tests b/acceptance-tests/run-tests
@@ -63,8 +63,9 @@ setArgsOverrides(
     const testRunner = new Jasmine();
     testRunner.loadConfigFile(path.join(__dirname, 'jasmine.json'));
     testRunner.addReporter(reporter);
-    testRunner.onComplete(function() {
+    testRunner.onComplete(function(passed) {
       rimraf.sync(CONFIG_FILE_PATH);
+      process.exit(passed ? 0 : 1);
     });
     const cliPath = path.join(process.cwd(), '../packages/cli/bin/hs');
     const cli = cmd.create(cliPath, '.');

diff --git a/packages/cli/bin/cli.js b/packages/cli/bin/cli.js
@@ -42,6 +42,14 @@ notifier.notify({
   message: pkg.name === '@hubspot/cms-cli' ? CLI_UPGRADE_MESSAGE : null,
 });
 
+const getTerminalWidth = () => {
+  const width = yargs.terminalWidth();
+
+  if (width >= 100) return width * 0.9;
+
+  return width;
+};
+
 const argv = yargs
   .usage('Tools for working with HubSpot')
   .middleware([setLogLevel])
@@ -90,6 +98,7 @@ const argv = yargs
   .recommendCommands()
   .demandCommand(1, '')
   .completion()
+  .wrap(getTerminalWidth())
   .strict().argv;
 
 if (argv.help) {