fix cf worker esbuild test

carstenlebek · Mar 17, 2022 · 14f4fed · 14f4fed
1 parent 8c2eec2
commit 14f4fed
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 7 deletions.
diff --git a/examples/cloudflare-workers-esbuild/.test-dev.spec.ts b/examples/cloudflare-workers-esbuild/.test-dev.spec.ts
@@ -1,2 +1,2 @@
 import { testRun } from '../cloudflare-workers/.testRun'
-testRun('npm run dev', { hasStarWarsPage: true })
+testRun('npm run dev', { hasStarWarsPage: true, isCustomBuild: true })
diff --git a/examples/cloudflare-workers-esbuild/.test-miniflare.spec.ts b/examples/cloudflare-workers-esbuild/.test-miniflare.spec.ts
@@ -1,2 +1,2 @@
 import { testRun } from '../cloudflare-workers/.testRun'
-testRun('npm run preview:miniflare', { hasStarWarsPage: true })
+testRun('npm run preview:miniflare', { hasStarWarsPage: true, isCustomBuild: true })
diff --git a/examples/cloudflare-workers-esbuild/.test-wrangler.spec.ts b/examples/cloudflare-workers-esbuild/.test-wrangler.spec.ts
@@ -1,2 +1,2 @@
 import { testRun } from '../cloudflare-workers/.testRun'
-testRun('npm run preview:wrangler', { hasStarWarsPage: true })
+testRun('npm run preview:wrangler', { hasStarWarsPage: true, isCustomBuild: true })
diff --git a/examples/cloudflare-workers/.testRun.ts b/examples/cloudflare-workers/.testRun.ts
@@ -5,20 +5,24 @@ export { testRun }
 
 function testRun(
   cmd: 'npm run dev' | 'npm run preview:miniflare' | 'npm run preview:wrangler',
-  { hasStarWarsPage }: { hasStarWarsPage: boolean },
+  { hasStarWarsPage, isCustomBuild }: { hasStarWarsPage?: true; isCustomBuild?: true },
 ) {
   const isMiniflare = cmd === 'npm run preview:miniflare'
   const isWrangler = cmd === 'npm run preview:wrangler'
   const isWorker = isMiniflare || isWrangler
 
   if ((isWindows() || isNode12()) && isWorker) {
-    test('SKIPED: miniflare and wrangler', () => {})
+    const msg = 'SKIPED: miniflare and wrangler'
+    console.log(msg)
+    test(msg, () => {})
     return
   }
 
   if (isWrangler) {
     if (!isGithubAction() || process.env['GIT_BRANCH'] !== 'master') {
-      test('SKIPED: wrangler test is not run locally nor in Pull Requests', () => {})
+      const msg = 'SKIPED: wrangler test is not run locally nor in Pull Requests'
+      console.log(msg)
+      test(msg, () => {})
       return
     }
     test('API keys', () => {
@@ -31,7 +35,7 @@ function testRun(
   {
     const additionalTimeout = !isWorker ? 0 : (isGithubAction() ? 2 : 1) * 120 * 1000
     const serverIsReadyMessage = (() => {
-      if (isMiniflare) {
+      if (isMiniflare || isCustomBuild) {
         return 'Listening on'
       }
       if (isWrangler) {