tonyair/silverstripe-subsites
1
0
Fork 0
mirror of https://github.com/silverstripe/silverstripe-subsites synced 2024-06-18 10:41:40 +02:00
Code Issues Projects Releases Wiki Activity

Merge branch '2.1'

Browse Source
This commit is contained in:
Guy Marriott 2018-08-20 09:58:59 +12:00
commit 687e013793
No known key found for this signature in database
GPG Key ID: A80F9ACCB86D3DA7
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
tests/php/SubsiteXHRControllerTest.php
View File

@ -35,7 +35,8 @@ class SubsiteXHRControllerTest extends FunctionalTest
]);
$this->assertEquals(200, $result->getStatusCode());
$this->assertEquals('text/json', $result->getHeader('Content-Type'));
// SilverStripe 4.0-4.2: text/json. >=4.3: application/json
$this->assertContains('json', $result->getHeader('Content-Type'));
$body = $result->getBody();
$this->assertContains('Main site', $body);