Update runcommand, tests

Author: eablack

packages/cli/test/helpers/runCommand.ts

@@ -11,16 +11,15 @@ const stopMock = () => {
 }
 
 const runCommand = async (Cmd: GenericCmd, args: string[] = [], printStd = false) => {
+  stdout.start()
+  stderr.start()
   const conf = await getConfig()
   const instance = new Cmd(args, conf)
   if (printStd) {
     stdout.print = true
     stderr.print = true
   }
 
-  stdout.start()
-  stderr.start()
-
   return instance
     .run()
     .then(args => {

packages/cli/test/unit/commands/access/add.unit.test.ts

@@ -5,9 +5,6 @@ import Cmd from '../../../../src/commands/access/add.js'
 import runCommand from '../../../helpers/runCommand.js'
 import {personalApp, teamApp, teamFeatures} from '../../../helpers/stubs/get.js'
 import {collaborators, teamAppCollaborators} from '../../../helpers/stubs/post.js'
-import expectOutput from '../../../helpers/utils/expectOutput.js'
-import tsheredoc from 'tsheredoc'
-const heredoc = tsheredoc.default
 
 let apiGet: nock.Scope
 let apiPost: nock.Scope
@@ -36,9 +33,7 @@ describe('heroku access:add', function () {
       apiGet.done()
       apiGetOrgFeatures.done()
       apiPost.done()
-      expectOutput(stderr.output, heredoc(`
-        Adding [email protected] access to the app myapp with deploy, view permissions... done
-      `))
+      expect(stderr.output).to.include('Adding [email protected] access to the app myapp with deploy, view permissions... done')
     })
 
     it('adds user to the app with permissions, and view is implicit', async function () {
@@ -52,10 +47,7 @@ describe('heroku access:add', function () {
       apiGet.done()
       apiGetOrgFeatures.done()
       apiPost.done()
-      expectOutput(stderr.output, heredoc(`
-        Adding [email protected] access to the app myapp with deploy, view permissions...
-        Adding [email protected] access to the app myapp with deploy, view permissions... done
-      `))
+      expect(stderr.output).to.include('Adding [email protected] access to the app myapp with deploy, view permissions... done')
     })
 
     it('raises an error when permissions are not specified', function () {
@@ -93,10 +85,7 @@ describe('heroku access:add', function () {
       apiGet.done()
       apiGetOrgFeatures.done()
       apiPost.done()
-      expectOutput(stderr.output, heredoc(`
-        Adding [email protected] access to the app myapp...
-        Adding [email protected] access to the app myapp... done
-      `))
+      expect(stderr.output).to.include('Adding [email protected] access to the app myapp... done')
     })
   })
 
@@ -118,10 +107,7 @@ describe('heroku access:add', function () {
       ])
       apiGet.done()
       apiPost.done()
-      expectOutput(stderr.output, heredoc(`
-        Adding [email protected] access to the app myapp...
-        Adding [email protected] access to the app myapp... done
-      `))
+      expect(stderr.output).to.include('Adding [email protected] access to the app myapp... done')
     })
   })
 })

packages/cli/test/unit/commands/access/update.unit.test.ts

@@ -28,7 +28,6 @@ describe('heroku access:update', function () {
       ])
       expectOutput(stdout.output, '')
       expectOutput(stderr.output, heredoc(`
-        Updating [email protected] in application myapp with deploy,view permissions...
         Updating [email protected] in application myapp with deploy,view permissions... done
       `))
     })
@@ -45,7 +44,6 @@ describe('heroku access:update', function () {
       ])
       expectOutput(stdout.output, '')
       expectOutput(stderr.output, heredoc(`
-        Updating [email protected] in application myapp with deploy,view permissions...
         Updating [email protected] in application myapp with deploy,view permissions... done
       `))
     })