Tests: fix after big refactoring

vercel-community · Aug 16, 2019 · d152508 · d152508
1 parent 64fbef8
commit d152508
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 17 deletions.
diff --git a/package.json b/package.json
@@ -1,15 +1,19 @@
 {
   "scripts": {
-    "watch": "tsc --watch",
-    "build": "tsc",
-    "test": "tsc && jest --verbose",
-    "test-watch": "jest --verbose --watch",
-    "prepublishOnly": "tsc"
+    "test": "jest --verbose",
+    "test-watch": "jest --verbose --watch"
   },
   "jest": {
     "testEnvironment": "node",
     "testMatch": [
-      "**/spec/**/*.[jt]s?(x)"
+      "**/spec/**/*.js"
+    ],
+    "testPathIgnorePatterns": [
+      "/docs",
+      "/errors",
+      "/examples",
+      "/node_modules",
+      "/packages"
     ],
     "rootDir": "."
   },

diff --git a/test/lib/deployment/test-deployment.js b/test/lib/deployment/test-deployment.js
@@ -33,7 +33,7 @@ async function testDeployment(
   // Load nowignore from fixture dir
   let nowIgnoreGlob = '';
   const nowIgnoreFile = `${fixturePath}/.nowignore`;
-  if (fs.exists(nowIgnoreFile)) {
+  if (fs.existsSync(nowIgnoreFile)) {
     console.log('nowignore file found', nowIgnoreFile);
     const ignores = fs.readFileSync(nowIgnoreFile).toString().split('\n').filter((el) => el.length > 0);
     nowIgnoreGlob = '!(' + ignores.join('|') + ')';

diff --git a/test/spec/fixtures.js b/test/spec/fixtures.js
@@ -1,4 +1,3 @@
-/* global beforeAll, expect, it, jest */
 const fs = require('fs');
 const path = require('path');
 
@@ -12,7 +11,7 @@ const buildUtilsUrl = '@canary';
 let builderUrl;
 
 beforeAll(async () => {
-  const builderPath = path.resolve(__dirname, '..', '..');
+  const builderPath = path.resolve(__dirname, '../../packages/php');
   console.log('builderPath', builderPath);
   builderUrl = await packAndDeploy(builderPath);
   console.log('builderUrl', builderUrl);
@@ -24,20 +23,18 @@ const fixturesPath = path.resolve(__dirname, '..', 'fixtures');
 if (process.env.FIXTURE) {
   testFixture(process.env.FIXTURE);
 } else {
-  // eslint-disable-next-line no-restricted-syntax
   for (const fixture of fs.readdirSync(fixturesPath)) {
     testFixture(fixture);
   }
 }
 
 function testFixture(fixture) {
-  // eslint-disable-next-line no-loop-func
   it(`should build ${fixture}`, async () => {
-    await expect(
-      testDeployment(
-        { builderUrl, buildUtilsUrl },
-        path.join(fixturesPath, fixture),
-      ),
-    ).resolves.toBeDefined();
+    const res = await testDeployment(
+      { builderUrl, buildUtilsUrl },
+      path.join(fixturesPath, fixture),
+    );
+
+    expect(res).toBeDefined();
   });
 }