Upgraded drupal core with security updates

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

diff --git a/web/core/modules/views_ui/src/Tests/FilterBooleanWebTest.php b/web/core/modules/views_ui/tests/src/Functional/FilterBooleanWebTest.php
similarity index 89%
rename from web/core/modules/views_ui/src/Tests/FilterBooleanWebTest.php
rename to web/core/modules/views_ui/tests/src/Functional/FilterBooleanWebTest.php
index a3e58d755eb7f0ec0dc54a197ea933475446c26f..e6adfeea713217abc194d97af862e957bacc3726 100644 (file)
--- a/web/core/modules/views_ui/src/Tests/FilterBooleanWebTest.php
+++ b/web/core/modules/views_ui/tests/src/Functional/FilterBooleanWebTest.php
@@ -1,6 +1,6 @@
 <?php
 
 <?php
 

-namespace Drupal\views_ui\Tests;
+namespace Drupal\Tests\views_ui\Functional;

 
 /**
  * Tests the boolean filter UI.
 
 /**
  * Tests the boolean filter UI.


@@ -25,7 +25,7 @@ class FilterBooleanWebTest extends UITestBase {
 
     // Check the field widget label. 'title' should be used as a fallback.
     $result = $this->cssSelect('#edit-options-value--wrapper legend span');
 
     // Check the field widget label. 'title' should be used as a fallback.
     $result = $this->cssSelect('#edit-options-value--wrapper legend span');

-    $this->assertEqual((string) $result[0], 'Status');
+    $this->assertEqual($result[0]->getHtml(), 'Status');

 
     $this->drupalPostForm(NULL, [], t('Expose filter'));
     $this->drupalPostForm(NULL, [], t('Grouped filters'));
 
     $this->drupalPostForm(NULL, [], t('Expose filter'));
     $this->drupalPostForm(NULL, [], t('Grouped filters'));


@@ -46,11 +46,11 @@ class FilterBooleanWebTest extends UITestBase {
     $this->drupalGet('admin/structure/views/nojs/handler/test_view/default/filter/status');
 
     $result = $this->xpath('//input[@name="options[group_info][group_items][1][value]"]');
     $this->drupalGet('admin/structure/views/nojs/handler/test_view/default/filter/status');
 
     $result = $this->xpath('//input[@name="options[group_info][group_items][1][value]"]');

-    $this->assertEqual((int) $result[1]->attributes()->checked, 'checked');
+    $this->assertEqual($result[1]->getAttribute('checked'), 'checked');

     $result = $this->xpath('//input[@name="options[group_info][group_items][2][value]"]');
     $result = $this->xpath('//input[@name="options[group_info][group_items][2][value]"]');

-    $this->assertEqual((int) $result[2]->attributes()->checked, 'checked');
+    $this->assertEqual($result[2]->getAttribute('checked'), 'checked');

     $result = $this->xpath('//input[@name="options[group_info][group_items][3][value]"]');
     $result = $this->xpath('//input[@name="options[group_info][group_items][3][value]"]');

-    $this->assertEqual((int) $result[1]->attributes()->checked, 'checked');
+    $this->assertEqual($result[1]->getAttribute('checked'), 'checked');

 
     // Test that there is a remove link for each group.
     $this->assertEqual(count($this->cssSelect('a.views-remove-link')), 3);
 
     // Test that there is a remove link for each group.
     $this->assertEqual(count($this->cssSelect('a.views-remove-link')), 3);