test: update config profile tests

Author: achingbrain

src/config/profiles/apply.js

@@ -2,7 +2,6 @@
 'use strict'
 
 const { getDescribe, getIt, expect } = require('../../utils/mocha')
-const waterfall = require('async/waterfall')
 
 module.exports = (createCommon, options) => {
   const describe = getDescribe(options)
@@ -30,41 +29,32 @@ module.exports = (createCommon, options) => {
 
     after((done) => common.teardown(done))
 
-    it('should apply a config profile', (done) => {
-      let diff
-      waterfall([
-        (cb) => ipfs.config.profiles.apply('lowpower', cb),
-        (_diff, cb) => {
-          diff = _diff
-          expect(diff.original.Swarm.ConnMgr.LowWater).to.not.equal(diff.updated.Swarm.ConnMgr.LowWater)
-          ipfs.config.get(cb)
-        },
-        (newConfig, cb) => {
-          expect(newConfig.Swarm.ConnMgr.LowWater).to.equal(diff.updated.Swarm.ConnMgr.LowWater)
-          cb()
-        }
-      ], done)
+    it('should apply a config profile', async () => {
+      const diff = await ipfs.config.profiles.apply('lowpower')
+      expect(diff.original.Swarm.ConnMgr.LowWater).to.not.equal(diff.updated.Swarm.ConnMgr.LowWater)
+
+      const newConfig = await ipfs.config.get()
+      expect(newConfig.Swarm.ConnMgr.LowWater).to.equal(diff.updated.Swarm.ConnMgr.LowWater)
+    })
+
+    it('should strip private key from diff output', async () => {
+      const originalConfig = await ipfs.config.get()
+      const diff = await ipfs.config.profiles.apply('default-networking', { dryRun: true })
+
+      // should have stripped private key from diff output
+      expect(originalConfig).to.have.nested.property('Identity.PrivKey')
+      expect(diff).to.not.have.nested.property('original.Identity.PrivKey')
+      expect(diff).to.not.have.nested.property('updated.Identity.PrivKey')
     })
 
-    it('should not apply a config profile in dry-run mode', (done) => {
-      let originalConfig
-      waterfall([
-        (cb) => ipfs.config.get(cb),
-        (config, cb) => {
-          originalConfig = config
-          cb()
-        },
-        (cb) => ipfs.config.profiles.apply('server', { dryRun: true }, cb),
-        (diff, cb) => {
-          expect(diff.original).to.deep.equal(originalConfig)
-          expect(diff.updated).to.not.deep.equal(originalConfig)
-          ipfs.config.get(cb)
-        },
-        (updatedConfig, cb) => {
-          expect(updatedConfig).to.deep.equal(originalConfig)
-          cb()
-        }
-      ], done)
+    it('should not apply a config profile in dry-run mode', async () => {
+      const originalConfig = await ipfs.config.get()
+
+      await ipfs.config.profiles.apply('server', { dryRun: true })
+
+      const updatedConfig = await ipfs.config.get()
+
+      expect(updatedConfig).to.deep.equal(originalConfig)
     })
   })
 }

src/config/profiles/list.js

@@ -2,7 +2,6 @@
 'use strict'
 
 const { getDescribe, getIt, expect } = require('../../utils/mocha')
-const waterfall = require('async/waterfall')
 
 module.exports = (createCommon, options) => {
   const describe = getDescribe(options)
@@ -30,21 +29,16 @@ module.exports = (createCommon, options) => {
 
     after((done) => common.teardown(done))
 
-    it('should list config profiles', (done) => {
-      waterfall([
-        (cb) => ipfs.config.profiles.list(cb),
-        (profiles, cb) => {
-          expect(profiles).to.be.an('array')
-          expect(profiles).not.to.be.empty()
-
-          profiles.forEach(profile => {
-            expect(profile.name).to.be.a('string')
-            expect(profile.description).to.be.a('string')
-          })
-
-          cb()
-        }
-      ], done)
+    it('should list config profiles', async () => {
+      const profiles = await ipfs.config.profiles.list()
+
+      expect(profiles).to.be.an('array')
+      expect(profiles).not.to.be.empty()
+
+      profiles.forEach(profile => {
+        expect(profile.name).to.be.a('string')
+        expect(profile.description).to.be.a('string')
+      })
     })
   })
 }