Skip to content

Commit

Permalink
Merge pull request #29 from CircleOfNice/0.3.2
Browse files Browse the repository at this point in the history
0.3.2
  • Loading branch information
TobiasHauck committed Jan 20, 2016
2 parents 3f32e40 + 8b1aa1f commit e0a97d8
Show file tree
Hide file tree
Showing 3 changed files with 4 additions and 4 deletions.
4 changes: 2 additions & 2 deletions Resources/config/services.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,10 +4,10 @@ parameters:
services:
ci.restclient:
class: %ci.restclient.class%
arguments: [ @ci.curl ]
arguments: [ "@ci.curl" ]
ci.curl:
class: Ci\RestClientBundle\Services\Curl
arguments: [ @ci.curl.options.handler ]
arguments: [ "@ci.curl.options.handler" ]
ci.curl.options.handler:
class: Ci\RestClientBundle\Services\CurlOptionsHandler
arguments: [ %ci.restclient.curl.defaults% ]
2 changes: 1 addition & 1 deletion Tests/Functional/Services/CurlTest.php
Original file line number Diff line number Diff line change
Expand Up @@ -98,7 +98,7 @@ public function sendRequestOnError() {
*/
public function setContentType() {
$this->curl->setContentType('application/json');
$response = $this->curl->sendRequest($this->getHTTP200Route('post'), 'POST');
$response = $this->curl->sendRequest($this->getHTTP200Route('get'), 'GET');
$this->assertInstanceOf('Symfony\Component\HttpFoundation\Response', $response);
$this->assertSame('application/json', $response->headers->get('Content-Type'));
}
Expand Down
2 changes: 1 addition & 1 deletion Tests/Functional/Services/RestClientTest.php
Original file line number Diff line number Diff line change
Expand Up @@ -142,7 +142,7 @@ public function post() {
*/
public function setContentType() {
$this->restClient->setContentType('application/json');
$response = $this->restClient->post($this->getHTTP200Route(), 'payload');
$response = $this->restClient->get($this->getHTTP200Route());
$this->assertInstanceOf('Symfony\Component\HttpFoundation\Response', $response);
$this->assertSame('application/json', $response->headers->get('Content-Type'));
}
Expand Down

0 comments on commit e0a97d8

Please sign in to comment.