@@ -8,6 +8,9 @@ import WebSocket from "ws";
88import { WranglerE2ETestHelper } from "./helpers/e2e-wrangler-test" ;
99import { generateResourceName } from "./helpers/generate-resource-name" ;
1010
11+ const port = await getPort ( ) ;
12+ const inspectorPort = await getPort ( ) ;
13+
1114const RUNTIMES = [
1215 { flags : "" , runtime : "local" } ,
1316 { flags : "--remote" , runtime : "remote" } ,
@@ -60,7 +63,9 @@ describe.sequential.each(RUNTIMES)("Core: $flags", ({ runtime, flags }) => {
6063 }
6164 ` ,
6265 } ) ;
63- const worker = helper . runLongLived ( `wrangler dev ${ flags } ` ) ;
66+ const worker = helper . runLongLived (
67+ `wrangler dev ${ flags } --port ${ port } --inspector-port ${ inspectorPort } `
68+ ) ;
6469 const { url } = await worker . waitForReady ( ) ;
6570 let res = await fetch ( url ) ;
6671
@@ -98,7 +103,9 @@ describe.sequential.each(RUNTIMES)("Core: $flags", ({ runtime, flags }) => {
98103 });
99104 ` ,
100105 } ) ;
101- const worker = helper . runLongLived ( `wrangler dev ${ flags } ` ) ;
106+ const worker = helper . runLongLived (
107+ `wrangler dev ${ flags } --port ${ port } --inspector-port ${ inspectorPort } `
108+ ) ;
102109 const { url } = await worker . waitForReady ( ) ;
103110 let res = await fetch ( url ) ;
104111 expect ( await res . text ( ) ) . toBe ( "service worker" ) ;
@@ -147,7 +154,9 @@ describe.sequential.each(RUNTIMES)("Core: $flags", ({ runtime, flags }) => {
147154 }
148155 ` ,
149156 } ) ;
150- const worker = helper . runLongLived ( `wrangler dev ${ flags } ` ) ;
157+ const worker = helper . runLongLived (
158+ `wrangler dev ${ flags } --port ${ port } --inspector-port ${ inspectorPort } `
159+ ) ;
151160 const { url } = await worker . waitForReady ( ) ;
152161 const res = await fetch ( url ) ;
153162 expect ( await res . json ( ) ) . toEqual ( {
@@ -158,8 +167,6 @@ describe.sequential.each(RUNTIMES)("Core: $flags", ({ runtime, flags }) => {
158167 } ) ;
159168
160169 it ( "starts inspector and allows debugging" , async ( ) => {
161- const inspectorPort = await getPort ( ) ;
162-
163170 await helper . seed ( {
164171 "wrangler.toml" : dedent `
165172 name = "${ workerName } "
@@ -173,7 +180,7 @@ describe.sequential.each(RUNTIMES)("Core: $flags", ({ runtime, flags }) => {
173180 ` ,
174181 } ) ;
175182 const worker = helper . runLongLived (
176- `wrangler dev ${ flags } --inspector-port= ${ inspectorPort } `
183+ `wrangler dev ${ flags } --port ${ port } -- inspector-port ${ inspectorPort } `
177184 ) ;
178185 await worker . waitForReady ( ) ;
179186 const inspectorUrl = new URL ( `ws://127.0.0.1:${ inspectorPort } ` ) ;
@@ -198,7 +205,7 @@ describe.sequential.each(RUNTIMES)("Core: $flags", ({ runtime, flags }) => {
198205 ` ,
199206 } ) ;
200207 const worker = helper . runLongLived (
201- `wrangler dev ${ flags } --local-protocol=https`
208+ `wrangler dev ${ flags } --port ${ port } --inspector-port ${ inspectorPort } -- local-protocol=https`
202209 ) ;
203210 const { url } = await worker . waitForReady ( ) ;
204211 const parsedURL = new URL ( url ) ;
@@ -224,7 +231,7 @@ describe.sequential.each(RUNTIMES)("Core: $flags", ({ runtime, flags }) => {
224231 } ) ;
225232 // TODO(soon): explore using `--host` for remote mode in this test
226233 const worker = helper . runLongLived (
227- `wrangler dev ${ flags } --local-upstream=example.com`
234+ `wrangler dev ${ flags } --port ${ port } --inspector-port ${ inspectorPort } -- local-upstream=example.com`
228235 ) ;
229236 const { url } = await worker . waitForReady ( ) ;
230237 const res = await fetch ( url ) ;
@@ -270,7 +277,9 @@ describe.sequential.each(RUNTIMES)("Bindings: $flags", ({ runtime, flags }) => {
270277 });
271278 ` ,
272279 } ) ;
273- const worker = helper . runLongLived ( `wrangler dev ${ flags } ` ) ;
280+ const worker = helper . runLongLived (
281+ `wrangler dev ${ flags } --port ${ port } --inspector-port ${ inspectorPort } `
282+ ) ;
274283 const { url } = await worker . waitForReady ( ) ;
275284 const res = await fetch ( url ) ;
276285 expect ( await res . json ( ) ) . toEqual ( {
@@ -298,7 +307,9 @@ describe.sequential.each(RUNTIMES)("Bindings: $flags", ({ runtime, flags }) => {
298307 });
299308 ` ,
300309 } ) ;
301- const worker = helper . runLongLived ( `wrangler dev ${ flags } ` ) ;
310+ const worker = helper . runLongLived (
311+ `wrangler dev ${ flags } --port ${ port } --inspector-port ${ inspectorPort } `
312+ ) ;
302313 const { url } = await worker . waitForReady ( ) ;
303314 const res = await fetch ( url ) ;
304315 expect ( await res . text ( ) ) . toBe ( "3" ) ;
@@ -330,7 +341,9 @@ describe.sequential.each(RUNTIMES)("Bindings: $flags", ({ runtime, flags }) => {
330341 }
331342 ` ,
332343 } ) ;
333- const worker = helper . runLongLived ( `wrangler dev ${ flags } ` ) ;
344+ const worker = helper . runLongLived (
345+ `wrangler dev ${ flags } --port ${ port } --inspector-port ${ inspectorPort } `
346+ ) ;
334347 const { url } = await worker . waitForReady ( ) ;
335348 const res = await fetch ( url ) ;
336349 expect ( await res . text ( ) ) . toBe ( "existing-value" ) ;
@@ -399,7 +412,9 @@ describe.sequential.each(RUNTIMES)("Bindings: $flags", ({ runtime, flags }) => {
399412 ` ,
400413 } ) ;
401414
402- const worker = helper . runLongLived ( `wrangler dev ${ flags } ` ) ;
415+ const worker = helper . runLongLived (
416+ `wrangler dev ${ flags } --port ${ port } --inspector-port ${ inspectorPort } `
417+ ) ;
403418 const { url } = await worker . waitForReady ( ) ;
404419 const res = await fetch ( url ) ;
405420 expect ( await res . text ( ) ) . toBe ( "<h1>👋</h1>" ) ;
@@ -432,7 +447,9 @@ describe.sequential.each(RUNTIMES)("Bindings: $flags", ({ runtime, flags }) => {
432447 }
433448 ` ,
434449 } ) ;
435- const worker = helper . runLongLived ( `wrangler dev ${ flags } ` ) ;
450+ const worker = helper . runLongLived (
451+ `wrangler dev ${ flags } --port ${ port } --inspector-port ${ inspectorPort } `
452+ ) ;
436453 const { url } = await worker . waitForReady ( ) ;
437454 const res = await fetch ( url ) ;
438455 expect ( await res . text ( ) ) . toBe ( "existing-value" ) ;
@@ -483,7 +500,9 @@ describe.sequential.each(RUNTIMES)("Bindings: $flags", ({ runtime, flags }) => {
483500 `wrangler d1 execute ${ d1ResourceFlags } DB --file schema.sql`
484501 ) ;
485502 // D1 defaults to `--local`, so we deliberately use `flags`, not `resourceFlags`
486- const worker = helper . runLongLived ( `wrangler dev ${ flags } ` ) ;
503+ const worker = helper . runLongLived (
504+ `wrangler dev ${ flags } --port ${ port } --inspector-port ${ inspectorPort } `
505+ ) ;
487506 const { url } = await worker . waitForReady ( ) ;
488507 const res = await fetch ( url ) ;
489508 expect ( await res . json ( ) ) . toEqual ( [ { key : "key1" , value : "value1" } ] ) ;
@@ -551,7 +570,7 @@ describe.sequential.each(RUNTIMES)("Bindings: $flags", ({ runtime, flags }) => {
551570 } ) ;
552571
553572 const worker = helper . runLongLived (
554- `wrangler dev ${ flags } --experimental-vectorize-bind-to-prod`
573+ `wrangler dev ${ flags } --port ${ port } --inspector-port ${ inspectorPort } -- experimental-vectorize-bind-to-prod`
555574 ) ;
556575 const { url } = await worker . waitForReady ( ) ;
557576 const res = await fetch ( url ) ;
@@ -585,7 +604,9 @@ describe.sequential.each(RUNTIMES)("Bindings: $flags", ({ runtime, flags }) => {
585604 ` ,
586605 } ) ;
587606
588- const worker = helper . runLongLived ( `wrangler dev ${ flags } ` ) ;
607+ const worker = helper . runLongLived (
608+ `wrangler dev ${ flags } --port ${ port } --inspector-port ${ inspectorPort } `
609+ ) ;
589610 const { url } = await worker . waitForReady ( ) ;
590611 const res = await fetch ( url ) ;
591612
@@ -619,7 +640,9 @@ describe.sequential.each(RUNTIMES)("Bindings: $flags", ({ runtime, flags }) => {
619640 }
620641 ` ,
621642 } ) ;
622- const worker = helper . runLongLived ( `wrangler dev ${ flags } ` ) ;
643+ const worker = helper . runLongLived (
644+ `wrangler dev ${ flags } --port ${ port } --inspector-port ${ inspectorPort } `
645+ ) ;
623646 const { url } = await worker . waitForReady ( ) ;
624647 await fetch ( url ) ;
625648 await worker . readUntil ( / ✉ ️ / ) ;
@@ -659,7 +682,9 @@ describe.sequential.each(RUNTIMES)("Bindings: $flags", ({ runtime, flags }) => {
659682 }
660683 ` ,
661684 } ) ;
662- const worker = helper . runLongLived ( `wrangler dev ${ flags } ` ) ;
685+ const worker = helper . runLongLived (
686+ `wrangler dev ${ flags } --port ${ port } --inspector-port ${ inspectorPort } `
687+ ) ;
663688 const { url } = await worker . waitForReady ( ) ;
664689 const res = await fetch ( url ) ;
665690
0 commit comments