Upgraded drupal core with security updates

[yaffs-website] / web / core / modules / views_ui / tests / src / Functional / FieldUITest.php

diff --git a/web/core/modules/views_ui/src/Tests/FieldUITest.php b/web/core/modules/views_ui/tests/src/Functional/FieldUITest.php
similarity index 87%
rename from web/core/modules/views_ui/src/Tests/FieldUITest.php
rename to web/core/modules/views_ui/tests/src/Functional/FieldUITest.php
index 4e873236996ee68a7c9bc6656e59f07f421346f9..dc3081f6505fbb97bb2fb2a67eb3c07c74ff1de9 100644 (file)
--- a/web/core/modules/views_ui/src/Tests/FieldUITest.php
+++ b/web/core/modules/views_ui/tests/src/Functional/FieldUITest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Drupal\views_ui\Tests;
+namespace Drupal\Tests\views_ui\Functional;
 
 use Drupal\Component\Serialization\Json;
 use Drupal\views\Views;
@@ -39,20 +39,20 @@ class FieldUITest extends UITestBase {
     $edit_handler_url = 'admin/structure/views/nojs/handler/test_view/default/field/age';
     $this->drupalGet($edit_handler_url);
     $result = $this->xpath('//details[@id="edit-options-alter-help"]/div[@class="details-wrapper"]/div[@class="item-list"]/ul/li');
-    $this->assertEqual((string) $result[0], '{{ age }} == Age');
+    $this->assertEqual($result[0]->getHtml(), '{{ age }} == Age');
 
     $edit_handler_url = 'admin/structure/views/nojs/handler/test_view/default/field/id';
     $this->drupalGet($edit_handler_url);
     $result = $this->xpath('//details[@id="edit-options-alter-help"]/div[@class="details-wrapper"]/div[@class="item-list"]/ul/li');
-    $this->assertEqual((string) $result[0], '{{ age }} == Age');
-    $this->assertEqual((string) $result[1], '{{ id }} == ID');
+    $this->assertEqual(trim($result[0]->getHtml()), '{{ age }} == Age');
+    $this->assertEqual(trim($result[1]->getHtml()), '{{ id }} == ID');
 
     $edit_handler_url = 'admin/structure/views/nojs/handler/test_view/default/field/name';
     $this->drupalGet($edit_handler_url);
     $result = $this->xpath('//details[@id="edit-options-alter-help"]/div[@class="details-wrapper"]/div[@class="item-list"]/ul/li');
-    $this->assertEqual((string) $result[0], '{{ age }} == Age');
-    $this->assertEqual((string) $result[1], '{{ id }} == ID');
-    $this->assertEqual((string) $result[2], '{{ name }} == Name');
+    $this->assertEqual(trim($result[0]->getHtml()), '{{ age }} == Age');
+    $this->assertEqual(trim($result[1]->getHtml()), '{{ id }} == ID');
+    $this->assertEqual(trim($result[2]->getHtml()), '{{ name }} == Name');
 
     $result = $this->xpath('//details[@id="edit-options-more"]');
     $this->assertEqual(empty($result), TRUE, "Container 'more' is empty and should not be displayed.");
@@ -71,7 +71,7 @@ class FieldUITest extends UITestBase {
 
     $edit_handler_url = '/admin/structure/views/ajax/handler-group/test_view/default/field/name';
     $this->drupalGet($edit_handler_url);
-    $data = Json::decode($this->getRawContent());
+    $data = Json::decode($this->getSession()->getPage()->getContent());
     $this->assertEqual($data[3]['dialogOptions']['title'], 'Configure aggregation settings for field Views test: Name');
   }