22
33namespace Tests \Unit \Http \Middleware \Server ;
44
5- use Closure ;
65use Mockery as m ;
7- use Tests \TestCase ;
8- use Illuminate \View \View ;
9- use Illuminate \Http \Request ;
106use Illuminate \Http \Response ;
117use Pterodactyl \Models \Server ;
128use Illuminate \Contracts \Session \Session ;
139use Illuminate \Contracts \Config \Repository ;
14- use Symfony \ Component \ HttpFoundation \ ParameterBag ;
10+ use Tests \ Unit \ Http \ Middleware \ MiddlewareTestCase ;
1511use Pterodactyl \Http \Middleware \AccessingValidServer ;
1612use Pterodactyl \Contracts \Repository \ServerRepositoryInterface ;
1713
18- class AccessingValidServerTest extends TestCase
14+ class AccessingValidServerTest extends MiddlewareTestCase
1915{
2016 /**
2117 * @var \Illuminate\Contracts\Config\Repository|\Mockery\Mock
@@ -27,11 +23,6 @@ class AccessingValidServerTest extends TestCase
2723 */
2824 private $ repository ;
2925
30- /**
31- * @var \Illuminate\Http\Request|\Mockery\Mock
32- */
33- private $ request ;
34-
3526 /**
3627 * @var \Illuminate\Contracts\Session\Session|\Mockery\Mock
3728 */
@@ -46,8 +37,6 @@ public function setUp()
4637
4738 $ this ->config = m::mock (Repository::class);
4839 $ this ->repository = m::mock (ServerRepositoryInterface::class);
49- $ this ->request = m::mock (Request::class);
50- $ this ->request ->attributes = new ParameterBag ();
5140 $ this ->session = m::mock (Session::class);
5241 }
5342
@@ -139,8 +128,8 @@ public function testValidServerProcess()
139128 $ this ->session ->shouldReceive ('now ' )->with ('server_data.model ' , $ model )->once ()->andReturnNull ();
140129
141130 $ this ->getMiddleware ()->handle ($ this ->request , $ this ->getClosureAssertions ());
142- $ this ->assertTrue ( $ this -> request -> attributes -> has ( 'server ' ), ' Assert request attributes contains server. ' );
143- $ this ->assertSame ($ model , $ this -> request -> attributes -> get ( 'server ' ) );
131+ $ this ->assertRequestHasAttribute ( 'server ' );
132+ $ this ->assertRequestAttributeEquals ($ model , 'server ' );
144133 }
145134
146135 /**
@@ -170,16 +159,4 @@ private function getMiddleware(): AccessingValidServer
170159 {
171160 return new AccessingValidServer ($ this ->config , $ this ->repository , $ this ->session );
172161 }
173-
174- /**
175- * Provide a closure to be used when validating that the response from the middleware
176- * is the same request object we passed into it.
177- */
178- private function getClosureAssertions (): Closure
179- {
180- return function ($ response ) {
181- $ this ->assertInstanceOf (Request::class, $ response );
182- $ this ->assertSame ($ this ->request , $ response );
183- };
184- }
185162}
0 commit comments