Skip remote E2E tests when no auth available #9826
Merged
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
|
penalosa
force-pushed
the
penalosa/local-e2e
branch
from
afc5e63 to
547637d
Compare
create-cloudflare
@cloudflare/kv-asset-handler
miniflare
@cloudflare/pages-shared
@cloudflare/unenv-preset
@cloudflare/vite-plugin
@cloudflare/vitest-pool-workers
@cloudflare/workers-editor-shared
wrangler
commit: |
penalosa
commented
Jul 2, 2025
Comment on lines
-62
to
-64
| WRANGLER: node --no-warnings ${{ github.workspace}}/packages/wrangler/bin/wrangler.js | ||
| WRANGLER_IMPORT: ${{ github.workspace}}/packages/wrangler/wrangler-dist/cli.js | ||
| MINIFLARE_IMPORT: ${{ github.workspace}}/packages/miniflare/dist/src/index.js |
There was a problem hiding this comment.
See tools/e2e/runIndividualE2EFiles.ts for this
petebacondarwin
approved these changes
Jul 3, 2025
Comment on lines
+63
to
+75
|
|
||
| // If the user hasn't specifically set an inspector port, set it to 0 to reduce port conflicts | ||
| const inspectorPort = | ||
| command.includes(`--inspector-port`) || !command.startsWith("wrangler dev") | ||
| ? "" | ||
| : " --inspector-port 0"; | ||
|
|
||
| // If the user hasn't specifically set a Worker port, set it to 0 to reduce port conflicts | ||
| const workerPort = | ||
| command.includes(`--port`) || !command.startsWith("wrangler dev") | ||
| ? "" | ||
| : " --port 0"; | ||
| return `${WRANGLER} ${command.slice("wrangler ".length)}${inspectorPort}${workerPort}`; |
Comment on lines
835
to
848
| CLOUDFLARE_ACCOUNT_ID | ||
| ? [ | ||
| { imagesMode: "remote", extraFlags: "" }, | ||
| { | ||
| imagesMode: "local", | ||
| extraFlags: "--experimental-images-local-mode", | ||
| }, | ||
| ] | ||
| : [ | ||
| { | ||
| imagesMode: "local", | ||
| extraFlags: "--experimental-images-local-mode", | ||
| }, | ||
| ] |
There was a problem hiding this comment.
Suggested change
| CLOUDFLARE_ACCOUNT_ID | |
| ? [ | |
| { imagesMode: "remote", extraFlags: "" }, | |
| { | |
| imagesMode: "local", | |
| extraFlags: "--experimental-images-local-mode", | |
| }, | |
| ] | |
| : [ | |
| { | |
| imagesMode: "local", | |
| extraFlags: "--experimental-images-local-mode", | |
| }, | |
| ] | |
| [ | |
| ... (CLOUDFLARE_ACCOUNT_ID ? [{ imagesMode: "remote", extraFlags: "" }] : []), | |
| { | |
| imagesMode: "local", | |
| extraFlags: "--experimental-images-local-mode", | |
| }, | |
| ] |
packages/wrangler/e2e/dev.test.ts
Outdated
Comment on lines
27
to
31
| describe.each( | ||
| CLOUDFLARE_ACCOUNT_ID | ||
| ? [{ cmd: "wrangler dev" }, { cmd: "wrangler dev --remote" }] | ||
| : [{ cmd: "wrangler dev" }] | ||
| )("basic js dev: $cmd", ({ cmd }) => { |
There was a problem hiding this comment.
Suggested change
| describe.each( | |
| CLOUDFLARE_ACCOUNT_ID | |
| ? [{ cmd: "wrangler dev" }, { cmd: "wrangler dev --remote" }] | |
| : [{ cmd: "wrangler dev" }] | |
| )("basic js dev: $cmd", ({ cmd }) => { | |
| describe.each([ | |
| ... (CLOUDFLARE_ACCOUNT_ID ? [{ cmd: "wrangler dev --remote" }] : []), | |
| { cmd: "wrangler dev" } | |
| ])("basic js dev: $cmd", ({ cmd }) => { |
Comment on lines
7
to
12
| const RUNTIMES = CLOUDFLARE_ACCOUNT_ID | ||
| ? [ | ||
| { flags: "--remote", runtime: "remote" }, | ||
| { flags: "", runtime: "local" }, | ||
| ] | ||
| : [{ flags: "", runtime: "local" }]; |
There was a problem hiding this comment.
Suggested change
| const RUNTIMES = CLOUDFLARE_ACCOUNT_ID | |
| ? [ | |
| { flags: "--remote", runtime: "remote" }, | |
| { flags: "", runtime: "local" }, | |
| ] | |
| : [{ flags: "", runtime: "local" }]; | |
| const RUNTIMES = [ | |
| ...(CLOUDFLARE_ACCOUNT_ID ? [{ flags: "--remote", runtime: "remote" }] : []), | |
| { flags: "", runtime: "local" }, | |
| ] |
Comment on lines
14
to
16
| const OPTIONS = CLOUDFLARE_ACCOUNT_ID | ||
| ? [{ remote: false }, { remote: true }] | ||
| : [{ remote: false }]; |
Comment on lines
+43
to
+45
| process.env.WRANGLER ??= `node --no-warnings ${process.cwd()}/packages/wrangler/bin/wrangler.js`; | ||
| process.env.WRANGLER_IMPORT ??= `${process.cwd()}/packages/wrangler/wrangler-dist/cli.js`; | ||
| process.env.MINIFLARE_IMPORT ??= `${process.cwd()}/packages/miniflare/dist/src/index.js`; |
There was a problem hiding this comment.
To be honest I think we should probably just hard code these into the tests now.
We only had them before because we sometimes tested against beta or production versions of Wrangler, which we don't do now.
In a follow up...
petebacondarwin
approved these changes
Jul 3, 2025
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
A large number of Wrangler's "E2E" tests actually require no Cloudflare auth tokens. This PR changes our E2E setup to enable running
pnpm test:e2e:wranglerwith no other arguments, which will run all non-API-requiring E2E tests, including on forks in CI.Additionally, you can pass arguments to
pnpm test:e2e:wranglerin order to configure Vitest. e.g.pnpm test:e2e:wrangler -uto update snapshots.