Merge branch '2.1'

silverstripe · Aug 19, 2018 · 687e013 · 687e013
2 parents d8088ed + f24fd60
commit 687e013
Showing 1 changed file with 2 additions and 1 deletion.
diff --git a/tests/php/SubsiteXHRControllerTest.php b/tests/php/SubsiteXHRControllerTest.php
@@ -35,7 +35,8 @@ public function testCanView()
         ]);
 
         $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);