Skip to content

Commit

Permalink
update
Browse files Browse the repository at this point in the history
  • Loading branch information
leedavis81 committed Jul 16, 2013
1 parent 2c12072 commit b6089dc
Show file tree
Hide file tree
Showing 2 changed files with 62 additions and 0 deletions.
18 changes: 18 additions & 0 deletions tests/DrestCommonTests/Request/Adapter/Symfony2Test.php
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,8 @@ public function testCanSaveAndRetrieveCookie()
{
$request = self::getSymfonyAdapterRequest();

$this->assertEmpty($request->getCookie());

$cookieName = 'frodo';
$cookieValue = 'baggins';

Expand All @@ -45,6 +47,8 @@ public function testCanSaveAndRetrieveCookie()
$this->assertCount(1, $request->getCookie());
$this->assertEquals($cookieValue, $request->getCookie($cookieName));

$this->assertEquals('', $request->getCookie('notset'));

$newCookies = array('samwise' => 'gamgee', 'peregrin' => 'took');
$symRequestObject->cookies->replace($newCookies);

Expand Down Expand Up @@ -130,4 +134,18 @@ public function testCanSaveCombinedParamTypes()
$this->assertCount(3, $request->getParams());
}

/**
* @expectedException \DrestCommon\Request\RequestException
*/
public function testUnknownHttpVerb()
{
$symRequest = \Symfony\Component\HttpFoundation\Request::create(
'/users',
'CUSTOM'
);
$request = Request::create($symRequest);

$request->getHttpMethod();
}

}
44 changes: 44 additions & 0 deletions tests/DrestCommonTests/Request/RequestTest.php
Original file line number Diff line number Diff line change
Expand Up @@ -40,5 +40,49 @@ public function testCreateRequestWithSymfony2RequestObject()
// Ensure request object creates a symfony2 request
$this->assertInstanceOf('Symfony\Component\HttpFoundation\Request', $request->getRequest());
}

public function testSettingRouteParams()
{
$request = Request::create();
$params = array('name' => 'bilbo', 'address' => 'the shire');
$request->setRouteParam($params);
$this->assertEquals($params, $request->getRouteParam());
$this->assertEquals('bilbo', $request->getRouteParam('name'));

$request->setRouteParam('name', 'frodo');
$this->assertEquals('frodo', $request->getRouteParam('name'));
}

public function testGetPath()
{
$symRequest = \Symfony\Component\HttpFoundation\Request::create(
'/users',
'GET'
);

$request = Request::create($symRequest);
$this->assertEquals('/users', $request->getPath());
}

public function testGetPathWithAdditions()
{
$symRequest = \Symfony\Component\HttpFoundation\Request::create(
'/users?a=1#t12',
'GET'
);

$request = Request::create($symRequest);
$this->assertEquals('/users', $request->getPath());

$symRequest = \Symfony\Component\HttpFoundation\Request::create(
'/users#t12',
'GET'
);

$request = Request::create($symRequest);
$this->assertEquals('/users', $request->getPath());
}


}

0 comments on commit b6089dc

Please sign in to comment.