Commit a726a431 authored by alexpott's avatar alexpott

Issue #2809503 by Lendude, markdorison, voleger, andypost, jibran, alexpott,...

Issue #2809503 by Lendude, markdorison, voleger, andypost, jibran, alexpott, Mixologic, mondrake: Convert AJAX part of \Drupal\file\Tests\FileFieldWidgetTest to JavascriptTestBase
parent 97a68691
......@@ -20,11 +20,9 @@ abstract class FileFieldTestBase extends BrowserTestBase {
}
/**
* Modules to enable.
*
* @var array
*/
public static $modules = ['node', 'file', 'file_module_test', 'field_ui'];
* {@inheritdoc}
*/
protected static $modules = ['node', 'file', 'file_module_test', 'field_ui'];
/**
* An user with administration permissions.
......@@ -33,6 +31,9 @@ abstract class FileFieldTestBase extends BrowserTestBase {
*/
protected $adminUser;
/**
* {@inheritdoc}
*/
protected function setUp() {
parent::setUp();
$this->adminUser = $this->drupalCreateUser(['access content', 'access administration pages', 'administer site configuration', 'administer users', 'administer permissions', 'administer content types', 'administer node fields', 'administer node display', 'administer nodes', 'bypass node access']);
......@@ -44,6 +45,7 @@ protected function setUp() {
* Retrieves a sample file of the specified type.
*
* @return \Drupal\file\FileInterface
* The new unsaved file entity.
*/
public function getTestFile($type_name, $size = NULL) {
// Get a file to upload.
......@@ -142,25 +144,30 @@ public function uploadNodeFiles(array $files, $field_name, $nid_or_type, $new_re
$node = $node_storage->load($nid);
$this->assertNotEqual($nid, $node->getRevisionId(), 'Node revision exists.');
}
$this->drupalGet("node/$nid/edit");
$page = $this->getSession()->getPage();
// Attach files to the node.
$field_storage = FieldStorageConfig::loadByName('node', $field_name);
// File input name depends on number of files already uploaded.
$field_num = count($node->{$field_name});
$name = 'files[' . $field_name . "_$field_num]";
if ($field_storage->getCardinality() != 1) {
$name .= '[]';
}
foreach ($files as $file) {
foreach ($files as $i => $file) {
$delta = $field_num + $i;
$file_path = $this->container->get('file_system')->realpath($file->getFileUri());
$name = 'files[' . $field_name . '_' . $delta . ']';
if ($field_storage->getCardinality() != 1) {
$name .= '[]';
}
if (count($files) == 1) {
$edit[$name] = $file_path;
}
else {
$edit[$name][] = $file_path;
$page->attachFileToField($name, $file_path);
$this->drupalPostForm(NULL, [], t('Upload'));
}
}
$this->drupalPostForm("node/$nid/edit", $edit, t('Save'));
$this->drupalPostForm(NULL, $edit, t('Save'));
return $nid;
}
......
<?php
namespace Drupal\Tests\file\FunctionalJavascript;
use Drupal\file\Entity\File;
use Drupal\FunctionalJavascriptTests\WebDriverTestBase;
use Drupal\Tests\field_ui\Traits\FieldUiTestTrait;
use Drupal\Tests\file\Functional\FileFieldCreationTrait;
use Drupal\Tests\TestFileCreationTrait;
/**
* Tests the file field widget, single and multi-valued, using AJAX upload.
*
* @group file
*/
class FileFieldWidgetTest extends WebDriverTestBase {
use FieldUiTestTrait;
use FileFieldCreationTrait;
use TestFileCreationTrait;
/**
* An user with administration permissions.
*
* @var \Drupal\user\UserInterface
*/
protected $adminUser;
/**
* {@inheritdoc}
*/
protected static $modules = ['node', 'file', 'file_module_test', 'field_ui'];
/**
* {@inheritdoc}
*/
protected function setUp() {
parent::setUp();
$this->adminUser = $this->drupalCreateUser(['access content', 'access administration pages', 'administer site configuration', 'administer users', 'administer permissions', 'administer content types', 'administer node fields', 'administer node display', 'administer nodes', 'bypass node access']);
$this->drupalLogin($this->adminUser);
$this->drupalCreateContentType(['type' => 'article', 'name' => 'Article']);
}
/**
* Tests upload and remove buttons for multiple multi-valued File fields.
*/
public function testMultiValuedWidget() {
$type_name = 'article';
$field_name = 'test_file_field_1';
$field_name2 = 'test_file_field_2';
$cardinality = 3;
$this->createFileField($field_name, 'node', $type_name, ['cardinality' => $cardinality]);
$this->createFileField($field_name2, 'node', $type_name, ['cardinality' => $cardinality]);
$page = $this->getSession()->getPage();
$assert_session = $this->assertSession();
$test_file = current($this->getTestFiles('text'));
$test_file_path = \Drupal::service('file_system')
->realpath($test_file->uri);
$this->drupalGet("node/add/$type_name");
foreach ([$field_name2, $field_name] as $each_field_name) {
for ($delta = 0; $delta < 3; $delta++) {
$page->attachFileToField('files[' . $each_field_name . '_' . $delta . '][]', $test_file_path);
$this->assertNotNull($assert_session->waitForElementVisible('css', '[name="' . $each_field_name . '_' . $delta . '_remove_button"]'));
$this->assertNull($assert_session->waitForButton($each_field_name . '_' . $delta . '_upload_button'));
}
}
$num_expected_remove_buttons = 6;
foreach ([$field_name, $field_name2] as $current_field_name) {
// How many uploaded files for the current field are remaining.
$remaining = 3;
// Test clicking each "Remove" button. For extra robustness, test them out
// of sequential order. They are 0-indexed, and get renumbered after each
// iteration, so array(1, 1, 0) means:
// - First remove the 2nd file.
// - Then remove what is then the 2nd file (was originally the 3rd file).
// - Then remove the first file.
foreach ([1, 1, 0] as $delta) {
// Ensure we have the expected number of Remove buttons, and that they
// are numbered sequentially.
$buttons = $this->xpath('//input[@type="submit" and @value="Remove"]');
$this->assertTrue(is_array($buttons) && count($buttons) === $num_expected_remove_buttons, format_string('There are %n "Remove" buttons displayed.', ['%n' => $num_expected_remove_buttons]));
foreach ($buttons as $i => $button) {
$key = $i >= $remaining ? $i - $remaining : $i;
$check_field_name = $field_name2;
if ($current_field_name == $field_name && $i < $remaining) {
$check_field_name = $field_name;
}
$this->assertIdentical($button->getAttribute('name'), $check_field_name . '_' . $key . '_remove_button');
}
$button_name = $current_field_name . '_' . $delta . '_remove_button';
$remove_button = $assert_session->waitForButton($button_name);
$remove_button->click();
$num_expected_remove_buttons--;
$remaining--;
// Ensure an "Upload" button for the current field is displayed with the
// correct name.
$upload_button_name = $current_field_name . '_' . $remaining . '_upload_button';
$this->assertNotNull($assert_session->waitForButton($upload_button_name));
$buttons = $this->xpath('//input[@type="submit" and @value="Upload" and @name=:name]', [':name' => $upload_button_name]);
$this->assertTrue(is_array($buttons) && count($buttons) == 1, 'The upload button is displayed with the correct name.');
// Ensure only at most one button per field is displayed.
$buttons = $this->xpath('//input[@type="submit" and @value="Upload"]');
$expected = $current_field_name == $field_name ? 1 : 2;
$this->assertTrue(is_array($buttons) && count($buttons) == $expected, 'After removing a file, only one "Upload" button for each possible field is displayed.');
}
}
}
/**
* Tests uploading and remove buttons for a single-valued File field.
*/
public function testSingleValuedWidget() {
$type_name = 'article';
$field_name = 'test_file_field_1';
$cardinality = 1;
$this->createFileField($field_name, 'node', $type_name, ['cardinality' => $cardinality]);
$page = $this->getSession()->getPage();
$assert_session = $this->assertSession();
$test_file = current($this->getTestFiles('text'));
$test_file_path = \Drupal::service('file_system')
->realpath($test_file->uri);
$this->drupalGet("node/add/$type_name");
$page->findField('title[0][value]')->setValue($this->randomString());
$page->attachFileToField('files[' . $field_name . '_0]', $test_file_path);
$remove_button = $assert_session->waitForElementVisible('css', '[name="' . $field_name . '_0_remove_button"]');
$this->assertNotNull($remove_button);
$remove_button->click();
$upload_field = $assert_session->waitForElementVisible('css', 'input[type="file"]');
$this->assertNotEmpty($upload_field);
$page->attachFileToField('files[' . $field_name . '_0]', $test_file_path);
$remove_button = $assert_session->waitForElementVisible('css', '[name="' . $field_name . '_0_remove_button"]');
$this->assertNotNull($remove_button);
$page->pressButton('Save');
$page->hasContent($test_file->name);
// Create a new node and try to upload a file with an invalid extension.
$test_image = current($this->getTestFiles('image'));
$test_image_path = \Drupal::service('file_system')
->realpath($test_image->uri);
$this->drupalGet("node/add/$type_name");
$page->findField('title[0][value]')->setValue($this->randomString());
$page->attachFileToField('files[' . $field_name . '_0]', $test_image_path);
$messages = $assert_session->waitForElementVisible('css', '.file-upload-js-error');
$this->assertEquals('The selected file image-test.png cannot be uploaded. Only files with the following extensions are allowed: txt.', $messages->getText());
// Make sure the error disappears when a valid file is uploaded.
$page->attachFileToField('files[' . $field_name . '_0]', $test_file_path);
$remove_button = $assert_session->waitForElementVisible('css', '[name="' . $field_name . '_0_remove_button"]');
$this->assertNotEmpty($remove_button);
$this->assertEmpty($this->cssSelect('.file-upload-js-error'));
}
/**
* Tests uploading more files then allowed at once.
*/
public function testUploadingMoreFilesThenAllowed() {
$type_name = 'article';
$field_name = 'test_file_field_1';
$cardinality = 2;
$this->createFileField($field_name, 'node', $type_name, ['cardinality' => $cardinality]);
$web_driver = $this->getSession()->getDriver();
$file_system = \Drupal::service('file_system');
$files = array_slice($this->getTestFiles('text'), 0, 3);
$real_paths = [];
foreach ($files as $file) {
$real_paths[] = $file_system->realpath($file->uri);
}
$remote_paths = [];
foreach ($real_paths as $path) {
$remote_paths[] = $web_driver->uploadFileAndGetRemoteFilePath($path);
}
// Tests that uploading multiple remote files works with remote path.
$this->drupalGet("node/add/$type_name");
$multiple_field = $this->getSession()->getPage()->findField('files[test_file_field_1_0][]');
$multiple_field->setValue(implode("\n", $remote_paths));
$this->assertSession()->assertWaitOnAjaxRequest();
$args = [
'%field' => $field_name,
'@max' => $cardinality,
'@count' => 3,
'%list' => 'text-2.txt',
];
$this->assertRaw(t('Field %field can only hold @max values but there were @count uploaded. The following files have been omitted as a result: %list.', $args));
}
/**
* Retrieves a sample file of the specified type.
*
* @return \Drupal\file\FileInterface
* The new unsaved file entity.
*/
public function getTestFile($type_name, $size = NULL) {
// Get a file to upload.
$file = current($this->getTestFiles($type_name, $size));
// Add a filesize property to files as would be read by
// \Drupal\file\Entity\File::load().
$file->filesize = filesize($file->uri);
return File::create((array) $file);
}
}
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment