diff --git a/core/modules/user/tests/src/FunctionalJavascript/RegistrationWithUserFieldsTest.php b/core/modules/user/tests/src/FunctionalJavascript/RegistrationWithUserFieldsTest.php index db316fa322..8a75202b9b 100644 --- a/core/modules/user/tests/src/FunctionalJavascript/RegistrationWithUserFieldsTest.php +++ b/core/modules/user/tests/src/FunctionalJavascript/RegistrationWithUserFieldsTest.php @@ -86,20 +86,21 @@ public function testRegistrationWithUserFields() { $name = $this->randomMachineName(); $this->page->fillField('edit-name', $name); $this->page->fillField('edit-mail', $name . '@example.com'); - $this->page->pressButton('edit-submit'); + $this->webAssert->assertWaitOnAjaxRequest(); $this->assertRegistrationFormCacheTagsWithUserFields(); $this->webAssert->pageTextContains(t('@name field is required.', ['@name' => $field->label()])); // Invalid input. - $test_user_field = $this->page->fillField('edit-test-user-field-0-value', '-1'); + $this->page->fillField('edit-test-user-field-0-value', '-1'); $this->page->pressButton('edit-submit'); + $this->webAssert->assertWaitOnAjaxRequest(); $this->assertRegistrationFormCacheTagsWithUserFields(); - $this->webAssert->pageTextContains(t('%name does not accept the value -1.', ['%name' => $field->label()])); + $this->webAssert->pageTextContains($field->label() . ' does not accept the value -1.'); // Submit with valid data. $value = mt_rand(1, 255); - $test_user_field->setValue($value); + $this->page->fillField('edit-test-user-field-0-value', $value); $this->page->pressButton('edit-submit'); // Check user fields. $accounts = $this->container->get('entity_type.manager')->getStorage('user') @@ -115,8 +116,6 @@ public function testRegistrationWithUserFields() { $this->assertRegistrationFormCacheTagsWithUserFields(); // Add two inputs. - $value = mt_rand(1, 255); - $test_user_field->setValue($value); if ($js == 'js') { $field_test_user_add_more = $this->page->find('css', 'edit-test-user-field-add-more'); $field_test_user_add_more->click(); @@ -128,12 +127,11 @@ public function testRegistrationWithUserFields() { } // Submit with three values. - $first_test_user_field = $this->page->findField('edit-test-user-field-0-value'); - $first_test_user_field->setValue($value + 1); - $second_test_user_field = $this->page->findField('edit-test-user-field-1-value'); - $second_test_user_field->setValue($value + 2); $this->page->fillField('edit-name', $name); $this->page->fillField('edit-mail', $name . '@example.com'); + $this->page->fillField('edit-test-user-field-0-value', $value); + $this->page->fillField('edit-test-user-field-1-value', $value + 1); + $this->page->fillField('edit-test-user-field-2-value', $value + 1); $this->page->pressButton('edit-submit'); // Check user fields.