test: fix

Author: zkochan

test/index.js

@@ -7,47 +7,6 @@ const path = require('path')
 
 function noop () {}
 
-test('makeEnv', function (t) {
-  const pkg = {
-    name: 'myPackage',
-    version: '1.0.0',
-    contributors: [{ name: 'Mike Sherov', email: 'beep@boop.com' }]
-  }
-  const config = {
-    enteente: Infinity,
-    '_privateVar': 1,
-    '_myPackage:myPrivateVar': 1,
-    'myPackage:bar': 2,
-    'myPackage:foo': 3,
-    'myPackage@1.0.0:baz': 4,
-    'myPackage@1.0.0:foo': 5
-  }
-
-  const env = lifecycle.makeEnv(pkg, {
-    config,
-    nodeOptions: '--inspect-brk --abort-on-uncaught-exception'
-  }, null, process.env)
-
-  t.equal('myPackage', env.npm_package_name, 'package data is included')
-  t.equal('Mike Sherov', env.npm_package_contributors_0_name, 'nested package data is included')
-
-  t.equal('Infinity', env.npm_config_enteente, 'public config is included')
-  t.equal(undefined, env.npm_config_privateVar, 'private config is excluded')
-
-  t.equal('1', env.npm_config_myPackage_myPrivateVar, 'private package config is included by name')
-  t.equal('2', env.npm_config_myPackage_bar, 'public package config is included by name')
-
-  t.equal('5', env.npm_config_myPackage_1_0_0_foo, 'public package@version config is included by name')
-
-  t.equal('1', env.npm_package_config_myPrivateVar, 'package private config is included')
-  t.equal('2', env.npm_package_config_bar, 'package config is included')
-  t.equal('4', env.npm_package_config_baz, 'package@version config is included')
-  t.equal('5', env.npm_package_config_foo, 'package@version config overrides package config')
-
-  t.equal('--inspect-brk --abort-on-uncaught-exception', env.NODE_OPTIONS, 'nodeOptions sets NODE_OPTIONS')
-  t.end()
-})
-
 test('_incorrectWorkingDirectory: accepts wd for package that matches project\'s name', function (t) {
   const wd = '/opt/my-time/node_modules/time'
   const pkg = { name: 'time' }
@@ -116,7 +75,7 @@ test('runs scripts from .hooks directory even if no script is present in package
     .catch(t.end)
 })
 
-test("reports child's output", function (t) {
+test("reports child's output", async (t) => {
   const fixture = path.join(__dirname, 'fixtures', 'count-to-10')
 
   const verbose = sinon.spy()
@@ -136,53 +95,93 @@ test("reports child's output", function (t) {
 
   const pkg = require(path.join(fixture, 'package.json'))
 
-  lifecycle(pkg, 'postinstall', fixture, {
+  await lifecycle(pkg, 'postinstall', fixture, {
     stdio: 'pipe',
     log,
     dir,
     config: {}
   })
-    .then(() => {
-      t.ok(
-        verbose.calledWithMatch(
-          'lifecycle',
-          'undefined~postinstall:',
-          'stdout',
-          'line 1'
-        ),
-        'stdout reported'
-      )
-      t.ok(
-        verbose.calledWithMatch(
-          'lifecycle',
-          'undefined~postinstall:',
-          'stdout',
-          'line 2'
-        ),
-        'stdout reported'
-      )
-      t.ok(
-        verbose.calledWithMatch(
-          'lifecycle',
-          'undefined~postinstall:',
-          'stderr',
-          'some error'
-        ),
-        'stderr reported'
-      )
-      t.ok(
-        silly.calledWithMatch(
-          'lifecycle',
-          'undefined~postinstall:',
-          'Returned: code:',
-          0,
-          ' signal:',
-          null
-        ),
-        'exit code reported'
-      )
+  t.ok(
+    verbose.calledWithMatch(
+      'lifecycle',
+      'undefined~postinstall:',
+      'stdout',
+      'line 1'
+    ),
+    'stdout reported'
+  )
+  t.ok(
+    verbose.calledWithMatch(
+      'lifecycle',
+      'undefined~postinstall:',
+      'stdout',
+      'line 2'
+    ),
+    'stdout reported'
+  )
+  t.ok(
+    verbose.calledWithMatch(
+      'lifecycle',
+      'undefined~postinstall:',
+      'stderr',
+      'some error'
+    ),
+    'stderr reported'
+  )
+  t.ok(
+    silly.calledWithMatch(
+      'lifecycle',
+      'undefined~postinstall:',
+      'Returned: code:',
+      0,
+      ' signal:',
+      null
+    ),
+    'exit code reported'
+  )
 
-      t.end()
-    })
-    .catch(t.end)
+  t.end()
+})
+
+// WARNING! For some reason, when this test runs first,
+// the "reports child's output" fails
+test('makeEnv', function (t) {
+  const pkg = {
+    name: 'myPackage',
+    version: '1.0.0',
+    contributors: [{ name: 'Mike Sherov', email: 'beep@boop.com' }]
+  }
+  const config = {
+    enteente: Infinity,
+    '_privateVar': 1,
+    '_myPackage:myPrivateVar': 1,
+    'myPackage:bar': 2,
+    'myPackage:foo': 3,
+    'myPackage@1.0.0:baz': 4,
+    'myPackage@1.0.0:foo': 5
+  }
+
+  const env = lifecycle.makeEnv(pkg, {
+    config,
+    nodeOptions: '--inspect-brk --abort-on-uncaught-exception'
+  }, null, process.env)
+
+  t.equal('myPackage', env.npm_package_name, 'package data is included')
+  t.equal('Mike Sherov', env.npm_package_contributors_0_name, 'nested package data is included')
+
+  t.equal('Infinity', env.npm_config_enteente, 'public config is included')
+  t.equal(undefined, env.npm_config_privateVar, 'private config is excluded')
+
+  t.equal('1', env.npm_config_myPackage_myPrivateVar, 'private package config is included by name')
+  t.equal('2', env.npm_config_myPackage_bar, 'public package config is included by name')
+
+  t.equal('5', env.npm_config_myPackage_1_0_0_foo, 'public package@version config is included by name')
+
+  t.equal('1', env.npm_package_config_myPrivateVar, 'package private config is included')
+  t.equal('2', env.npm_package_config_bar, 'package config is included')
+  t.equal('4', env.npm_package_config_baz, 'package@version config is included')
+  t.equal('5', env.npm_package_config_foo, 'package@version config overrides package config')
+
+  t.equal('--inspect-brk --abort-on-uncaught-exception', env.NODE_OPTIONS, 'nodeOptions sets NODE_OPTIONS')
+  t.end()
 })