ci: don't retry e2e tests (#179)

* ci: don't retry e2e tests

* chore: fix integration tests on ci

* chore: get rid of prepare fixtures on ci

* chore: fix condition

* chore: update

---------

Co-authored-by: Lukas Holzer <lukas.holzer@netlify.com>
Co-authored-by: Lukas Holzer <lukas.holzer@typeflow.cc>

Author: 3 people

.eslintrc.cjs

@@ -23,6 +23,8 @@ module.exports = {
     'promise/catch-or-return': 'off',
     'promise/always-return': 'off',
     'max-nested-callbacks': 'off',
+    'max-statements': 'off',
+    'require-await': 'off',
     'no-inline-comments': 'off',
     'line-comment-position': 'off',
     'max-lines': 'off',

.github/workflows/run-tests.yml

@@ -59,7 +59,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        shard: [1/5, 2/5, 3/5, 4/5, 5/5]
+        shard: [1/8, 2/8, 3/8, 4/8, 5/8, 6/8, 7/8, 8/8]
     steps:
       - uses: actions/checkout@v4
       - name: 'Install Node'

.github/workflows/test-e2e.yml

@@ -131,6 +131,7 @@ jobs:
         env:
           NODE_ENV: production
           NEXT_EXTERNAL_TESTS_FILTERS: ../next-runtime-minimal/tests/netlify-e2e.json
+          NEXT_TEST_SKIP_RETRY_MANIFEST: ../next-runtime-minimal/tests/e2e-skip-retry.json
         run: node run-tests.js -g ${{ matrix.group }}/12 -c ${TEST_CONCURRENCY} --type e2e
         working-directory: ${{ env.next-path }}
 

tests/e2e-skip-retry.json

@@ -13,6 +13,8 @@
     "react-dom": "18.2.0"
   },
   "devDependencies": {
-    "@types/react": "18.2.34"
+    "@types/node": "^20.11.5",
+    "@types/react": "18.2.34",
+    "typescript": "^5.3.3"
   }
 }

tests/fixtures/server-components/package-lock.json

@@ -135,6 +135,15 @@
       "flakey": [
         "app-dir action handling should handle actions correctly after following a relative link"
       ]
+    },
+    "test/e2e/middleware-general/test/index.test.ts": {
+      "flakey": [
+        "Middleware Runtime with i18n should redirect the same for direct visit and client-transition",
+        "Middleware Runtime without i18n should redirect the same for direct visit and client-transition"
+      ]
+    },
+    "test/e2e/prerender.test.ts": {
+      "flakey": ["Prerender should handle on-demand revalidate for fallback: blocking"]
     }
   },
   "rules": {
@@ -180,7 +189,8 @@
       "test/e2e/transpile-packages/index.test.ts",
       "test/e2e/typescript-version-no-warning/typescript-version-no-warning.test.ts",
       "test/e2e/typescript-version-warning/typescript-version-warning.test.ts",
-      "test/e2e/app-dir/app/useReportWebVitals.test.ts"
+      "test/e2e/app-dir/app/useReportWebVitals.test.ts",
+      "test/e2e/app-dir/app-static/app-static-custom-handler.test.ts"
     ]
   }
 }

tests/fixtures/server-components/package.json

@@ -47,11 +47,11 @@ const eszipHelper = join(actualCwd, 'tools/deno/eszip.ts')
 
 function installDependencies(cwd: string) {
   if (existsSync(join(cwd, 'pnpm-lock.yaml'))) {
-    return execaCommand('pnpm install --ignore-scripts --reporter=silent', {
+    return execaCommand(`pnpm install --ignore-scripts --reporter=silent`, {
       cwd,
     })
   }
-  return execaCommand('npm install --ignore-scripts --no-audit --progress=false', { cwd })
+  return execaCommand(`npm install --ignore-scripts --no-audit --progress=false`, { cwd })
 }
 
 /**

tests/netlify-e2e.json

@@ -1,7 +1,7 @@
 import { relative } from 'node:path'
+
 import { defineConfig } from 'vitest/config'
-import { W } from 'vitest/dist/reporters-5f784f42'
-import { BaseSequencer } from 'vitest/node'
+import { BaseSequencer, WorkspaceSpec } from 'vitest/node'
 
 /**
  * Tests that might influence others and should run on an isolated executor (shard)
@@ -11,10 +11,11 @@ const RUN_ISOLATED = new Set([
   'tests/integration/fetch-handler.test.ts',
   'tests/integration/revalidate-path.test.ts',
   'tests/integration/cache-handler.test.ts',
+  'tests/integration/edge-handler.test.ts',
 ])
 
 class Sequencer extends BaseSequencer {
-  async shard(projects: W[]): Promise<W[]> {
+  async shard(projects: WorkspaceSpec[]): Promise<WorkspaceSpec[]> {
     const {
       config: { shard: { index = 1, count = 1 } = {} },
     } = this.ctx
@@ -68,9 +69,10 @@ export default defineConfig({
     unstubEnvs: true,
     unstubGlobals: true,
     environment: 'node',
-    testTimeout: 100000,
+    testTimeout: 100_000,
     setupFiles: ['tests/test-setup.ts'],
     logHeapUsage: true,
+    hookTimeout: 50_000,
     sequence: {
       sequencer: Sequencer,
     },