Merge pull request #1857 from snyk/chore/test-handlers-folder

chore: handler test folder separation
snyk · Apr 22, 2021 · 65d88a8 · 65d88a8
2 parents 3776b74 + 086fb37
commit 65d88a8
Show file tree

Hide file tree

Showing 47 changed files with 82 additions and 82 deletions.
diff --git a/...dlers/pip-requirements/update-dependencies/__snapshots__/update-dependencies.spec.ts.snap b/...dlers/pip-requirements/update-dependencies/__snapshots__/update-dependencies.spec.ts.snap
@@ -0,0 +1,76 @@
+// Jest Snapshot v1, https://goo.gl/fbAQLP
+
+exports[`fix *req*.txt / *.txt Python projects fixes multiple files via -c & -r with the same name (some were already fixed) 1`] = `
+"
+Successful fixes:
+
+  test/acceptance/plugins/python/handlers/pip-requirements/update-dependencies/workspaces/app-with-constraints/requirements.txt
+  ✔ Upgraded Django from 1.6.1 to 2.0.1
+  ✔ Upgraded Django from 1.6.1 to 2.0.1 (upgraded in test/acceptance/plugins/python/handlers/pip-requirements/update-dependencies/workspaces/app-with-constraints/constraints.txt)
+  ✔ Upgraded Jinja2 from 2.7.2 to 2.7.3 (upgraded in test/acceptance/plugins/python/handlers/pip-requirements/update-dependencies/workspaces/app-with-constraints/lib/requirements.txt)
+  ✔ Pinned transitive from 1.0.1 to 2.0.1 (pinned in test/acceptance/plugins/python/handlers/pip-requirements/update-dependencies/workspaces/app-with-constraints/constraints.txt)
+
+  test/acceptance/plugins/python/handlers/pip-requirements/update-dependencies/workspaces/app-with-constraints/lib/requirements.txt
+  ✔ Fixed through test/acceptance/plugins/python/handlers/pip-requirements/update-dependencies/workspaces/app-with-constraints/requirements.txt
+
+Summary:
+
+  0 items were not fixed
+  2 items were successfully fixed
+  6 total issues: 2 High | 2 Medium | 2 Low
+  6 fixable issues
+  6 fixed issues"
+`;
+
+exports[`fix *req*.txt / *.txt Python projects fixes multiple files via -r with the same name (some were already fixed) 1`] = `
+"
+Successful fixes:
+
+  test/acceptance/plugins/python/handlers/pip-requirements/update-dependencies/workspaces/app-with-already-fixed/requirements.txt
+  ✔ Upgraded Django from 1.6.1 to 2.0.1
+  ✔ Upgraded Django from 1.6.1 to 2.0.1 (upgraded in test/acceptance/plugins/python/handlers/pip-requirements/update-dependencies/workspaces/app-with-already-fixed/core/requirements.txt)
+  ✔ Upgraded Jinja2 from 2.7.2 to 2.7.3 (upgraded in test/acceptance/plugins/python/handlers/pip-requirements/update-dependencies/workspaces/app-with-already-fixed/lib/requirements.txt)
+
+  test/acceptance/plugins/python/handlers/pip-requirements/update-dependencies/workspaces/app-with-already-fixed/core/requirements.txt
+  ✔ Fixed through test/acceptance/plugins/python/handlers/pip-requirements/update-dependencies/workspaces/app-with-already-fixed/requirements.txt
+
+  test/acceptance/plugins/python/handlers/pip-requirements/update-dependencies/workspaces/app-with-already-fixed/lib/requirements.txt
+  ✔ Fixed through test/acceptance/plugins/python/handlers/pip-requirements/update-dependencies/workspaces/app-with-already-fixed/requirements.txt
+
+Summary:
+
+  0 items were not fixed
+  3 items were successfully fixed
+  6 total issues: 3 High | 3 Medium
+  6 fixable issues
+  6 fixed issues"
+`;
+
+exports[`fix *req*.txt / *.txt Python projects retains python markers 1`] = `
+"amqp==2.4.2
+apscheduler==3.6.0
+asn1crypto==0.24.0
+astroid==1.6.6
+atomicwrites==1.3.0
+attrs==19.1.0
+automat==0.7.0
+backports.functools-lru-cache==1.5 ; python_version < '3.2'
+billiard==3.6.0.0
+celery==4.3.0
+certifi==2019.3.9
+cffi==1.12.3
+chardet==3.0.4
+click==7.1 ; python_version > '1.0'
+clickclick==1.2.2
+configparser==3.7.4 ; python_version == '2.7'
+connexion[swagger-ui]==2.2.0
+constantly==15.1.0
+cryptography==2.6.1
+cssselect==1.0.3
+cython==0.29.7
+enum34==1.1.6 ; python_version < '2.6'
+fastavro==0.21.21
+flask-apscheduler==1.11.0
+flask==1.0.2
+"
+`;
diff --git a/...e-dependencies/extract-provenance.spec.ts → ...e-dependencies/extract-provenance.spec.ts b/...e-dependencies/extract-provenance.spec.ts → ...e-dependencies/extract-provenance.spec.ts
@@ -1,8 +1,8 @@
 
 import * as fs from 'fs';
 import * as pathLib from 'path';
