Skip to content
This repository was archived by the owner on Apr 28, 2020. It is now read-only.

Commit 10630d4

Browse files
ikdekkerOcramius
authored andcommitted
[test] Add headers check for content-type & accept
[cs] Remove whitespace on empty line
1 parent 1b874ee commit 10630d4

File tree

2 files changed

+32
-2
lines changed

2 files changed

+32
-2
lines changed

src/Client.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -205,11 +205,11 @@ public function doRequest($request, $response = null)
205205
}
206206

207207
$headers = $httpRequest->getHeaders();
208-
208+
209209
if (!$headers->get('Content-Type')) {
210210
$headers->addHeaderLine('Content-Type', 'text/xml; charset=utf-8');
211211
}
212-
212+
213213
if (!$headers->get('Accept')) {
214214
$headers->addHeaderLine('Accept', 'text/xml');
215215
}

test/ClientTest.php

Lines changed: 30 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -603,6 +603,36 @@ public function testCustomHttpClientUserAgentIsNotOverridden()
603603
$this->assertSame($expectedUserAgent, $this->httpClient->getHeader('user-agent'));
604604
}
605605

606+
public function testContentTypeAutomaticallySet()
607+
{
608+
$this->assertFalse(
609+
$this->httpClient->getHeader('Content-Type'),
610+
'Content-Type is null if no request was made'
611+
);
612+
613+
$expectedContentType = 'text/xml; charset=utf-8';
614+
$this->httpClient->setHeaders(['Content-Type' => $expectedContentType]);
615+
616+
$this->setServerResponseTo(true);
617+
$this->assertTrue($this->xmlrpcClient->call('method'));
618+
$this->assertSame($expectedContentType, $this->httpClient->getHeader(''));
619+
}
620+
621+
public function testAcceptAutomaticallySet()
622+
{
623+
$this->assertFalse(
624+
$this->httpClient->getHeader('Accept'),
625+
'Accept header is null if no request was made'
626+
);
627+
628+
$expectedAccept = 'text/xml';
629+
$this->httpClient->setHeaders(['Accept' => $expectedAccept]);
630+
631+
$this->setServerResponseTo(true);
632+
$this->assertTrue($this->xmlrpcClient->call('method'));
633+
$this->assertSame($expectedAccept, $this->httpClient->getHeader(''));
634+
}
635+
606636
/**
607637
* @group ZF-8478
608638
*/

0 commit comments

Comments
 (0)