Skip to content

Commit fa1c7a4

Browse files
samsonasiksamsonasik
committed
clean up request var in Expressive spec
1 parent 34660b1 commit fa1c7a4

File tree

1 file changed

+33
-131
lines changed

1 file changed

+33
-131
lines changed

‎spec/Middleware/ExpressiveSpec.php‎

Lines changed: 33 additions & 131 deletions
Original file line numberDiff line numberDiff line change
@@ -212,6 +212,23 @@
212212
);
213213
});
214214

215+
given('request', function () {
216+
217+
return new ServerRequest(
218+
[],
219+
[],
220+
new Uri('http://example.com'),
221+
'GET',
222+
'php://memory',
223+
[],
224+
[],
225+
[],
226+
'',
227+
'1.2'
228+
);
229+
230+
});
231+
215232
given('middleware', function () {
216233
return new Expressive(
217234
$this->config,
@@ -225,48 +242,23 @@
225242
it('returns handle() when not enabled', function () {
226243

227244
$config['enable'] = false;
228-
229-
$request = new ServerRequest(
230-
[],
231-
[],
232-
new Uri('http://example.com'),
233-
'GET',
234-
'php://memory',
235-
[],
236-
[],
237-
[],
238-
'',
239-
'1.2'
240-
);
241245
$handler = Double::instance(['implements' => RequestHandlerInterface::class]);
242-
allow($handler)->toReceive('handle')->with($request)->andReturn(new Response());
246+
allow($handler)->toReceive('handle')->with($this->request)->andReturn(new Response());
243247
$middleware = new Expressive($config, $this->logging, $this->renderer);
244248

245-
$actual = $middleware->process($request, $handler);
249+
$actual = $middleware->process($this->request, $handler);
246250
expect($actual)->toBeAnInstanceOf(ResponseInterface::class);
247251

248252
});
249253

250254
it('returns handle() when no error', function () {
251255

252-
$request = new ServerRequest(
253-
[],
254-
[],
255-
new Uri('http://example.com'),
256-
'GET',
257-
'php://memory',
258-
[],
259-
[],
260-
[],
261-
'',
262-
'1.2'
263-
);
264256
$handler = Double::instance(['implements' => RequestHandlerInterface::class]);
265-
allow($handler)->toReceive('handle')->with($request)->andReturn(new Response());
257+
allow($handler)->toReceive('handle')->with($this->request)->andReturn(new Response());
266258

267-
allow(Logging::class)->toReceive('setServerRequestandRequestUri')->with($request);
259+
allow(Logging::class)->toReceive('setServerRequestandRequestUri')->with($this->request);
268260

269-
$actual = $this->middleware->process($request, $handler);
261+
$actual = $this->middleware->process($this->request, $handler);
270262
expect($actual)->toBeAnInstanceOf(ResponseInterface::class);
271263

272264
});
@@ -286,25 +278,13 @@
286278
null
287279
);
288280

289-
$request = new ServerRequest(
290-
[],
291-
[],
292-
new Uri('http://example.com'),
293-
'GET',
294-
'php://memory',
295-
[],
296-
[],
297-
[],
298-
'',
299-
'1.2'
300-
);
301281
$handler = Double::instance(['implements' => RequestHandlerInterface::class]);
302-
allow($handler)->toReceive('handle')->with($request)->andRun(function () {
282+
allow($handler)->toReceive('handle')->with($this->request)->andRun(function () {
303283
throw new \Exception('message');
304284
});
305285
$middleware = new Expressive($config, $logging, $this->renderer);
306286

307-
$actual = $middleware->process($request, $handler);
287+
$actual = $middleware->process($this->request, $handler);
308288
expect($actual)->toBeAnInstanceOf(Response::class);
309289

310290
$content = $actual->getBody()->__toString();
@@ -326,26 +306,14 @@
326306
null
327307
);
328308

329-
$request = new ServerRequest(
330-
[],
331-
[],
332-
new Uri('http://example.com'),
333-
'GET',
334-
'php://memory',
335-
[],
336-
[],
337-
[],
338-
'',
339-
'1.2'
340-
);
341309
$handler = Double::instance(['implements' => RequestHandlerInterface::class]);
342-
allow($handler)->toReceive('handle')->with($request)->andRun(function () {
310+
allow($handler)->toReceive('handle')->with($this->request)->andRun(function () {
343311
throw new \Exception('message');
344312
});
345313
$middleware = new Expressive($config, $logging, $this->renderer);
346314

347-
$closure = function () use ($middleware, $request, $handler) {
348-
$middleware->process($request, $handler);
315+
$closure = function () use ($middleware, $handler) {
316+
$middleware->process($this->request, $handler);
349317
};
350318
expect($closure)->toThrow(new \Exception('message'));
351319

@@ -364,18 +332,7 @@
364332
null
365333
);
366334

367-
$request = new ServerRequest(
368-
[],
369-
[],
370-
new Uri('http://example.com'),
371-
'GET',
372-
'php://memory',
373-
[],
374-
[],
375-
[],
376-
'',
377-
'1.2'
378-
);
335+
$request = $this->request;
379336
$request = $request->withHeader('X-Requested-With', 'XmlHttpRequest');
380337
$handler = Double::instance(['implements' => RequestHandlerInterface::class]);
381338
allow($handler)->toReceive('handle')->with($request)->andRun(function () {
@@ -410,18 +367,7 @@
410367
null
411368
);
412369

413-
$request = new ServerRequest(
414-
[],
415-
[],
416-
new Uri('http://example.com'),
417-
'GET',
418-
'php://memory',
419-
[],
420-
[],
421-
[],
422-
'',
423-
'1.2'
424-
);
370+
$request = $this->request;
425371
$request = $request->withHeader('X-Requested-With', 'XmlHttpRequest');
426372
$handler = Double::instance(['implements' => RequestHandlerInterface::class]);
427373
allow($handler)->toReceive('handle')->with($request)->andRun(function () {
@@ -456,18 +402,7 @@
456402
null
457403
);
458404

459-
$request = new ServerRequest(
460-
[],
461-
[],
462-
new Uri('http://example.com'),
463-
'GET',
464-
'php://memory',
465-
[],
466-
[],
467-
[],
468-
'',
469-
'1.2'
470-
);
405+
$request = $this->request;
471406
$request = $request->withHeader('X-Requested-With', 'XmlHttpRequest');
472407
$handler = Double::instance(['implements' => RequestHandlerInterface::class]);
473408
allow($handler)->toReceive('handle')->with($request)->andRun(function () {
@@ -504,18 +439,7 @@
504439
null
505440
);
506441

507-
$request = new ServerRequest(
508-
[],
509-
[],
510-
new Uri('http://example.com'),
511-
'GET',
512-
'php://memory',
513-
[],
514-
[],
515-
[],
516-
'',
517-
'1.2'
518-
);
442+
$request = $this->request;
519443
$request = $request->withHeader('X-Requested-With', 'XmlHttpRequest');
520444
$handler = Double::instance(['implements' => RequestHandlerInterface::class]);
521445
allow($handler)->toReceive('handle')->with($request)->andRun(function () use ($exception) {
@@ -641,18 +565,7 @@
641565
$request = & Closure::bind(function & ($middleware) {
642566
return $middleware->request;
643567
}, null, $middleware)($middleware);
644-
$request = new ServerRequest(
645-
[],
646-
[],
647-
new Uri('http://example.com'),
648-
'GET',
649-
'php://memory',
650-
[],
651-
[],
652-
[],
653-
'',
654-
'1.2'
655-
);
568+
$request = $this->request;
656569

657570
$closure = function () use ($middleware) {
658571
$middleware->execOnShutdown();
@@ -726,18 +639,7 @@
726639
$request = & Closure::bind(function & ($middleware) {
727640
return $middleware->request;
728641
}, null, $middleware)($middleware);
729-
$request = new ServerRequest(
730-
[],
731-
[],
732-
new Uri('http://example.com'),
733-
'GET',
734-
'php://memory',
735-
[],
736-
[],
737-
[],
738-
'',
739-
'1.2'
740-
);
642+
$request = $this->request;
741643

742644
expect($middleware->execOnShutdown())->toBeNull();
743645

0 commit comments

Comments
 (0)