projects
/
yaffs-website
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Further Drupal 8.6.4 changes. Some core files were not committed before a commit...
[yaffs-website]
/
web
/
core
/
modules
/
system
/
tests
/
src
/
Functional
/
Form
/
FormTest.php
diff --git
a/web/core/modules/system/tests/src/Functional/Form/FormTest.php
b/web/core/modules/system/tests/src/Functional/Form/FormTest.php
index 87c763245786eaf7d366be319c828a1e27343a42..849944b0f54c8e37a4a876abec614fd39361c5f7 100644
(file)
--- a/
web/core/modules/system/tests/src/Functional/Form/FormTest.php
+++ b/
web/core/modules/system/tests/src/Functional/Form/FormTest.php
@@
-4,7
+4,7
@@
namespace Drupal\Tests\system\Functional\Form;
use Drupal\Component\Serialization\Json;
use Drupal\Component\Utility\Html;
use Drupal\Component\Serialization\Json;
use Drupal\Component\Utility\Html;
-use Drupal\Component\
Utility\Saf
eMarkup;
+use Drupal\Component\
Render\Formattabl
eMarkup;
use Drupal\Core\Form\FormState;
use Drupal\Core\Render\Element;
use Drupal\Core\Url;
use Drupal\Core\Form\FormState;
use Drupal\Core\Render\Element;
use Drupal\Core\Url;
@@
-151,7
+151,7
@@
class FormTest extends BrowserTestBase {
}
}
// Clear the expected form error messages so they don't appear as exceptions.
}
}
// Clear the expected form error messages so they don't appear as exceptions.
-
drupal_get_messages
();
+
\Drupal::messenger()->deleteAll
();
}
/**
}
/**
@@
-426,7
+426,7
@@
class FormTest extends BrowserTestBase {
'multiple_no_default_required[]' => 'three',
];
$this->drupalPostForm(NULL, $edit, 'Submit');
'multiple_no_default_required[]' => 'three',
];
$this->drupalPostForm(NULL, $edit, 'Submit');
- $values = Json::decode($this->get
Raw
Content());
+ $values = Json::decode($this->get
Session()->getPage()->get
Content());
// Verify expected values.
$expected = [
// Verify expected values.
$expected = [
@@
-622,7
+622,7
@@
class FormTest extends BrowserTestBase {
// the disabled container.
$actual_count = count($disabled_elements);
$expected_count = 42;
// the disabled container.
$actual_count = count($disabled_elements);
$expected_count = 42;
- $this->assertEqual($actual_count, $expected_count,
SafeMarkup::format
('Found @actual elements with disabled property (expected @expected).', [
+ $this->assertEqual($actual_count, $expected_count,
new FormattableMarkup
('Found @actual elements with disabled property (expected @expected).', [
'@actual' => count($disabled_elements),
'@expected' => $expected_count,
]));
'@actual' => count($disabled_elements),
'@expected' => $expected_count,
]));