Merge pull request #1410 from snyk/chore/add-missing-test-suites

Add missing test suites

jest.config.js

@@ -5,6 +5,13 @@ module.exports = {
   collectCoverage: false, // not collecting coverage for now
   collectCoverageFrom: ['src/**/*.ts'],
   coverageReporters: ['text-summary', 'html'],
-  testMatch: ['**/*.spec.ts'], // Remove when all tests are using Jest
-  modulePathIgnorePatterns: ['<rootDir>/test/.*fixtures'],
+  testMatch: [
+    '<rootDir>/test/*.spec.ts',
+    '<rootDir>\\test\\*.spec.ts', // for Windows
+  ],
+  modulePathIgnorePatterns: [
+    '<rootDir>/test/.*fixtures',
+    '<rootDir>/test/acceptance/*',
+    '<rootDir>/test/acceptance/workspaces/*' // to avoid `jest-haste-map: Haste module naming collision` errors
+  ],
 };

package.json

@@ -27,11 +27,12 @@
     "prepare": "npm run build",
     "test:common": "npm run check-tests && npm run lint && node --require ts-node/register src/cli test --org=snyk",
     "test:acceptance": "tap test/acceptance/**/*.test.* test/acceptance/*.test.* -Rspec --timeout=300 --node-arg=-r --node-arg=ts-node/register",
+    "test:acceptance-windows": "tap test/acceptance/**/*.test.* -Rspec --timeout=300 --node-arg=-r --node-arg=ts-node/register",
     "test:system": "tap test/system/*.test.* -Rspec --timeout=300 --node-arg=-r --node-arg=ts-node/register",
-    "test:jest": "jest test/*.spec.ts",
+    "test:jest": "jest",
     "test:test": "tap test/*.test.* -Rspec --timeout=300 --node-arg=-r --node-arg=ts-node/register",
-    "test": "npm run test:acceptance && npm run test:system && npm run test:jest",
-    "test-windows": "tap test/acceptance/**/*.test.* -Rspec --timeout=300 --node-arg=-r --node-arg=ts-node/register && npm run test:system && npm run test:test",
+    "test": "npm run test:acceptance && npm run test:system && npm run test:test && npm run test:jest",
+    "test-windows": "npm run test:acceptance-windows && npm run test:system && npm run test:test && npm run test:jest",
     "lint": "run-p --aggregate-output lint:*",
     "lint:js": "eslint --color --cache 'src/**/*.{js,ts}'",
     "lint:formatting": "prettier --check '{src,test,scripts}/**/*.{js,ts}'",

test/ecosystems.spec.ts

@@ -5,6 +5,12 @@ import * as ecosystems from '../src/lib/ecosystems';
 import * as request from '../src/lib/request/promise';
 import { Options } from '../src/lib/types';
 import { TestCommandResult } from '../src/cli/commands/types';
+const osName = require('os-name');
+
+const isWindows =
+  osName()
+    .toLowerCase()
+    .indexOf('windows') === 0;
 
 describe('ecosystems', () => {
   describe('getPlugin', () => {
@@ -48,6 +54,10 @@ describe('ecosystems', () => {
       const cwd = process.cwd();
 
       function readFixture(filename: string) {
+        if (isWindows) {
+          filename = filename.replace('.txt', '-windows.txt');
+        }
+
         const filePath = path.join(fixturePath, filename);
         return fs.readFileSync(filePath, 'utf-8');
       }

test/fixtures/cpp-project/debug-display-windows.txt

@@ -0,0 +1,15 @@
+Fingerprints
+52d1b046047db9ea0c581cafd4c68fe5 add.cpp
+aeca71a6e39f99a24ecf4c088eee9cb8 add.h
+ad3365b3370ef6b1c3e778f875055f19 main.cpp
+
+Dependencies
+[email protected]
+
+Issues
+✗ Cross-site Scripting (XSS) [medium]
+  https://snyk.io/vuln/cpp:add:20161130
+  in [email protected]
+  fix version 1.2.4
+
+Tested 1 dependency for known issues, found 1 issue.

test/fixtures/cpp-project/display-windows.txt

@@ -0,0 +1,10 @@
+Dependencies
+[email protected]
+
+Issues
+✗ Cross-site Scripting (XSS) [medium]
+  https://snyk.io/vuln/cpp:add:20161130
+  in [email protected]
+  fix version 1.2.4
+
+Tested 1 dependency for known issues, found 1 issue.

test/fixtures/cpp-project/error-windows.txt

@@ -0,0 +1,2 @@
+Errors
+Could not test dependencies in .