Commit f0c64573 authored by Florian Weber's avatar Florian Weber
Browse files

Issue #3306514 by webflo: Fix failing tests

parent 088a4f7d

src/Render/NameListFormattableMarkup.php

+1 −1
Original line number Diff line number Diff line
@@ -45,7 +45,7 @@ class NameListFormattableMarkup implements MarkupInterface { 
  /**

   * {@inheritdoc}

   */

  public function jsonSerialize() {

  public function jsonSerialize() : mixed {

    return $this->__toString();

  }

tests/src/Functional/NameAdminTest.php

+3 −3
Original line number Diff line number Diff line
@@ -100,7 +100,7 @@ class NameAdminTest extends NameTestBase { 
      'name_settings[sep3]' => '',

    ];

    foreach ($default_values as $name => $value) {

      $this->assertSession()->fieldExists($name, $value);

      $this->assertSession()->fieldValueEquals($name, $value);

    }

    // ID example.

    $this->assertSession()->fieldValueEquals('edit-name-settings-sep1', ' ');
@@ -115,7 +115,7 @@ class NameAdminTest extends NameTestBase { 
    $this->assertSession()->pageTextContains(t('The configuration options have been saved.'));



    foreach ($test_values as $name => $value) {

      $this->assertSession()->fieldExists($name, $value);

      $this->assertSession()->fieldValueEquals($name, $value);

    }



    // Delete all existing formats.
@@ -335,7 +335,7 @@ class NameAdminTest extends NameTestBase { 


        // Check URLs with or without the ?destination= query parameter.

        if (strpos($row_template[$cell_code], '/a/@href')) {

          $results = isset($elements[0]) ? $elements[0]->getHtml() : '';

          $results = isset($elements[0]) ? $elements[0]->getParent()->getAttribute('href') : '';

          $message = "Testing {$cell_code} on row {$id} using '{$xpath}' and expecting '" . Html::escape($value) . "', got '" . Html::escape($results) . "'.";

          if ($results == $value || strpos($results, $value . '?destination=') === 0) {

          } else {

tests/src/Functional/NameFieldTest.php

+3 −3
Original line number Diff line number Diff line
@@ -310,7 +310,7 @@ class NameFieldTest extends NameTestBase { 
    ];

    $this->submitForm($edit, t('Save field settings'));

    $this->drupalGet('node/add/page');

    $this->assertSession()->pageTextContainsOnce('This is a description.', 'Field description is shown once when field cardinality is 1.');

    $this->assertSession()->pageTextContainsOnce('This is a description.');



    $this->drupalGet('admin/structure/types/manage/page/fields/node.page.field_name_test/storage');

    $edit = [
@@ -319,7 +319,7 @@ class NameFieldTest extends NameTestBase { 
    ];

    $this->submitForm($edit, t('Save field settings'));

    $this->drupalGet('node/add/page');

    $this->assertSession()->pageTextContainsOnce('This is a description.', 'Field description is shown once when field cardinality is 3.');

    $this->assertSession()->pageTextContainsOnce('This is a description.');



    $this->drupalGet('admin/structure/types/manage/page/fields/node.page.field_name_test/storage');

    $edit = [
@@ -327,7 +327,7 @@ class NameFieldTest extends NameTestBase { 
    ];

    $this->submitForm($edit, t('Save field settings'));

    $this->drupalGet('node/add/page');

    $this->assertSession()->pageTextContainsOnce('This is a description.', 'Field description is shown once when field cardinality is unlimited.');

    $this->assertSession()->pageTextContainsOnce('This is a description.');

  }



  /**

tests/src/Functional/NameTestBase.php

+1 −0
Original line number Diff line number Diff line
@@ -52,6 +52,7 @@ abstract class NameTestBase extends BrowserTestBase { 
      'access content',

      'access administration pages',

      'administer node fields',

      'bypass node access'

    ]);

  }

tests/src/Functional/NameWidgetTest.php

+6 −6
Original line number Diff line number Diff line
@@ -143,28 +143,28 @@ class NameWidgetTest extends NameTestBase { 
    $this->assertFieldSettings($field_settings);



    // Test the language layouts.

    $this->verbose('Testing asian');

    dump('Testing asian');

    $field_settings['settings[component_layout]'] = 'asian';

    $this->drupalGet('admin/structure/types/manage/page/fields/node.page.field_name_test');

    $this->submitForm($field_settings, t('Save settings'));

    $this->drupalGet('node/add/page');

    $this->assertFieldSettings($field_settings);



    $this->verbose('Testing eastern');

    dump('Testing eastern');

    $field_settings['settings[component_layout]'] = 'eastern';

    $this->drupalGet('admin/structure/types/manage/page/fields/node.page.field_name_test');

    $this->submitForm($field_settings, t('Save settings'));

    $this->drupalGet('node/add/page');

    $this->assertFieldSettings($field_settings);



    $this->verbose('Testing german');

    dump('Testing german');

    $field_settings['settings[component_layout]'] = 'german';

    $this->drupalGet('admin/structure/types/manage/page/fields/node.page.field_name_test');

    $this->submitForm($field_settings, t('Save settings'));

    $this->drupalGet('node/add/page');

    $this->assertFieldSettings($field_settings);



    $this->verbose('Testing show_component_required_marker unchecked.');

    dump('Testing show_component_required_marker unchecked.');

    $field_settings = [

      'settings[show_component_required_marker]' => FALSE,

      'settings[component_layout]' => 'default',
@@ -196,8 +196,8 @@ class NameWidgetTest extends NameTestBase { 
      $content .= str_replace(["\n", "\r"], " ", $element->getHtml());

    }



    $this->verbose(Html::escape($content));

    $this->verbose($settings["settings[component_layout]"]);

    dump(Html::escape($content));

    dump($settings["settings[component_layout]"]);

    switch ($settings["settings[component_layout]"]) {

      case 'asian':

        $regexp = '/name-family-wrapper.*name-middle-wrapper.*name-given-wrapper.*name-title-wrapper.*name-credentials-wrapper.*/';