diff --git a/core/modules/inline_form_errors/tests/src/FunctionalJavascript/FormErrorHandlerFileUpload.php b/core/modules/inline_form_errors/tests/src/FunctionalJavascript/FormErrorHandlerFileUpload.php index 5fe9586..202d56a 100644 --- a/core/modules/inline_form_errors/tests/src/FunctionalJavascript/FormErrorHandlerFileUpload.php +++ b/core/modules/inline_form_errors/tests/src/FunctionalJavascript/FormErrorHandlerFileUpload.php @@ -22,13 +22,6 @@ class FormErrorHandlerFileUpload extends JavascriptTestBase { public static $modules = ['node', 'file', 'field_ui', 'inline_form_errors']; /** - * An user with administration permissions. - * - * @var \Drupal\user\UserInterface - */ - protected $adminUser; - - /** * {@inheritdoc} */ protected function setUp() { @@ -38,31 +31,20 @@ protected function setUp() { NodeType::create(['type' => 'page', 'name' => 'page'])->save(); // Add the file field under test. - $storage_settings = [ - 'cardinality' => 1, - ]; - $field_settings = [ - 'required' => TRUE, - 'file_extensions' => 'png gif jpg jpeg', - ]; - $widget_settings = []; - FieldStorageConfig::create([ 'entity_type' => 'node', 'field_name' => 'field_ief_file', 'type' => 'file', - 'settings' => $storage_settings, - 'cardinality' => $storage_settings['cardinality'], - ]) - ->save(); + 'cardinality' => 1, + ])->save(); FieldConfig::create([ 'field_name' => 'field_ief_file', 'label' => 'field_ief_file', 'entity_type' => 'node', 'bundle' => 'page', - 'required' => $field_settings['required'], - 'settings' => $field_settings, + 'required' => TRUE, + 'settings' => ['file_extensions' => 'png gif jpg jpeg'], ])->save(); EntityFormDisplay::create([ @@ -72,10 +54,9 @@ protected function setUp() { 'status' => TRUE, ])->setComponent('field_ief_file', [ 'type' => 'file_generic', - 'settings' => $widget_settings, + 'settings' => [], ])->save(); - EntityViewDisplay::create([ 'targetEntityType' => 'node', 'bundle' => 'page', @@ -93,25 +74,22 @@ protected function setUp() { 'create page content' ]); $this->drupalLogin($account); - } /** * Tests if the required field error is displayed as inline error message. */ public function testFileUploadErrors() { - $this->drupalGet('node/add/page'); - $this->createScreenshot('/tmp/functional-test/file-upload.jpg'); $edit = [ 'edit-title-0-value' => $this->randomString(), ]; $this->submitForm($edit, t('Save')); - $selector = '.field--name-field-ief-file .form-item--error-message strong'; - $actual = $this->getSession()->getPage()->find('css', $selector)->getHtml(); + $selector = '.field--name-field-ief-file .form-item--error-message'; + $actual = $this->getSession()->getPage()->find('css', $selector)->getText(); - $this->assertTrue($actual == (string) t('@name field is required.', ['@name' => 'field_ief_file'])); + $this->assertEquals('field_ief_file field is required.', $actual); } }