projects
/
yaffs-website
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Pull merge.
[yaffs-website]
/
web
/
core
/
modules
/
views
/
src
/
Tests
/
ViewResultAssertionTrait.php
diff --git
a/web/core/modules/views/src/Tests/ViewResultAssertionTrait.php
b/web/core/modules/views/src/Tests/ViewResultAssertionTrait.php
index 00501f5f0d36a0ec58e7ba253b648960562fa389..f0387eadb28e59024506d9e2c3dabbeda224e89a 100644
(file)
--- a/
web/core/modules/views/src/Tests/ViewResultAssertionTrait.php
+++ b/
web/core/modules/views/src/Tests/ViewResultAssertionTrait.php
@@
-88,7
+88,6
@@
trait ViewResultAssertionTrait {
if (property_exists($value, $view_column)) {
$row[$expected_column] = (string) $value->$view_column;
}
if (property_exists($value, $view_column)) {
$row[$expected_column] = (string) $value->$view_column;
}
- // The comparison will be done on the string representation of the value.
// For entity fields we don't have the raw value. Let's try to fetch it
// using the entity itself.
elseif (empty($value->$view_column) && isset($view->field[$expected_column]) && ($field = $view->field[$expected_column]) && $field instanceof EntityField) {
// For entity fields we don't have the raw value. Let's try to fetch it
// using the entity itself.
elseif (empty($value->$view_column) && isset($view->field[$expected_column]) && ($field = $view->field[$expected_column]) && $field instanceof EntityField) {
@@
-96,7
+95,10
@@
trait ViewResultAssertionTrait {
if (count(explode(':', $view_column)) == 2) {
$column = explode(':', $view_column)[1];
}
if (count(explode(':', $view_column)) == 2) {
$column = explode(':', $view_column)[1];
}
- $row[$expected_column] = $field->getValue($value, $column);
+ // The comparison will be done on the string representation of the
+ // value.
+ $field_value = $field->getValue($value, $column);
+ $row[$expected_column] = is_array($field_value) ? array_map('strval', $field_value) : (string) $field_value;
}
}
$result[$key] = $row;
}
}
$result[$key] = $row;