Skip to content
Snippets Groups Projects
Commit 26ad8f85 authored by Alex Pott's avatar Alex Pott
Browse files

Issue #2863416 by zviryatko, Jo Fitzgerald, michielnugter: Convert web tests... 

Issue #2863416 by zviryatko, Jo Fitzgerald, michielnugter: Convert web tests to browser tests for filter module
parent 1815dfdd
No related branches found
No related tags found
2 merge requests!7452Issue #1797438. HTML5 validation is preventing form submit and not fully...,!789Issue #3210310: Adjust Database API to remove deprecated Drupal 9 code in Drupal 10
Hide whitespace changes
Inline Side-by-side
Showing
with 45 additions and 51 deletions
core/modules/filter/tests/filter_test_plugin/src/Plugin/Filter/FilterSparkles.php
+ 1
− 1
View file @ 26ad8f85
...@@ -11,7 +11,7 @@ ...@@ -11,7 +11,7 @@
* This filter does not do anything, but enabling of its module is done in a * This filter does not do anything, but enabling of its module is done in a
* test. * test.
* *
* @see \Drupal\filter\Tests\FilterFormTest::testFilterForm() * @see \Drupal\Tests\filter\Functional\FilterFormTest::testFilterForm()
* *
* @Filter( * @Filter(
* id = "filter_sparkles", * id = "filter_sparkles",
......
core/modules/filter/src/Tests/FilterAdminTest.php → core/modules/filter/tests/src/Functional/FilterAdminTest.php
+ 11
− 11
View file @ 26ad8f85
<?php <?php
namespace Drupal\filter\Tests; namespace Drupal\Tests\filter\Functional;
use Drupal\Component\Utility\Html; use Drupal\Component\Utility\Html;
use Drupal\Component\Utility\Unicode; use Drupal\Component\Utility\Unicode;
use Drupal\filter\Entity\FilterFormat; use Drupal\filter\Entity\FilterFormat;
use Drupal\node\Entity\Node; use Drupal\node\Entity\Node;
use Drupal\node\Entity\NodeType; use Drupal\node\Entity\NodeType;
use Drupal\simpletest\WebTestBase; use Drupal\Tests\BrowserTestBase;
use Drupal\user\RoleInterface; use Drupal\user\RoleInterface;
/** /**
...@@ -15,7 +15,7 @@ ...@@ -15,7 +15,7 @@
* *
* @group filter * @group filter
*/ */
class FilterAdminTest extends WebTestBase { class FilterAdminTest extends BrowserTestBase {
/** /**
* {@inheritdoc} * {@inheritdoc}
...@@ -142,7 +142,7 @@ public function testFormatAdmin() { ...@@ -142,7 +142,7 @@ public function testFormatAdmin() {
$edit_link = $this->xpath('//a[@href=:href]', [ $edit_link = $this->xpath('//a[@href=:href]', [
':href' => \Drupal::url('entity.filter_format.edit_form', ['filter_format' => $format_id]) ':href' => \Drupal::url('entity.filter_format.edit_form', ['filter_format' => $format_id])
]); ]);
$this->assertTrue($edit_link, format_string('Link href %href found.', $this->assertNotEmpty($edit_link, format_string('Link href %href found.',
['%href' => 'admin/config/content/formats/manage/' . $format_id] ['%href' => 'admin/config/content/formats/manage/' . $format_id]
)); ));
$this->drupalGet('admin/config/content/formats/manage/' . $format_id); $this->drupalGet('admin/config/content/formats/manage/' . $format_id);
...@@ -218,7 +218,7 @@ public function testFilterAdmin() { ...@@ -218,7 +218,7 @@ public function testFilterAdmin() {
':first' => 'filters[' . $first_filter . '][weight]', ':first' => 'filters[' . $first_filter . '][weight]',
':second' => 'filters[' . $second_filter . '][weight]', ':second' => 'filters[' . $second_filter . '][weight]',
]); ]);
$this->assertTrue(!empty($elements), 'Order confirmed in admin interface.'); $this->assertNotEmpty($elements, 'Order confirmed in admin interface.');
// Reorder filters. // Reorder filters.
$edit = []; $edit = [];
...@@ -234,7 +234,7 @@ public function testFilterAdmin() { ...@@ -234,7 +234,7 @@ public function testFilterAdmin() {
':first' => 'filters[' . $second_filter . '][weight]', ':first' => 'filters[' . $second_filter . '][weight]',
':second' => 'filters[' . $first_filter . '][weight]', ':second' => 'filters[' . $first_filter . '][weight]',
]); ]);
$this->assertTrue(!empty($elements), 'Reorder confirmed in admin interface.'); $this->assertNotEmpty($elements, 'Reorder confirmed in admin interface.');
$filter_format = FilterFormat::load($restricted); $filter_format = FilterFormat::load($restricted);
foreach ($filter_format->filters() as $filter_name => $filter) { foreach ($filter_format->filters() as $filter_name => $filter) {
...@@ -260,9 +260,9 @@ public function testFilterAdmin() { ...@@ -260,9 +260,9 @@ public function testFilterAdmin() {
$format = FilterFormat::load($edit['format']); $format = FilterFormat::load($edit['format']);
$this->assertNotNull($format, 'Format found in database.'); $this->assertNotNull($format, 'Format found in database.');
$this->drupalGet('admin/config/content/formats/manage/' . $format->id()); $this->drupalGet('admin/config/content/formats/manage/' . $format->id());
$this->assertFieldByName('roles[' . RoleInterface::AUTHENTICATED_ID . ']', '', 'Role found.'); $this->assertFieldByName('roles[' . RoleInterface::AUTHENTICATED_ID . ']', RoleInterface::AUTHENTICATED_ID);
$this->assertFieldByName('filters[' . $second_filter . '][status]', '', 'Line break filter found.'); $this->assertFieldByName('filters[' . $second_filter . '][status]', TRUE);
$this->assertFieldByName('filters[' . $first_filter . '][status]', '', 'URL filter found.'); $this->assertFieldByName('filters[' . $first_filter . '][status]', TRUE);
// Disable new filter. // Disable new filter.
$this->drupalPostForm('admin/config/content/formats/manage/' . $format->id() . '/disable', [], t('Disable')); $this->drupalPostForm('admin/config/content/formats/manage/' . $format->id() . '/disable', [], t('Disable'));
...@@ -297,8 +297,8 @@ public function testFilterAdmin() { ...@@ -297,8 +297,8 @@ public function testFilterAdmin() {
$this->assertText(t('Basic page @title has been created.', ['@title' => $edit['title[0][value]']]), 'Filtered node created.'); $this->assertText(t('Basic page @title has been created.', ['@title' => $edit['title[0][value]']]), 'Filtered node created.');
// Verify that the creation message contains a link to a node. // Verify that the creation message contains a link to a node.
$view_link = $this->xpath('//div[@class="messages"]//a[contains(@href, :href)]', [':href' => 'node/']); $view_link = $this->xpath('//div[contains(@class, "messages")]//a[contains(@href, :href)]', [':href' => 'node/']);
$this->assert(isset($view_link), 'The message area contains a link to a node'); $this->assertNotEmpty($view_link, 'The message area contains a link to a node');
$node = $this->drupalGetNodeByTitle($edit['title[0][value]']); $node = $this->drupalGetNodeByTitle($edit['title[0][value]']);
$this->assertTrue($node, 'Node found in database.'); $this->assertTrue($node, 'Node found in database.');
......
core/modules/filter/src/Tests/FilterFormTest.php → core/modules/filter/tests/src/Functional/FilterFormTest.php
+ 17
− 25
View file @ 26ad8f85
<?php <?php
namespace Drupal\filter\Tests; namespace Drupal\Tests\filter\Functional;
use Drupal\Component\Utility\SafeMarkup; use Drupal\Component\Utility\SafeMarkup;
use Drupal\filter\Entity\FilterFormat; use Drupal\filter\Entity\FilterFormat;
use Drupal\simpletest\WebTestBase; use Drupal\Tests\BrowserTestBase;
/** /**
* Tests form elements with associated text formats. * Tests form elements with associated text formats.
* *
* @group filter * @group filter
*/ */
class FilterFormTest extends WebTestBase { class FilterFormTest extends BrowserTestBase {
/** /**
* Modules to enable for this test. * Modules to enable for this test.
...@@ -173,13 +173,10 @@ protected function doFilterFormTestAsNonAdmin() { ...@@ -173,13 +173,10 @@ protected function doFilterFormTestAsNonAdmin() {
* *
* @param string $id * @param string $id
* The HTML ID of the select element. * The HTML ID of the select element.
*
* @return bool
* TRUE if the assertion passed; FALSE otherwise.
*/ */
protected function assertNoSelect($id) { protected function assertNoSelect($id) {
$select = $this->xpath('//select[@id=:id]', [':id' => $id]); $select = $this->xpath('//select[@id=:id]', [':id' => $id]);
return $this->assertFalse($select, SafeMarkup::format('Field @id does not exist.', [ $this->assertEmpty($select, SafeMarkup::format('Field @id does not exist.', [
'@id' => $id, '@id' => $id,
])); ]));
} }
...@@ -199,14 +196,13 @@ protected function assertNoSelect($id) { ...@@ -199,14 +196,13 @@ protected function assertNoSelect($id) {
*/ */
protected function assertOptions($id, array $expected_options, $selected) { protected function assertOptions($id, array $expected_options, $selected) {
$select = $this->xpath('//select[@id=:id]', [':id' => $id]); $select = $this->xpath('//select[@id=:id]', [':id' => $id]);
$select = reset($select); $this->assertNotEmpty($select, SafeMarkup::format('Field @id exists.', [
$passed = $this->assertTrue($select instanceof \SimpleXMLElement, SafeMarkup::format('Field @id exists.', [
'@id' => $id, '@id' => $id,
])); ]));
$select = reset($select);
$found_options = $this->getAllOptions($select); $found_options = $select->findAll('css', 'option');
foreach ($found_options as $found_key => $found_option) { foreach ($found_options as $found_key => $found_option) {
$expected_key = array_search($found_option->attributes()->value, $expected_options); $expected_key = array_search($found_option->getValue(), $expected_options);
if ($expected_key !== FALSE) { if ($expected_key !== FALSE) {
$this->pass(SafeMarkup::format('Option @option for field @id exists.', [ $this->pass(SafeMarkup::format('Option @option for field @id exists.', [
'@option' => $expected_options[$expected_key], '@option' => $expected_options[$expected_key],
...@@ -224,17 +220,15 @@ protected function assertOptions($id, array $expected_options, $selected) { ...@@ -224,17 +220,15 @@ protected function assertOptions($id, array $expected_options, $selected) {
'@option' => $expected_option, '@option' => $expected_option,
'@id' => $id, '@id' => $id,
])); ]));
$passed = FALSE;
} }
foreach ($found_options as $found_option) { foreach ($found_options as $found_option) {
$this->fail(SafeMarkup::format('Option @option for field @id does not exist.', [ $this->fail(SafeMarkup::format('Option @option for field @id does not exist.', [
'@option' => $found_option->attributes()->value, '@option' => $found_option->getValue(),
'@id' => $id, '@id' => $id,
])); ]));
$passed = FALSE;
} }
return $passed && $this->assertOptionSelected($id, $selected); $this->assertOptionSelected($id, $selected);
} }
/** /**
...@@ -253,14 +247,13 @@ protected function assertRequiredSelectAndOptions($id, array $options) { ...@@ -253,14 +247,13 @@ protected function assertRequiredSelectAndOptions($id, array $options) {
$select = $this->xpath('//select[@id=:id and contains(@required, "required")]', [ $select = $this->xpath('//select[@id=:id and contains(@required, "required")]', [
':id' => $id, ':id' => $id,
]); ]);
$select = reset($select); $this->assertNotEmpty($select, SafeMarkup::format('Required field @id exists.', [
$passed = $this->assertTrue($select instanceof \SimpleXMLElement, SafeMarkup::format('Required field @id exists.', [
'@id' => $id, '@id' => $id,
])); ]));
// A required select element has a "- Select -" option whose key is an empty // A required select element has a "- Select -" option whose key is an empty
// string. // string.
$options[] = ''; $options[] = '';
return $passed && $this->assertOptions($id, $options, ''); $this->assertOptions($id, $options, '');
} }
/** /**
...@@ -276,8 +269,7 @@ protected function assertEnabledTextarea($id) { ...@@ -276,8 +269,7 @@ protected function assertEnabledTextarea($id) {
$textarea = $this->xpath('//textarea[@id=:id and not(contains(@disabled, "disabled"))]', [ $textarea = $this->xpath('//textarea[@id=:id and not(contains(@disabled, "disabled"))]', [
':id' => $id, ':id' => $id,
]); ]);
$textarea = reset($textarea); $this->assertNotEmpty($textarea, SafeMarkup::format('Enabled field @id exists.', [
return $this->assertTrue($textarea instanceof \SimpleXMLElement, SafeMarkup::format('Enabled field @id exists.', [
'@id' => $id, '@id' => $id,
])); ]));
} }
...@@ -295,17 +287,17 @@ protected function assertDisabledTextarea($id) { ...@@ -295,17 +287,17 @@ protected function assertDisabledTextarea($id) {
$textarea = $this->xpath('//textarea[@id=:id and contains(@disabled, "disabled")]', [ $textarea = $this->xpath('//textarea[@id=:id and contains(@disabled, "disabled")]', [
':id' => $id, ':id' => $id,
]); ]);
$textarea = reset($textarea); $this->assertNotEmpty($textarea, SafeMarkup::format('Disabled field @id exists.', [
$passed = $this->assertTrue($textarea instanceof \SimpleXMLElement, SafeMarkup::format('Disabled field @id exists.', [
'@id' => $id, '@id' => $id,
])); ]));
$textarea = reset($textarea);
$expected = 'This field has been disabled because you do not have sufficient permissions to edit it.'; $expected = 'This field has been disabled because you do not have sufficient permissions to edit it.';
$passed = $passed && $this->assertEqual((string) $textarea, $expected, SafeMarkup::format('Disabled textarea @id hides text in an inaccessible text format.', [ $this->assertEqual($textarea->getText(), $expected, SafeMarkup::format('Disabled textarea @id hides text in an inaccessible text format.', [
'@id' => $id, '@id' => $id,
])); ]));
// Make sure the text format select is not shown. // Make sure the text format select is not shown.
$select_id = str_replace('value', 'format--2', $id); $select_id = str_replace('value', 'format--2', $id);
return $passed && $this->assertNoSelect($select_id); $this->assertNoSelect($select_id);
} }
} }
core/modules/filter/src/Tests/FilterFormatAccessTest.php → core/modules/filter/tests/src/Functional/FilterFormatAccessTest.php
+ 4
− 4
View file @ 26ad8f85
<?php <?php
namespace Drupal\filter\Tests; namespace Drupal\Tests\filter\Functional;
use Drupal\Component\Utility\Unicode; use Drupal\Component\Utility\Unicode;
use Drupal\Core\Access\AccessResult; use Drupal\Core\Access\AccessResult;
use Drupal\filter\Entity\FilterFormat; use Drupal\filter\Entity\FilterFormat;
use Drupal\simpletest\WebTestBase; use Drupal\Tests\BrowserTestBase;
/** /**
* Tests access to text formats. * Tests access to text formats.
...@@ -13,7 +13,7 @@ ...@@ -13,7 +13,7 @@
* @group Access * @group Access
* @group filter * @group filter
*/ */
class FilterFormatAccessTest extends WebTestBase { class FilterFormatAccessTest extends BrowserTestBase {
/** /**
* Modules to enable. * Modules to enable.
...@@ -151,7 +151,7 @@ public function testFormatPermissions() { ...@@ -151,7 +151,7 @@ public function testFormatPermissions() {
]); ]);
$options = []; $options = [];
foreach ($elements as $element) { foreach ($elements as $element) {
$options[(string) $element['value']] = $element; $options[$element->getValue()] = $element;
} }
$this->assertTrue(isset($options[$this->allowedFormat->id()]), 'The allowed text format appears as an option when adding a new node.'); $this->assertTrue(isset($options[$this->allowedFormat->id()]), 'The allowed text format appears as an option when adding a new node.');
$this->assertFalse(isset($options[$this->disallowedFormat->id()]), 'The disallowed text format does not appear as an option when adding a new node.'); $this->assertFalse(isset($options[$this->disallowedFormat->id()]), 'The disallowed text format does not appear as an option when adding a new node.');
......
core/modules/filter/src/Tests/FilterHtmlImageSecureTest.php → core/modules/filter/tests/src/Functional/FilterHtmlImageSecureTest.php
+ 12
− 10
View file @ 26ad8f85
<?php <?php
namespace Drupal\filter\Tests; namespace Drupal\Tests\filter\Functional;
use Drupal\comment\Tests\CommentTestTrait; use Drupal\comment\Tests\CommentTestTrait;
use Drupal\Core\StreamWrapper\PublicStream; use Drupal\Core\StreamWrapper\PublicStream;
use Drupal\simpletest\WebTestBase;
use Drupal\filter\Entity\FilterFormat; use Drupal\filter\Entity\FilterFormat;
use Drupal\Tests\BrowserTestBase;
use Drupal\Tests\TestFileCreationTrait;
/** /**
* Tests restriction of IMG tags in HTML input. * Tests restriction of IMG tags in HTML input.
* *
* @group filter * @group filter
*/ */
class FilterHtmlImageSecureTest extends WebTestBase { class FilterHtmlImageSecureTest extends BrowserTestBase {
use CommentTestTrait; use CommentTestTrait;
use TestFileCreationTrait;
/** /**
* Modules to enable. * Modules to enable.
...@@ -90,7 +92,7 @@ public function testImageSource() { ...@@ -90,7 +92,7 @@ public function testImageSource() {
$title_text = t('This image has been removed. For security reasons, only images from the local domain are allowed.'); $title_text = t('This image has been removed. For security reasons, only images from the local domain are allowed.');
// Put a test image in the files directory. // Put a test image in the files directory.
$test_images = $this->drupalGetTestFiles('image'); $test_images = $this->getTestFiles('image');
$test_image = $test_images[0]->filename; $test_image = $test_images[0]->filename;
// Put a test image in the files directory with special filename. // Put a test image in the files directory with special filename.
...@@ -141,14 +143,14 @@ public function testImageSource() { ...@@ -141,14 +143,14 @@ public function testImageSource() {
foreach ($this->xpath('//img[@testattribute="' . hash('sha256', $image) . '"]') as $element) { foreach ($this->xpath('//img[@testattribute="' . hash('sha256', $image) . '"]') as $element) {
$found = TRUE; $found = TRUE;
if ($converted == $red_x_image) { if ($converted == $red_x_image) {
$this->assertEqual((string) $element['src'], $red_x_image); $this->assertEqual($element->getAttribute('src'), $red_x_image);
$this->assertEqual((string) $element['alt'], $alt_text); $this->assertEqual($element->getAttribute('alt'), $alt_text);
$this->assertEqual((string) $element['title'], $title_text); $this->assertEqual($element->getAttribute('title'), $title_text);
$this->assertEqual((string) $element['height'], '16'); $this->assertEqual($element->getAttribute('height'), '16');
$this->assertEqual((string) $element['width'], '16'); $this->assertEqual($element->getAttribute('width'), '16');
} }
else { else {
$this->assertEqual((string) $element['src'], $converted); $this->assertEqual($element->getAttribute('src'), $converted);
} }
} }
$this->assertTrue($found, format_string('@image was found.', ['@image' => $image])); $this->assertTrue($found, format_string('@image was found.', ['@image' => $image]));
......
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