-import { extractProvenance } from '../../../../../../src/plugins/python/handlers/pip-requirements/extract-version-provenance';
-import { parseRequirementsFile } from '../../../../../../src/plugins/python/handlers/pip-requirements/update-dependencies/requirements-file-parser';
+import { extractProvenance } from '../../../../../../../src/plugins/python/handlers/pip-requirements/extract-version-provenance';
+import { parseRequirementsFile } from '../../../../../../../src/plugins/python/handlers/pip-requirements/update-dependencies/requirements-file-parser';
 
 describe('extractProvenance', () => {
   const workspacesPath = pathLib.resolve(__dirname, 'workspaces');

diff --git a/...-dependencies/update-dependencies.spec.ts → ...-dependencies/update-dependencies.spec.ts b/...-dependencies/update-dependencies.spec.ts → ...-dependencies/update-dependencies.spec.ts
@@ -1,12 +1,12 @@
 import * as fs from 'fs';
 import * as pathLib from 'path';
-import * as snykFix from '../../../../../../src';
-import { selectFileForPinning } from '../../../../../../src/plugins/python/handlers/pip-requirements';
-import { SEVERITY, TestResult } from '../../../../../../src/types';
+import * as snykFix from '../../../../../../../src';
+import { selectFileForPinning } from '../../../../../../../src/plugins/python/handlers/pip-requirements';
+import { SEVERITY, TestResult } from '../../../../../../../src/types';
 import {
   generateScanResult,
   generateTestResult,
-} from '../../../../../helpers/generate-entity-to-fix';
+} from '../../../../../../helpers/generate-entity-to-fix';
 
 describe('selectFileForPinning', () => {
   const workspacesPath = pathLib.resolve(__dirname, 'workspaces');

diff --git a/...orkspaces/app-with-already-fixed/base.txt → ...orkspaces/app-with-already-fixed/base.txt b/...orkspaces/app-with-already-fixed/base.txt → ...orkspaces/app-with-already-fixed/base.txt
diff --git a/...eady-fixed/core/expected-requirements.txt → ...eady-fixed/core/expected-requirements.txt b/...eady-fixed/core/expected-requirements.txt → ...eady-fixed/core/expected-requirements.txt
diff --git a/...-with-already-fixed/core/requirements.txt → ...-with-already-fixed/core/requirements.txt b/...-with-already-fixed/core/requirements.txt → ...-with-already-fixed/core/requirements.txt
diff --git a/...h-already-fixed/expected-requirements.txt → ...h-already-fixed/expected-requirements.txt b/...h-already-fixed/expected-requirements.txt → ...h-already-fixed/expected-requirements.txt
diff --git a/...ready-fixed/lib/expected-requirements.txt → ...ready-fixed/lib/expected-requirements.txt b/...ready-fixed/lib/expected-requirements.txt → ...ready-fixed/lib/expected-requirements.txt
diff --git a/...p-with-already-fixed/lib/requirements.txt → ...p-with-already-fixed/lib/requirements.txt b/...p-with-already-fixed/lib/requirements.txt → ...p-with-already-fixed/lib/requirements.txt
diff --git a/...s/app-with-already-fixed/requirements.txt → ...s/app-with-already-fixed/requirements.txt b/...s/app-with-already-fixed/requirements.txt → ...s/app-with-already-fixed/requirements.txt
diff --git a/.../workspaces/app-with-constraints/base.txt → .../workspaces/app-with-constraints/base.txt b/.../workspaces/app-with-constraints/base.txt → .../workspaces/app-with-constraints/base.txt
diff --git a/...aces/app-with-constraints/constraints.txt → ...aces/app-with-constraints/constraints.txt b/...aces/app-with-constraints/constraints.txt → ...aces/app-with-constraints/constraints.txt
diff --git a/...with-constraints/expected-constraints.txt → ...with-constraints/expected-constraints.txt b/...with-constraints/expected-constraints.txt → ...with-constraints/expected-constraints.txt
diff --git a/...ith-constraints/expected-requirements.txt → ...ith-constraints/expected-requirements.txt b/...ith-constraints/expected-requirements.txt → ...ith-constraints/expected-requirements.txt
diff --git a/...constraints/lib/expected-requirements.txt → ...constraints/lib/expected-requirements.txt b/...constraints/lib/expected-requirements.txt → ...constraints/lib/expected-requirements.txt
diff --git a/...app-with-constraints/lib/requirements.txt → ...app-with-constraints/lib/requirements.txt b/...app-with-constraints/lib/requirements.txt → ...app-with-constraints/lib/requirements.txt
diff --git a/...ces/app-with-constraints/requirements.txt → ...ces/app-with-constraints/requirements.txt b/...ces/app-with-constraints/requirements.txt → ...ces/app-with-constraints/requirements.txt
diff --git a/...es/workspaces/basic-with-newline/prod.txt → ...es/workspaces/basic-with-newline/prod.txt b/...es/workspaces/basic-with-newline/prod.txt → ...es/workspaces/basic-with-newline/prod.txt
diff --git a/...te-dependencies/workspaces/basic/prod.txt → ...te-dependencies/workspaces/basic/prod.txt b/...te-dependencies/workspaces/basic/prod.txt → ...te-dependencies/workspaces/basic/prod.txt
diff --git a/...dencies/workspaces/long-versions/prod.txt → ...dencies/workspaces/long-versions/prod.txt b/...dencies/workspaces/long-versions/prod.txt → ...dencies/workspaces/long-versions/prod.txt
diff --git a/...dencies/workspaces/lower-case-dep/req.txt → ...dencies/workspaces/lower-case-dep/req.txt b/...dencies/workspaces/lower-case-dep/req.txt → ...dencies/workspaces/lower-case-dep/req.txt
diff --git a/...kspaces/monorepo/with-comparator/prod.txt → ...kspaces/monorepo/with-comparator/prod.txt b/...kspaces/monorepo/with-comparator/prod.txt → ...kspaces/monorepo/with-comparator/prod.txt
diff --git a/...spaces/pip-app-multiple-versions/base.txt → ...spaces/pip-app-multiple-versions/base.txt b/...spaces/pip-app-multiple-versions/base.txt → ...spaces/pip-app-multiple-versions/base.txt
diff --git a/...paces/pip-app-multiple-versions/base2.txt → ...paces/pip-app-multiple-versions/base2.txt b/...paces/pip-app-multiple-versions/base2.txt → ...paces/pip-app-multiple-versions/base2.txt
diff --git a/...p-multiple-versions/core/requirements.txt → ...p-multiple-versions/core/requirements.txt b/...p-multiple-versions/core/requirements.txt → ...p-multiple-versions/core/requirements.txt
diff --git a/...pp-multiple-versions/lib/requirements.txt → ...pp-multiple-versions/lib/requirements.txt b/...pp-multiple-versions/lib/requirements.txt → ...pp-multiple-versions/lib/requirements.txt
diff --git a/...ip-app-multiple-versions/requirements.txt → ...ip-app-multiple-versions/requirements.txt b/...ip-app-multiple-versions/requirements.txt → ...ip-app-multiple-versions/requirements.txt
diff --git a/...-dependencies/workspaces/pip-app/base.txt → ...-dependencies/workspaces/pip-app/base.txt b/...-dependencies/workspaces/pip-app/base.txt → ...-dependencies/workspaces/pip-app/base.txt
diff --git a/...dependencies/workspaces/pip-app/base2.txt → ...dependencies/workspaces/pip-app/base2.txt b/...dependencies/workspaces/pip-app/base2.txt → ...dependencies/workspaces/pip-app/base2.txt
diff --git a/.../workspaces/pip-app/core/requirements.txt → .../workspaces/pip-app/core/requirements.txt b/.../workspaces/pip-app/core/requirements.txt → .../workspaces/pip-app/core/requirements.txt
diff --git a/...s/workspaces/pip-app/lib/requirements.txt → ...s/workspaces/pip-app/lib/requirements.txt b/...s/workspaces/pip-app/lib/requirements.txt → ...s/workspaces/pip-app/lib/requirements.txt
diff --git a/...ncies/workspaces/pip-app/requirements.txt → ...ncies/workspaces/pip-app/requirements.txt b/...ncies/workspaces/pip-app/requirements.txt → ...ncies/workspaces/pip-app/requirements.txt
diff --git a/...encies/workspaces/python-markers/prod.txt → ...encies/workspaces/python-markers/prod.txt b/...encies/workspaces/python-markers/prod.txt → ...encies/workspaces/python-markers/prod.txt
diff --git a/...ncies/workspaces/with-comparator/prod.txt → ...ncies/workspaces/with-comparator/prod.txt b/...ncies/workspaces/with-comparator/prod.txt → ...ncies/workspaces/with-comparator/prod.txt
diff --git a/...s/with-custom-formatting/requirements.txt → ...s/with-custom-formatting/requirements.txt b/...s/with-custom-formatting/requirements.txt → ...s/with-custom-formatting/requirements.txt
diff --git a/...orkspaces/with-multiple-requires/base.txt → ...orkspaces/with-multiple-requires/base.txt b/...orkspaces/with-multiple-requires/base.txt → ...orkspaces/with-multiple-requires/base.txt
diff --git a/...workspaces/with-multiple-requires/dev.txt → ...workspaces/with-multiple-requires/dev.txt b/...workspaces/with-multiple-requires/dev.txt → ...workspaces/with-multiple-requires/dev.txt
diff --git a/...aces/with-multiple-requires/reqs/base.txt → ...aces/with-multiple-requires/reqs/base.txt b/...aces/with-multiple-requires/reqs/base.txt → ...aces/with-multiple-requires/reqs/base.txt
diff --git a/...th-multiple-requires/reqs/constraints.txt → ...th-multiple-requires/reqs/constraints.txt b/...th-multiple-requires/reqs/constraints.txt → ...th-multiple-requires/reqs/constraints.txt
diff --git a/...rkspaces/with-recursive-requires/base.txt → ...rkspaces/with-recursive-requires/base.txt b/...rkspaces/with-recursive-requires/base.txt → ...rkspaces/with-recursive-requires/base.txt
diff --git a/...s/with-recursive-requires/constraints.txt → ...s/with-recursive-requires/constraints.txt b/...s/with-recursive-requires/constraints.txt → ...s/with-recursive-requires/constraints.txt
diff --git a/...orkspaces/with-recursive-requires/dev.txt → ...orkspaces/with-recursive-requires/dev.txt b/...orkspaces/with-recursive-requires/dev.txt → ...orkspaces/with-recursive-requires/dev.txt
diff --git a/...orkspaces/with-require-folder-up/base.txt → ...orkspaces/with-require-folder-up/base.txt b/...orkspaces/with-require-folder-up/base.txt → ...orkspaces/with-require-folder-up/base.txt
diff --git a/...h-require-folder-up/reqs/requirements.txt → ...h-require-folder-up/reqs/requirements.txt b/...h-require-folder-up/reqs/requirements.txt → ...h-require-folder-up/reqs/requirements.txt
diff --git a/...ndencies/workspaces/with-require/base.txt → ...ndencies/workspaces/with-require/base.txt b/...ndencies/workspaces/with-require/base.txt → ...ndencies/workspaces/with-require/base.txt
diff --git a/...endencies/workspaces/with-require/dev.txt → ...endencies/workspaces/with-require/dev.txt b/...endencies/workspaces/with-require/dev.txt → ...endencies/workspaces/with-require/dev.txt
diff --git a/...lugins/python/handlers/update-dependencies/__snapshots__/update-dependencies.spec.ts.snap b/...lugins/python/handlers/update-dependencies/__snapshots__/update-dependencies.spec.ts.snap