update message, show first part in red

cypress-io · Aug 29, 2019 · 8a5030a · 8a5030a
1 parent 498927c
commit 8a5030a
Show file tree

Hide file tree

Showing 5 changed files with 9 additions and 16 deletions.
diff --git a/cli/__snapshots__/cli_spec.js b/cli/__snapshots__/cli_spec.js
@@ -371,9 +371,11 @@ exports['cli CYPRESS_ENV catches environment "foo" 1'] = `
   Environment variable with reserved name "CYPRESS_ENV" was used.
 
   Remove "CYPRESS_ENV" variable and run Cypress again.
+
   ----------
 
-  foo
+  CYPRESS_ENV=foo
+
   ----------
 
   Platform: xxx

diff --git a/cli/__snapshots__/errors_spec.js b/cli/__snapshots__/errors_spec.js
@@ -32,6 +32,7 @@ exports['errors individual has the following errors 1'] = [
   "failedDownload",
   "failedUnzip",
   "invalidCacheDirectory",
+  "invalidCypressEnv",
   "invalidSmokeTestDisplayError",
   "missingApp",
   "missingDependency",
@@ -41,7 +42,6 @@ exports['errors individual has the following errors 1'] = [
   "removed",
   "smokeTestFailure",
   "unexpected",
-  "invalidCypressEnv",
   "versionMismatch"
 ]
 

diff --git a/cli/lib/cli.js b/cli/lib/cli.js
@@ -201,7 +201,7 @@ module.exports = {
       debug('invalid CYPRESS_ENV value', process.env.CYPRESS_ENV)
 
       return errors.exitWithError(errors.errors.invalidCypressEnv)(
-        process.env.CYPRESS_ENV
+        `CYPRESS_ENV=${process.env.CYPRESS_ENV}`
       )
     }
 

diff --git a/cli/lib/errors.js b/cli/lib/errors.js
@@ -186,21 +186,11 @@ const unexpected = {
 
 const invalidCypressEnv = {
   description:
-    'Environment variable with reserved name "CYPRESS_ENV" was used.',
-  solution: 'Remove "CYPRESS_ENV" variable and run Cypress again.',
+    chalk.red('Environment variable with reserved name "CYPRESS_ENV" was used.'),
+  solution: chalk.red('Remove "CYPRESS_ENV" variable and run Cypress again.'),
   exitCode: 11,
 }
 
-// const getOsVersion = () => {
-//   if (os.platform() === 'linux') {
-//     return getos()
-//       .then(osInfo => [osInfo.dist, osInfo.release].join(' - '))
-//       .catch(() => os.release())
-//   }
-//     return Promise.resolve(os.release())
-
-// }
-
 const removed = {
   CYPRESS_BINARY_VERSION: {
     description: stripIndent`

diff --git a/cli/test/lib/cli_spec.js b/cli/test/lib/cli_spec.js
@@ -91,7 +91,8 @@ describe('cli', () => {
     }
 
     const sanitizePlatform = (text) => {
-      return text.split(os.eol)
+      return text
+      .split(os.eol)
       .map(replacePlatform)
       .map(replaceCypressVersion)
       .join(os.eol)