diff --git a/test/dev-deps-w-dev.test.js b/test/dev-deps-w-dev.test.js deleted file mode 100644 index 4560c1f19d..0000000000 --- a/test/dev-deps-w-dev.test.js +++ /dev/null @@ -1,80 +0,0 @@ -'use strict'; -var test = require('tap').test; -var path = require('path'); -var snyk = require('../src/lib'); - -var dir = path.resolve(__dirname, 'fixtures', 'dev-deps-demo'); - -var oldValue = null; -test('setup', function(t) { - var config = require('../src/lib/config'); - oldValue = config.devDeps; - config.devDeps = true; - t.pass('config primed'); - t.end(); -}); - -test('dev deps: dev-deps-demo, including dev deps', function(t) { - function runTests(t, error, modules) { - var expectedDirectDeps = { - 'uglify-js': '2.3.6', - qs: '0.6.6', - semver: '3.0.1', - 'kind-of': '2.0.1', - 'dev-deps-demo': null, - }; - - if (error) { - t.fail(error.message); - t.bailout(); - } - - var keys = Object.keys(modules.dependencies); - var count = keys.length; - t.equal(count, 4, 'dep count'); - - keys.forEach(function(key) { - t.ok(expectedDirectDeps[key] !== undefined, key + ' was expected'); - - // For kind-of, test that its child dependencies were properly included - if (key === 'kind-of') { - var childDeps = modules.dependencies[key].dependencies; - var childKeys = Object.keys(childDeps); - t.equal(childKeys.length, 2, 'dep count of kind-of'); - - // Check child dependencies - t.ok( - childDeps['is-buffer'] !== undefined, - 'is-buffer child dep was expected', - ); - t.ok( - childDeps['typeof'] !== undefined, - 'typeof child dep was expected', - ); - } else { - t.equal( - expectedDirectDeps[key], - modules.dependencies[key].version, - key + ' version is correct', - ); - } - }); - t.end(); - } - - snyk.modules(dir, { dev: true }).then(function(modules) { - var error = null; - if (error) { - console.log(error.stack); - } - runTests(t, error, modules); - }); -}); - -var oldValue = null; -test('teardown', function(t) { - var config = require('../src/lib/config'); - config.devDeps = oldValue; - t.pass('config restored'); - t.end(); -}); diff --git a/test/dev-deps-with-dev.test.ts b/test/dev-deps-with-dev.test.ts new file mode 100644 index 0000000000..de66f255c6 --- /dev/null +++ b/test/dev-deps-with-dev.test.ts @@ -0,0 +1,62 @@ +import { test } from 'tap'; +import * as path from 'path'; + +import * as snyk from '../src/lib'; +import * as config from '../src/lib/config'; + +const dir = path.resolve(__dirname, 'fixtures', 'dev-deps-demo'); + +let oldValue = null; + +test('setup', async (t) => { + oldValue = (config as any).devDeps; + (config as any).devDeps = true; + t.pass('config primed'); +}); + +test('dev deps: dev-deps-demo, including dev deps', async (t) => { + const expectedDirectDeps = { + qs: '0.6.6', + semver: '3.0.1', + 'kind-of': '2.0.1', + 'uglify-js': '2.3.6', + 'dev-deps-demo': null, + }; + + try { + const modules = await snyk.modules(dir, { dev: true }); + const keys = Object.keys(modules.dependencies); + t.equal(keys.length, 4, 'dep count'); + + keys.forEach((key) => { + t.ok(expectedDirectDeps[key] !== undefined, key + ' was expected'); + + // For kind-of, test that its child dependencies were properly included + if (key === 'kind-of') { + const childDeps = modules.dependencies[key].dependencies; + const childKeys = Object.keys(childDeps); + t.equal(childKeys.length, 2, 'dep count of kind-of'); + + // Check child dependencies + t.ok( + childDeps['is-buffer'] !== undefined, + 'is-buffer child dep was expected', + ); + t.ok(childDeps.typeof !== undefined, 'typeof child dep was expected'); + } else { + t.equal( + expectedDirectDeps[key], + modules.dependencies[key].version, + key + ' version is correct', + ); + } + }); + } catch (e) { + t.threw(e); + } +}); + +test('teardown', async (t) => { + (config as any).devDeps = oldValue; + t.pass('config restored'); +});