Drupal
/
drupal
mirror of https://git.drupalcode.org/project/drupal.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Issue #1978422 by dawehner, linclark, klausi: Fixed REST export views preview needs to escape the JSON output.

8.0.x
webchick 2013-04-26 09:33:39 -07:00
parent f46053386c
commit 3db57c91bb
2 changed files with 27 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
core/modules/rest/lib/Drupal/rest/Plugin/views/display/RestExport.php
View File

@ -216,6 +216,7 @@ class RestExport extends PathPluginBase {
// Wrap the output in a pre tag if this is for a live preview.
if (!empty($this->view->live_preview)) {
$build['#prefix'] = '<pre>';
$build['#markup'] = check_plain($build['#markup']);
$build['#suffix'] = '</pre>';
}

26
core/modules/rest/lib/Drupal/rest/Tests/Views/StyleSerializerTest.php
View File

@ -221,4 +221,30 @@ class StyleSerializerTest extends PluginTestBase {
}
}
/**
* Tests the preview output for json output.
*/
public function testPreview() {
$view = views_get_view('test_serializer_display_entity');
$view->setDisplay('rest_export_1');
$this->executeView($view);
// Get the serializer service.
$serializer = $this->container->get('serializer');
$entities = array();
foreach ($view->result as $row) {
$entities[] = $row->_entity;
}
$expected = check_plain($serializer->serialize($entities, 'hal_json'));
$view->display_handler->setContentType('hal_json');
$view->live_preview = TRUE;
$build = $view->preview();
$rendered_json = $build['#markup'];
$this->assertEqual($rendered_json, $expected, 'Ensure the previewed json is escaped.');
}
}