Replace usages of deprecated AssertLegacyTrait::assertOptionByText()

+++ b/core/modules/datetime/tests/src/Functional/DateTimeFieldTest.php
@@ -460,23 +460,23 @@ public function testDatelistWidget() {
-    $this->assertOptionByText("edit-$field_name-0-value-year", t('Year'));
+    $this->assertSession()->optionExists("edit-$field_name-0-value-year", t('Year'));
     $this->assertFieldByXPath("//*[@id=\"edit-$field_name-0-value-month\"]", NULL, 'Month element found.');
     $this->assertOptionSelected("edit-$field_name-0-value-month", '', 'No month selected.');
-    $this->assertOptionByText("edit-$field_name-0-value-month", t('Month'));
+    $this->assertSession()->optionExists("edit-$field_name-0-value-month", t('Month'));
     $this->assertFieldByXPath("//*[@id=\"edit-$field_name-0-value-day\"]", NULL, 'Day element found.');
     $this->assertOptionSelected("edit-$field_name-0-value-day", '', 'No day selected.');
-    $this->assertOptionByText("edit-$field_name-0-value-day", t('Day'));
+    $this->assertSession()->optionExists("edit-$field_name-0-value-day", t('Day'));
     $this->assertFieldByXPath("//*[@id=\"edit-$field_name-0-value-hour\"]", NULL, 'Hour element found.');
     $this->assertOptionSelected("edit-$field_name-0-value-hour", '', 'No hour selected.');
-    $this->assertOptionByText("edit-$field_name-0-value-hour", t('Hour'));
+    $this->assertSession()->optionExists("edit-$field_name-0-value-hour", t('Hour'));
     $this->assertFieldByXPath("//*[@id=\"edit-$field_name-0-value-minute\"]", NULL, 'Minute element found.');
     $this->assertOptionSelected("edit-$field_name-0-value-minute", '', 'No minute selected.');
-    $this->assertOptionByText("edit-$field_name-0-value-minute", t('Minute'));
+    $this->assertSession()->optionExists("edit-$field_name-0-value-minute", t('Minute'));
     $this->assertNoFieldByXPath("//*[@id=\"edit-$field_name-0-value-second\"]", NULL, 'Second element not found.');
     $this->assertFieldByXPath("//*[@id=\"edit-$field_name-0-value-ampm\"]", NULL, 'AMPM element found.');
     $this->assertOptionSelected("edit-$field_name-0-value-ampm", '', 'No ampm selected.');
-    $this->assertOptionByText("edit-$field_name-0-value-ampm", t('AM/PM'));
+    $this->assertSession()->optionExists("edit-$field_name-0-value-ampm", t('AM/PM'));

These would need to get the t() calls removed, too. But I suppose it's a follow-up.

Other than that, it's RTBC for me.

#4.2 I do not think that needs to be deprecated - it's a separate implementation, for the kernel tests. What we are removing here are the Simpletest legacy for functional/javascript tests. Now - that does not seem to be used for kernel tests either, though... maybe a separate issue might investigate which of the \Drupal\KernelTests\AssertContentTrait methods are really needed?

+++ b/core/tests/Drupal/FunctionalTests/BrowserTestBaseTest.php
@@ -262,6 +262,19 @@ public function testAssertHeader() {
+  /**
+   * Tests legacy assertOptionByText().
+   *
+   * @group legacy
+   * @expectedDeprecation AssertLegacyTrait::assertOptionByText() is deprecated in drupal:8.4.0 and is removed from drupal:10.0.0. Use $this->assertSession()->optionExists() instead. See https://www.drupal.org/node/3129738
+   */
+  public function testAssertOptionByText() {
+    $account = $this->drupalCreateUser();
+    $this->drupalLogin($account);
+    $this->drupalGet('form-test/select');
+    $this->assertOptionByText('edit-select', 'one');
+  }
+
   /**
    * Tests legacy text asserts.
    */
@@ -480,9 +493,9 @@ public function testFieldAssertsForOptions() {

@@ -480,9 +493,9 @@ public function testFieldAssertsForOptions() {
     $this->drupalGet('test-field-xpath');
 
     // Option field type.
-    $this->assertOptionByText('options', 'one');
+    $this->assertSession()->optionExists('options', 'one');
     try {
-      $this->assertOptionByText('options', 'four');
+      $this->assertSession()->optionExists('options', 'four');
       $this->fail('The select option "four" was found.');

Actually, maybe we do not need the separate test. Just add the @expectedDeprecation to the docblock of testFieldAssertsForOptions, without replacing the calls in the method.

#5 that’s not about assertion messages, it’s the text to be found in the option. The method dropped the assertion message argument already.