opdavies/drupalcampbristol
Archived
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Update to Drupal 8.1.2. For more information, see https://www.drupal.org/project/drupal/releases/8.1.2

Browse source
This commit is contained in:
Pantheon Automation 2016-06-02 15:56:09 -07:00 • committed by Greg Anderson
parent 9eae24d844
commit 28556d630e
1322 changed files with 6699 additions and 2064 deletions
Download patch file Download diff file Expand all files Collapse all files

16
core/modules/rest/src/Tests/RESTTestBase.php
View file

@ -250,8 +250,8 @@ abstract class RESTTestBase extends WebTestBase {
* resource types.
* @param string $method
* The HTTP method to enable, e.g. GET, POST etc.
* @param string $format
* (Optional) The serialization format, e.g. hal_json.
* @param string|array $format
* (Optional) The serialization format, e.g. hal_json, or a list of formats.
* @param array $auth
* (Optional) The list of valid authentication methods.
*/
@ -261,10 +261,15 @@ abstract class RESTTestBase extends WebTestBase {
$settings = array();
if ($resource_type) {
if ($format == NULL) {
$format = $this->defaultFormat;
if (is_array($format)) {
$settings[$resource_type][$method]['supported_formats'] = $format;
}
else {
if ($format == NULL) {
$format = $this->defaultFormat;
}
$settings[$resource_type][$method]['supported_formats'][] = $format;
}
$settings[$resource_type][$method]['supported_formats'][] = $format;
if ($auth == NULL) {
$auth = $this->defaultAuth;
@ -425,4 +430,5 @@ abstract class RESTTestBase extends WebTestBase {
protected function assertResponseBody($expected, $message = '', $group = 'REST Response') {
return $this->assertIdentical($expected, $this->responseBody, $message ? $message : strtr('Response body @expected (expected) is equal to @response (actual).', array('@expected' => var_export($expected, TRUE), '@response' => var_export($this->responseBody, TRUE))), $group);
}
}