fix exit code not thrown issue when cli running into exception (#1022)

* add exit code for command when running into exception

* fix test

* adjust test

* fix test case

* fix test

* remove unused code

Author: feich-ms

packages/chatdown/test/commands/chatdown.test.ts

@@ -5,6 +5,7 @@ describe('chatdown', () => {
     test
     .stdout()
     .command(['chatdown', '--help'])
+    .exit(1)
     .it('should print the help contents when --help is passed as an argument', ctx => {
       expect(ctx.stdout).to.contain('Converts chat dialog files in <filename>.')
     })

packages/chatdown/test/commands/chatdown/convert.test.ts

@@ -21,13 +21,15 @@ describe('chatdown:convert', function() {
   test
   .stdout()
   .command(['chatdown:convert', '--help'])
+  .exit(1)
   .it('should print the help contents when --help is passed as an argument', (ctx: any) => {
     expect(ctx.stdout).to.contain('Converts chat dialog files in <filename>.')
   })
 
   test
   .stdout()
   .command(['chatdown'])
+  .exit(1)
   .it('should print the help contents when no input is passed', (ctx: any) => {
     expect(ctx.stdout).to.contain('Converts chat dialog files in <filename>.')
   })

packages/command/src/command.ts

@@ -50,6 +50,9 @@ export abstract class Command extends Base {
         this.error(err.message)
       } catch (e) {}
     }
+
+    // return exit code
+    this.exit(1)
   }
 
   // Flush telemetry to avoid performance issues

packages/command/test/command.test.ts

@@ -19,8 +19,12 @@ describe('command', () => {
 
     return Test.run([])
   })
-  .do(output => expect(output.stderr).to.include('Unknown error during execution. Please file an issue on https://github.com/microsoft/botframework-cli/issues'))
+  .catch(err => {
+    expect(err.message).to.include('EEXIT: 1')
+  })
+  .finally(output => expect(output.stderr).to.equal('Unknown error during execution. Please file an issue on https://github.com/microsoft/botframework-cli/issues\nfailure\n'))
   .it('Errors out')
+  
 
   fancy
   .stderr()
@@ -34,7 +38,10 @@ describe('command', () => {
 
     return Test.run([])
   })
-  .do(output => expect(output.stderr).to.equal('failure\n'))
+  .catch(err => {
+    expect(err.message).to.include('EEXIT: 1')
+  })
+  .finally(output => expect(output.stderr).to.equal('failure\n'))
   .it('Exits with error')
 
   fancy
@@ -48,7 +55,10 @@ describe('command', () => {
 
     return Test.run([])
   })
-  .do(output => expect(output.stderr).to.equal('failure\n'))
+  .catch(err => {
+    expect(err.message).to.include('EEXIT: 1')
+  })
+  .finally(output => expect(output.stderr).to.equal('failure\n'))
   .it('Handles OCLIF Errors')
 
   fancy

packages/config/test/commands/config/set/luis.test.ts

@@ -14,6 +14,7 @@ describe('config:set:luis', () => {
     test
     .stdout()
     .command(['config:set:luis', '--help'])
+    .exit(1)
     .it('should print the help contents when --help is passed as an argument', ctx => {
         expect(ctx.stdout).to.contain('Stores default LUIS application values in global config.')
     })

packages/config/test/commands/config/set/qnamaker.test.ts

@@ -46,6 +46,7 @@ describe('config:set:qnamaker', () => {
     test
       .stdout()
       .command(['config:set:qnamaker'])
+      .exit(1)
       .it('Asks for a flag', ctx => {
         expect(ctx.stdout).to.contain('Plase specify flag')
     })

packages/config/test/commands/config/set/telemetry.test.ts

@@ -23,6 +23,7 @@ describe('config:set:telemetry', () => {
       test
       .stdout()
       .command(['config:set:telemetry'])
+      .exit(1)
       .it('Shows help and keeps the same seetings', async ctx => {
         let config = await fs.readJSON(getConfigFile())
         expect(config.telemetry).to.be.true

packages/luis/test/commands/luis/application/create.test.ts

@@ -18,6 +18,7 @@ describe('luis:application:create', () => {
   test
   .stdout()
   .command(['luis:application:create', '--help'])
+  .exit(1)
   .it('should print the help contents when --help is passed as an argument', ctx => {
     expect(ctx.stdout).to.contain('Creates a new LUIS application')
   })
@@ -26,6 +27,7 @@ describe('luis:application:create', () => {
   .stdout()
   .stderr()
   .command(['luis:application:create', '--endpoint', 'https://westus.api.cognitive.microsoft.com', '--subscriptionKey', uuidv1(), '--culture', 'en-us', '--description', 'test description', '--versionId', '0.04'])
+  .exit(1)
   .it('displays an error if any required input parameters are missing', ctx => {
     expect(ctx.stderr).to.contain(`Required input property 'name' missing.`)
   })
@@ -34,6 +36,7 @@ describe('luis:application:create', () => {
   .stdout()
   .stderr()
   .command(['luis:application:create', '--endpoint', 'https://westus.api.cognitive.microsoft.com', '--name', 'orange_app', '--culture', 'en-us', '--description', 'test description', '--versionId', '0.04'])
+  .exit(1)
   .it('displays an error if any required input parameters are missing', ctx => {
     expect(ctx.stderr).to.contain(`Required input property 'subscriptionKey' missing.`)
   })
@@ -54,6 +57,7 @@ describe('luis:application:create', () => {
   .stdout()
   .stderr()
   .command(['luis:application:create', '--endpoint', 'undefined', '--name', 'orange_app', '--subscriptionKey', uuidv1(), '--culture', 'en-us', '--description', 'test description', '--versionId', '0.04'])
+  .exit(1)
   .it('fails to create an app and displays an error message if the endpoint is undefined', ctx => {
     expect(ctx.stderr).to.contain('Failed to create app: TypeError: Only absolute URLs are supported\n')
   })

packages/luis/test/commands/luis/application/delete.test.ts

@@ -16,6 +16,7 @@ describe('luis:application:delete', () => {
   test
   .stdout()
   .command(['luis:application:delete', '--help'])
+  .exit(1)
   .it('should print the help contents when --help is passed as an argument', ctx => {
     expect(ctx.stdout).to.contain('Deletes a LUIS application')
   })
@@ -24,6 +25,7 @@ describe('luis:application:delete', () => {
   .stdout()
   .stderr()
   .command(['luis:application:delete', '--endpoint', 'https://westus.api.cognitive.microsoft.com', '--subscriptionKey', uuidv1()])
+  .exit(1)
   .it('displays an error if any required input parameters are missing', ctx => {
     expect(ctx.stderr).to.contain(`Required input property 'appId' missing.`)
   })
@@ -32,6 +34,7 @@ describe('luis:application:delete', () => {
   .stdout()
   .stderr()
   .command(['luis:application:delete', '--appId', uuidv1(), '--subscriptionKey', uuidv1()])
+  .exit(1)
   .it('displays an error if any required input parameters are missing', ctx => {
     expect(ctx.stderr).to.contain(`Required input property 'endpoint' missing.`)
   })
@@ -51,6 +54,7 @@ describe('luis:application:delete', () => {
   .stdout()
   .stderr()
   .command(['luis:application:delete', '--appId', uuidv1(), '--endpoint', 'undefined', '--subscriptionKey', uuidv1(), '--force'])
+  .exit(1)
   .it('fails to delete an app and displays an error message if the endpoint is undefined', ctx => {
     expect(ctx.stderr).to.contain('Failed to delete app')
   })

packages/luis/test/commands/luis/application/import.test.ts

@@ -17,6 +17,7 @@ describe('luis:application:import', () => {
   test
   .stdout()
   .command(['luis:application:import', '--help'])
+  .exit(1)
   .it('should print the help contents when --help is passed as an argument', ctx => {
     expect(ctx.stdout).to.contain('Imports LUIS application from JSON or LU content.')
   })
@@ -25,6 +26,7 @@ describe('luis:application:import', () => {
   .stdout()
   .stderr()
   .command(['luis:application:import', '--endpoint', 'https://westus.api.cognitive.microsoft.com', '--name', 'sample_app'])
+  .exit(1)
   .it('displays an error if any required input parameters are missing', ctx => {
     expect(ctx.stderr).to.contain(`Required input property 'subscriptionKey' missing.`)
   })
@@ -45,6 +47,7 @@ describe('luis:application:import', () => {
   .stdout()
   .stderr()
   .command(['luis:application:import', '--name', 'Sample', '--in', './test/fixtures/xyz.json', '--endpoint', 'https://westus.api.cognitive.microsoft.com', '--subscriptionKey', uuidv1()])
+  .exit(1)
   .it('displays an error message if the import file cannot be found', ctx => {
     expect(ctx.stderr).to.contain('Failed to read app JSON')
   })
@@ -53,6 +56,7 @@ describe('luis:application:import', () => {
   .stdout()
   .stderr()
   .command(['luis:application:import', '--name', 'Sample', '--endpoint', 'https://westus.api.cognitive.microsoft.com', '--subscriptionKey', uuidv1()])
+  .exit(1)
   .it('displays an error message if no input data detected', ctx => {
     expect(ctx.stderr).to.contain('No import data found - please provide input through stdin or the --in flag')
   })
@@ -62,6 +66,7 @@ describe('luis:application:import', () => {
   .stdout()
   .stderr()
   .command(['luis:application:import', '--name', 'sampleapp', '--endpoint', 'https://westus.api.cognitive.microsoft.com', '--subscriptionKey', uuidv1()])
+  .exit(1)
   .it('imports a luis app from stdin and returns the app\'s id', ctx => {
     process.stdin.setEncoding('utf8')
     process.stdin.once('data', data => {