Merge pull request #2160 from snyk/test/flakey-test-232

test: use common test setup
snyk · Aug 12, 2021 · 271a052 · 271a052
2 parents a898dfb + 25b201c
commit 271a052
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 27 deletions.
diff --git a/test/jest/acceptance/snyk-test-all-projects-exit-codes.spec.ts b/test/jest/acceptance/snyk-test-all-projects-exit-codes.spec.ts
@@ -1,14 +1,17 @@
-import { createCLITestHarness } from '../util/snyk-cli-test-harness';
+import { createProject } from '../util/createProject';
+import { runSnykCLI } from '../util/runSnykCLI';
 
 jest.setTimeout(1000 * 60 * 5);
 
 describe('snyk test -all-projects with one project that has errors', () => {
   describe('and another that has issues (vulnerabilities)', () => {
     it('should exit with exit code 1', async () => {
-      const test = createCLITestHarness(
+      const project = await createProject(
         'snyk-test-all-projects-exit-codes/project-with-issues-and-project-with-error',
       );
-      const { code, stderr } = await test.test();
+      const { code, stderr } = await runSnykCLI(`test --all-projects`, {
+        cwd: project.path(),
+      });
       expect(code).toEqual(1);
       expect(stderr).toContain(
         '1/2 potential projects failed to get dependencies. Run with `-d` for debug output.',
@@ -19,10 +22,12 @@ describe('snyk test -all-projects with one project that has errors', () => {
   describe('and another has no issues (vulnerabilities)', () => {
     // note: actually, this is a bug. It should really have exit code 2, but that is a big change that we need to do
     it('should exit with exit code 0', async () => {
-      const test = createCLITestHarness(
+      const project = await createProject(
         'snyk-test-all-projects-exit-codes/project-with-no-issues-and-project-with-error',
       );
-      const { code, stderr } = await test.test();
+      const { code, stderr } = await runSnykCLI(`test --all-projects`, {
+        cwd: project.path(),
+      });
       expect(code).toEqual(0);
       expect(stderr).toContain(
         '1/2 potential projects failed to get dependencies. Run with `-d` for debug output.',

diff --git a/test/jest/util/snyk-cli-test-harness.ts b/test/jest/util/snyk-cli-test-harness.ts