Skip to content

Commit

Permalink
Handle Request
Browse files Browse the repository at this point in the history
  • Loading branch information
bajb committed Feb 25, 2019
1 parent 2ab7ad0 commit b127a8e
Show file tree
Hide file tree
Showing 2 changed files with 11 additions and 11 deletions.
2 changes: 1 addition & 1 deletion src/Dispatch.php
Original file line number Diff line number Diff line change
Expand Up @@ -103,7 +103,7 @@ public function getComponentAliases()
* @return Response
* @throws \Exception
*/
public function handle(Request $request): Response
public function handleRequest(Request $request): Response
{
$path = substr($request->getPathInfo(), strlen(Request::create($this->_baseUri)->getPathInfo()));
$pathParts = array_filter(explode('/', $path));
Expand Down
20 changes: 10 additions & 10 deletions tests/DispatchTest.php
Original file line number Diff line number Diff line change
Expand Up @@ -41,29 +41,29 @@ public function testHandle()
Dispatch::bind($dispatch);

$request = Request::create('/placeholder.html');
$response = $dispatch->handle($request);
$response = $dispatch->handleRequest($request);
$this->assertEquals(404, $response->getStatusCode());

$request = Request::create('/r/e69b7aXX/css/test.css');
$response = $dispatch->handle($request);
$response = $dispatch->handleRequest($request);
$this->assertEquals(404, $response->getStatusCode());

$request = Request::create('/r/f643eb32/css/test.css');
$response = $dispatch->handle($request);
$response = $dispatch->handleRequest($request);
$this->assertEquals(200, $response->getStatusCode());
$this->assertContains('url(r/d68e763c/img/x.jpg)', $response->getContent());

$request = Request::create('/p/d5dd9dc7/css/placeholder.css');
$response = $dispatch->handle($request);
$response = $dispatch->handleRequest($request);
$this->assertContains('font-size:14px', $response->getContent());

$dispatch->addAlias('abc', 'resources/css');
$request = Request::create('/a/abc/f643eb32/test.css');
$response = $dispatch->handle($request);
$response = $dispatch->handleRequest($request);
$this->assertContains('url("a/abc/d41d8cd9/sub/subimg.jpg")', $response->getContent());

$request = Request::create('/v/packaged/dispatch/6673b7e0/css/vendor.css');
$response = $dispatch->handle($request);
$response = $dispatch->handleRequest($request);
$this->assertContains('body{background:orange}', $response->getContent());

Dispatch::destroy();
Expand All @@ -74,7 +74,7 @@ public function testBaseUri()
$dispatch = new Dispatch(Path::system(__DIR__, '_root'), 'http://assets.packaged.in');
Dispatch::bind($dispatch);
$request = Request::create('/r/f643eb32/css/test.css');
$response = $dispatch->handle($request);
$response = $dispatch->handleRequest($request);
$this->assertContains('url(http://assets.packaged.in/r/d68e763c/img/x.jpg)', $response->getContent());
Dispatch::destroy();
}
Expand Down Expand Up @@ -104,7 +104,7 @@ public function testComponent()
$this->assertEquals('c/3/_/DemoComponent/DemoComponent/a4197ed8/style.css', $uri);

$request = Request::create('/' . $uri);
$response = $dispatch->handle($request);
$response = $dispatch->handleRequest($request);
$this->assertEquals(200, $response->getStatusCode());
$this->assertContains('body{color:red}', $response->getContent());

Expand All @@ -114,7 +114,7 @@ public function testComponent()
$this->assertCount(1, Dispatch::instance()->store()->getResources(ResourceStore::TYPE_CSS));
$manager = ResourceManager::component($resourceComponent);
$request = Request::create('/' . $manager->getResourceUri('style.css'));
$response = $dispatch->handle($request);
$response = $dispatch->handleRequest($request);
$this->assertEquals(200, $response->getStatusCode());
$this->assertContains('body{color:orange}', $response->getContent());

Expand All @@ -126,7 +126,7 @@ public function testComponent()
$this->assertEquals('c/2/_DC/DemoComponent/a4197ed8/style.css', $uri);

$request = Request::create('/c/3/_/MissingComponent/DemoComponent/a4197ed8/style.css');
$response = $dispatch->handle($request);
$response = $dispatch->handleRequest($request);
$this->assertEquals(404, $response->getStatusCode());
$this->assertContains('Component Not Found', $response->getContent());

Expand Down

0 comments on commit b127a8e

Please sign in to comment.