Unverified Commit 27740c26 authored by alexpott's avatar alexpott

Issue #2942900 by Mixologic, vaplas, jibran, dawehner, Lendude, martin107,...

Issue #2942900 by Mixologic, vaplas, jibran, dawehner, Lendude, martin107, alexpott, tedbow, tacituseu, tstoeckler, heddn: Convert JavascriptTestBase Tests to use DrupalSelenium2Driver
parent c3615d23
...@@ -47,7 +47,7 @@ build: ...@@ -47,7 +47,7 @@ build:
# Functional JavaScript tests require a concurrency of 1 because there is # Functional JavaScript tests require a concurrency of 1 because there is
# only one instance of PhantomJS on the testbot machine. # only one instance of PhantomJS on the testbot machine.
run_tests.javascript: run_tests.javascript:
concurrency: 1 concurrency: 15
types: 'PHPUnit-FunctionalJavascript' types: 'PHPUnit-FunctionalJavascript'
testgroups: '--all' testgroups: '--all'
suppress-deprecations: false suppress-deprecations: false
......
...@@ -3,7 +3,7 @@ ...@@ -3,7 +3,7 @@
namespace Drupal\Tests\action\FunctionalJavascript; namespace Drupal\Tests\action\FunctionalJavascript;
use Drupal\Core\Url; use Drupal\Core\Url;
use Drupal\FunctionalJavascriptTests\JavascriptTestBase; use Drupal\FunctionalJavascriptTests\WebDriverTestBase;
use Drupal\system\Entity\Action; use Drupal\system\Entity\Action;
/** /**
...@@ -11,7 +11,7 @@ ...@@ -11,7 +11,7 @@
* *
* @group action * @group action
*/ */
class ActionFormAjaxTest extends JavascriptTestBase { class ActionFormAjaxTest extends WebDriverTestBase {
/** /**
* {@inheritdoc} * {@inheritdoc}
...@@ -33,16 +33,15 @@ protected function setUp() { ...@@ -33,16 +33,15 @@ protected function setUp() {
public function testActionConfigurationWithAjax() { public function testActionConfigurationWithAjax() {
$url = Url::fromRoute('action.admin_add', ['action_id' => 'action_form_ajax_test']); $url = Url::fromRoute('action.admin_add', ['action_id' => 'action_form_ajax_test']);
$this->drupalGet($url); $this->drupalGet($url);
$this->assertSession()->statusCodeEquals(200);
$page = $this->getSession()->getPage(); $page = $this->getSession()->getPage();
$id = 'test_plugin'; $id = 'test_plugin';
$page->find('css', '[name="id"]') $this->assertSession()->waitForElementVisible('named', ['button', 'Edit'])->press();
->setValue($id); $this->assertSession()->waitForElementVisible('css', '[name="id"]')->setValue($id);
$page->find('css', '[name="having_a_party"]') $page->find('css', '[name="having_a_party"]')
->check(); ->check();
$this->assertSession()->waitForElement('css', '[name="party_time"]'); $this->assertSession()->waitForElementVisible('css', '[name="party_time"]');
$party_time = 'Evening'; $party_time = 'Evening';
$page->find('css', '[name="party_time"]') $page->find('css', '[name="party_time"]')
...@@ -54,7 +53,6 @@ public function testActionConfigurationWithAjax() { ...@@ -54,7 +53,6 @@ public function testActionConfigurationWithAjax() {
$url = Url::fromRoute('entity.action.collection'); $url = Url::fromRoute('entity.action.collection');
$this->assertSession()->pageTextContains('The action has been successfully saved.'); $this->assertSession()->pageTextContains('The action has been successfully saved.');
$this->assertSession()->addressEquals($url); $this->assertSession()->addressEquals($url);
$this->assertSession()->statusCodeEquals(200);
// Check storage. // Check storage.
$instance = Action::load($id); $instance = Action::load($id);
......
...@@ -11,7 +11,7 @@ ...@@ -11,7 +11,7 @@
use Drupal\Core\Url; use Drupal\Core\Url;
use Drupal\editor\Entity\Editor; use Drupal\editor\Entity\Editor;
use Drupal\filter\Entity\FilterFormat; use Drupal\filter\Entity\FilterFormat;
use Drupal\FunctionalJavascriptTests\JavascriptTestBase; use Drupal\FunctionalJavascriptTests\WebDriverTestBase;
use Drupal\simpletest\ContentTypeCreationTrait; use Drupal\simpletest\ContentTypeCreationTrait;
use Drupal\simpletest\NodeCreationTrait; use Drupal\simpletest\NodeCreationTrait;
...@@ -20,7 +20,7 @@ ...@@ -20,7 +20,7 @@
* *
* @group big_pipe * @group big_pipe
*/ */
class BigPipeRegressionTest extends JavascriptTestBase { class BigPipeRegressionTest extends WebDriverTestBase {
use CommentTestTrait; use CommentTestTrait;
use ContentTypeCreationTrait; use ContentTypeCreationTrait;
......
...@@ -3,14 +3,14 @@ ...@@ -3,14 +3,14 @@
namespace Drupal\Tests\block\FunctionalJavascript; namespace Drupal\Tests\block\FunctionalJavascript;
use Behat\Mink\Element\NodeElement; use Behat\Mink\Element\NodeElement;
use Drupal\FunctionalJavascriptTests\JavascriptTestBase; use Drupal\FunctionalJavascriptTests\WebDriverTestBase;
/** /**
* Tests the JavaScript functionality of the block add filter. * Tests the JavaScript functionality of the block add filter.
* *
* @group block * @group block
*/ */
class BlockFilterTest extends JavascriptTestBase { class BlockFilterTest extends WebDriverTestBase {
/** /**
* {@inheritdoc} * {@inheritdoc}
......
...@@ -4,7 +4,7 @@ ...@@ -4,7 +4,7 @@
use Behat\Mink\Exception\ExpectationException; use Behat\Mink\Exception\ExpectationException;
use Drupal\Component\Render\FormattableMarkup; use Drupal\Component\Render\FormattableMarkup;
use Drupal\FunctionalJavascriptTests\JavascriptTestBase; use Drupal\FunctionalJavascriptTests\WebDriverTestBase;
use Drupal\node\Entity\Node; use Drupal\node\Entity\Node;
/** /**
...@@ -12,7 +12,7 @@ ...@@ -12,7 +12,7 @@
* *
* @group book * @group book
*/ */
class BookJavascriptTest extends JavascriptTestBase { class BookJavascriptTest extends WebDriverTestBase {
/** /**
* {@inheritdoc} * {@inheritdoc}
......
...@@ -4,14 +4,14 @@ ...@@ -4,14 +4,14 @@
use Drupal\editor\Entity\Editor; use Drupal\editor\Entity\Editor;
use Drupal\filter\Entity\FilterFormat; use Drupal\filter\Entity\FilterFormat;
use Drupal\FunctionalJavascriptTests\JavascriptTestBase; use Drupal\FunctionalJavascriptTests\WebDriverTestBase;
/** /**
* Tests delivery of CSS to CKEditor via AJAX. * Tests delivery of CSS to CKEditor via AJAX.
* *
* @group ckeditor * @group ckeditor
*/ */
class AjaxCssTest extends JavascriptTestBase { class AjaxCssTest extends WebDriverTestBase {
/** /**
* {@inheritdoc} * {@inheritdoc}
......
...@@ -7,7 +7,7 @@ ...@@ -7,7 +7,7 @@
use Drupal\field\Entity\FieldConfig; use Drupal\field\Entity\FieldConfig;
use Drupal\field\Entity\FieldStorageConfig; use Drupal\field\Entity\FieldStorageConfig;
use Drupal\filter\Entity\FilterFormat; use Drupal\filter\Entity\FilterFormat;
use Drupal\FunctionalJavascriptTests\JavascriptTestBase; use Drupal\FunctionalJavascriptTests\WebDriverTestBase;
use Drupal\node\Entity\NodeType; use Drupal\node\Entity\NodeType;
/** /**
...@@ -15,7 +15,7 @@ ...@@ -15,7 +15,7 @@
* *
* @group ckeditor * @group ckeditor
*/ */
class CKEditorIntegrationTest extends JavascriptTestBase { class CKEditorIntegrationTest extends WebDriverTestBase {
/** /**
* The account. * The account.
...@@ -92,9 +92,10 @@ public function testFragmentLink() { ...@@ -92,9 +92,10 @@ public function testFragmentLink() {
$session->getPage(); $session->getPage();
// Add a bottom margin to the title field to be sure the body field is not // Add a bottom margin to the title field to be sure the body field is not
// visible. PhantomJS runs with a resolution of 1024x768px. // visible.
$session->executeScript("document.getElementById('edit-title-0-value').style.marginBottom = '800px';"); $session->executeScript("document.getElementById('edit-title-0-value').style.marginBottom = window.innerHeight*2 +'px';");
$this->assertSession()->waitForElementVisible('css', $ckeditor_id);
// Check that the CKEditor-enabled body field is currently not visible in // Check that the CKEditor-enabled body field is currently not visible in
// the viewport. // the viewport.
$web_assert->assertNotVisibleInViewport('css', $ckeditor_id, 'topLeft', 'CKEditor-enabled body field is visible.'); $web_assert->assertNotVisibleInViewport('css', $ckeditor_id, 'topLeft', 'CKEditor-enabled body field is visible.');
......
...@@ -2,14 +2,14 @@ ...@@ -2,14 +2,14 @@
namespace Drupal\Tests\config\FunctionalJavascript; namespace Drupal\Tests\config\FunctionalJavascript;
use Drupal\FunctionalJavascriptTests\JavascriptTestBase; use Drupal\FunctionalJavascriptTests\WebDriverTestBase;
/** /**
* Tests the Config operations through the UI. * Tests the Config operations through the UI.
* *
* @group config * @group config
*/ */
class ConfigEntityTest extends JavascriptTestBase { class ConfigEntityTest extends WebDriverTestBase {
/** /**
* {@inheritdoc} * {@inheritdoc}
......
...@@ -2,14 +2,14 @@ ...@@ -2,14 +2,14 @@
namespace Drupal\Tests\config_translation\FunctionalJavascript; namespace Drupal\Tests\config_translation\FunctionalJavascript;
use Drupal\FunctionalJavascriptTests\JavascriptTestBase; use Drupal\FunctionalJavascriptTests\WebDriverTestBase;
/** /**
* Translate settings and entities to various languages. * Translate settings and entities to various languages.
* *
* @group config_translation * @group config_translation
*/ */
class ConfigTranslationUiTest extends JavascriptTestBase { class ConfigTranslationUiTest extends WebDriverTestBase {
/** /**
* {@inheritdoc} * {@inheritdoc}
......
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
namespace Drupal\Tests\content_translation\FunctionalJavascript; namespace Drupal\Tests\content_translation\FunctionalJavascript;
use Drupal\FunctionalJavascriptTests\JavascriptTestBase; use Drupal\FunctionalJavascriptTests\WebDriverTestBase;
use Drupal\language\Entity\ConfigurableLanguage; use Drupal\language\Entity\ConfigurableLanguage;
/** /**
...@@ -10,7 +10,7 @@ ...@@ -10,7 +10,7 @@
* *
* @group content_translation * @group content_translation
*/ */
class ContentTranslationContextualLinksTest extends JavascriptTestBase { class ContentTranslationContextualLinksTest extends WebDriverTestBase {
/** /**
* The 'translator' user to use during testing. * The 'translator' user to use during testing.
......
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
namespace Drupal\Tests\contextual\FunctionalJavascript; namespace Drupal\Tests\contextual\FunctionalJavascript;
use Drupal\FunctionalJavascriptTests\JavascriptTestBase; use Drupal\FunctionalJavascriptTests\WebDriverTestBase;
use Drupal\user\Entity\Role; use Drupal\user\Entity\Role;
/** /**
...@@ -10,7 +10,7 @@ ...@@ -10,7 +10,7 @@
* *
* @group contextual * @group contextual
*/ */
class ContextualLinksTest extends JavascriptTestBase { class ContextualLinksTest extends WebDriverTestBase {
use ContextualLinkClickTrait; use ContextualLinkClickTrait;
......
...@@ -2,14 +2,14 @@ ...@@ -2,14 +2,14 @@
namespace Drupal\Tests\contextual\FunctionalJavascript; namespace Drupal\Tests\contextual\FunctionalJavascript;
use Drupal\FunctionalJavascriptTests\JavascriptTestBase; use Drupal\FunctionalJavascriptTests\WebDriverTestBase;
/** /**
* Tests edit mode. * Tests edit mode.
* *
* @group contextual * @group contextual
*/ */
class EditModeTest extends JavascriptTestBase { class EditModeTest extends WebDriverTestBase {
/** /**
* CSS selector for Drupal's announce element. * CSS selector for Drupal's announce element.
......
...@@ -6,14 +6,14 @@ ...@@ -6,14 +6,14 @@
use Drupal\Core\Field\FieldStorageDefinitionInterface; use Drupal\Core\Field\FieldStorageDefinitionInterface;
use Drupal\field\Entity\FieldConfig; use Drupal\field\Entity\FieldConfig;
use Drupal\field\Entity\FieldStorageConfig; use Drupal\field\Entity\FieldStorageConfig;
use Drupal\FunctionalJavascriptTests\JavascriptTestBase; use Drupal\FunctionalJavascriptTests\WebDriverTestBase;
/** /**
* Tests add more behavior for a multiple value field. * Tests add more behavior for a multiple value field.
* *
* @group field * @group field
*/ */
class FormJSAddMoreTest extends JavascriptTestBase { class FormJSAddMoreTest extends WebDriverTestBase {
/** /**
* {@inheritdoc} * {@inheritdoc}
......
...@@ -3,14 +3,14 @@ ...@@ -3,14 +3,14 @@
namespace Drupal\Tests\field_layout\FunctionalJavascript; namespace Drupal\Tests\field_layout\FunctionalJavascript;
use Drupal\entity_test\Entity\EntityTest; use Drupal\entity_test\Entity\EntityTest;
use Drupal\FunctionalJavascriptTests\JavascriptTestBase; use Drupal\FunctionalJavascriptTests\WebDriverTestBase;
/** /**
* Tests using field layout for entity displays. * Tests using field layout for entity displays.
* *
* @group field_layout * @group field_layout
*/ */
class FieldLayoutTest extends JavascriptTestBase { class FieldLayoutTest extends WebDriverTestBase {
/** /**
* {@inheritdoc} * {@inheritdoc}
...@@ -100,12 +100,15 @@ public function testEntityForm() { ...@@ -100,12 +100,15 @@ public function testEntityForm() {
// After a refresh the new regions are still there. // After a refresh the new regions are still there.
$this->drupalGet('entity_test/structure/entity_test/form-display'); $this->drupalGet('entity_test/structure/entity_test/form-display');
$this->assertEquals(['Top', 'First', 'Second', 'Bottom', 'Disabled'], $this->getRegionTitles()); $this->assertEquals(['Top', 'First', 'Second', 'Bottom', 'Disabled'], $this->getRegionTitles());
$this->assertSession()->waitForElement('css', '.tabledrag-handle');
$id = $this->getSession()->getPage()->find('css', '[name="form_build_id"]')->getValue();
// Drag the field to the second region. // Drag the field to the second region.
$field_test_text_row = $this->getSession()->getPage()->find('css', '#field-test-text'); $field_test_text_row = $this->getSession()->getPage()->find('css', '#field-test-text');
$second_region_row = $this->getSession()->getPage()->find('css', '.region-second-message'); $second_region_row = $this->getSession()->getPage()->find('css', '.region-second-message');
$field_test_text_row->find('css', '.handle')->dragTo($second_region_row); $field_test_text_row->find('css', '.handle')->dragTo($second_region_row);
$this->assertSession()->assertWaitOnAjaxRequest(); $this->assertSession()->assertWaitOnAjaxRequest();
$this->assertSession()->waitForElement('css', "[name='form_build_id']:not([value='$id'])");
$this->submitForm([], 'Save'); $this->submitForm([], 'Save');
$this->assertSession()->pageTextContains('Your settings have been saved.'); $this->assertSession()->pageTextContains('Your settings have been saved.');
...@@ -158,6 +161,8 @@ public function testEntityView() { ...@@ -158,6 +161,8 @@ public function testEntityView() {
// After a refresh the new regions are still there. // After a refresh the new regions are still there.
$this->drupalGet('entity_test/structure/entity_test/display'); $this->drupalGet('entity_test/structure/entity_test/display');
$this->assertEquals(['Top', 'First', 'Second', 'Bottom', 'Disabled'], $this->getRegionTitles()); $this->assertEquals(['Top', 'First', 'Second', 'Bottom', 'Disabled'], $this->getRegionTitles());
$this->assertSession()->waitForElement('css', '.tabledrag-handle');
$id = $this->getSession()->getPage()->find('css', '[name="form_build_id"]')->getValue();
// Drag the field to the first region. // Drag the field to the first region.
$this->assertTrue($this->assertSession()->optionExists('fields[field_test_text][region]', 'hidden')->isSelected()); $this->assertTrue($this->assertSession()->optionExists('fields[field_test_text][region]', 'hidden')->isSelected());
...@@ -166,6 +171,7 @@ public function testEntityView() { ...@@ -166,6 +171,7 @@ public function testEntityView() {
$field_test_text_row->find('css', '.handle')->dragTo($first_region_row); $field_test_text_row->find('css', '.handle')->dragTo($first_region_row);
$this->assertSession()->assertWaitOnAjaxRequest(); $this->assertSession()->assertWaitOnAjaxRequest();
$this->assertFalse($this->assertSession()->optionExists('fields[field_test_text][region]', 'hidden')->isSelected()); $this->assertFalse($this->assertSession()->optionExists('fields[field_test_text][region]', 'hidden')->isSelected());
$this->assertSession()->waitForElement('css', "[name='form_build_id']:not([value='$id'])");
$this->submitForm([], 'Save'); $this->submitForm([], 'Save');
$this->assertSession()->pageTextContains('Your settings have been saved.'); $this->assertSession()->pageTextContains('Your settings have been saved.');
......
...@@ -3,14 +3,14 @@ ...@@ -3,14 +3,14 @@
namespace Drupal\Tests\field_ui\FunctionalJavascript; namespace Drupal\Tests\field_ui\FunctionalJavascript;
use Drupal\entity_test\Entity\EntityTest; use Drupal\entity_test\Entity\EntityTest;
use Drupal\FunctionalJavascriptTests\JavascriptTestBase; use Drupal\FunctionalJavascriptTests\WebDriverTestBase;
/** /**
* Tests the UI for entity displays. * Tests the UI for entity displays.
* *
* @group field_ui * @group field_ui
*/ */
class EntityDisplayTest extends JavascriptTestBase { class EntityDisplayTest extends WebDriverTestBase {
/** /**
* {@inheritdoc} * {@inheritdoc}
...@@ -50,7 +50,8 @@ public function testEntityForm() { ...@@ -50,7 +50,8 @@ public function testEntityForm() {
$this->drupalGet('entity_test/structure/entity_test/form-display'); $this->drupalGet('entity_test/structure/entity_test/form-display');
$this->assertTrue($this->assertSession()->optionExists('fields[field_test_text][region]', 'content')->isSelected()); $this->assertTrue($this->assertSession()->optionExists('fields[field_test_text][region]', 'content')->isSelected());
$this->getSession()->getPage()->pressButton('Show row weights');
$this->assertSession()->waitForElementVisible('css', '[name="fields[field_test_text][region]"]');
$this->getSession()->getPage()->selectFieldOption('fields[field_test_text][region]', 'hidden'); $this->getSession()->getPage()->selectFieldOption('fields[field_test_text][region]', 'hidden');
$this->assertSession()->assertWaitOnAjaxRequest(); $this->assertSession()->assertWaitOnAjaxRequest();
$this->assertTrue($this->assertSession()->optionExists('fields[field_test_text][region]', 'hidden')->isSelected()); $this->assertTrue($this->assertSession()->optionExists('fields[field_test_text][region]', 'hidden')->isSelected());
...@@ -72,6 +73,8 @@ public function testEntityView() { ...@@ -72,6 +73,8 @@ public function testEntityView() {
$this->drupalGet('entity_test/structure/entity_test/display'); $this->drupalGet('entity_test/structure/entity_test/display');
$this->assertSession()->elementExists('css', '.region-content-message.region-empty'); $this->assertSession()->elementExists('css', '.region-content-message.region-empty');
$this->getSession()->getPage()->pressButton('Show row weights');
$this->assertSession()->waitForElementVisible('css', '[name="fields[field_test_text][region]"]');
$this->assertTrue($this->assertSession()->optionExists('fields[field_test_text][region]', 'hidden')->isSelected()); $this->assertTrue($this->assertSession()->optionExists('fields[field_test_text][region]', 'hidden')->isSelected());
$this->getSession()->getPage()->selectFieldOption('fields[field_test_text][region]', 'content'); $this->getSession()->getPage()->selectFieldOption('fields[field_test_text][region]', 'content');
...@@ -92,12 +95,16 @@ public function testEntityView() { ...@@ -92,12 +95,16 @@ public function testEntityView() {
public function testExtraFields() { public function testExtraFields() {
entity_test_create_bundle('bundle_with_extra_fields'); entity_test_create_bundle('bundle_with_extra_fields');
$this->drupalGet('entity_test/structure/bundle_with_extra_fields/display'); $this->drupalGet('entity_test/structure/bundle_with_extra_fields/display');
$this->assertSession()->waitForElement('css', '.tabledrag-handle');
$id = $this->getSession()->getPage()->find('css', '[name="form_build_id"]')->getValue();
$extra_field_row = $this->getSession()->getPage()->find('css', '#display-extra-field'); $extra_field_row = $this->getSession()->getPage()->find('css', '#display-extra-field');
$disabled_region_row = $this->getSession()->getPage()->find('css', '.region-hidden-title'); $disabled_region_row = $this->getSession()->getPage()->find('css', '.region-hidden-title');
$extra_field_row->find('css', '.handle')->dragTo($disabled_region_row); $extra_field_row->find('css', '.handle')->dragTo($disabled_region_row);
$this->assertSession()->assertWaitOnAjaxRequest(); $this->assertSession()->assertWaitOnAjaxRequest();
$this->assertSession()
->waitForElement('css', "[name='form_build_id']:not([value='$id'])");
$this->submitForm([], 'Save'); $this->submitForm([], 'Save');
$this->assertSession()->pageTextContains('Your settings have been saved.'); $this->assertSession()->pageTextContains('Your settings have been saved.');
......
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
namespace Drupal\Tests\file\FunctionalJavascript; namespace Drupal\Tests\file\FunctionalJavascript;
use Drupal\FunctionalJavascriptTests\JavascriptTestBase; use Drupal\FunctionalJavascriptTests\WebDriverTestBase;
use Drupal\Tests\file\Functional\FileFieldCreationTrait; use Drupal\Tests\file\Functional\FileFieldCreationTrait;
use Drupal\Tests\TestFileCreationTrait; use Drupal\Tests\TestFileCreationTrait;
...@@ -12,7 +12,7 @@ ...@@ -12,7 +12,7 @@
* *
* @group file * @group file
*/ */
class FileFieldValidateTest extends JavascriptTestBase { class FileFieldValidateTest extends WebDriverTestBase {
use FileFieldCreationTrait; use FileFieldCreationTrait;
use TestFileCreationTrait; use TestFileCreationTrait;
......
...@@ -3,7 +3,7 @@ ...@@ -3,7 +3,7 @@
namespace Drupal\Tests\file\FunctionalJavascript; namespace Drupal\Tests\file\FunctionalJavascript;
use Drupal\Component\Utility\Bytes; use Drupal\Component\Utility\Bytes;
use Drupal\FunctionalJavascriptTests\JavascriptTestBase; use Drupal\FunctionalJavascriptTests\WebDriverTestBase;
use Drupal\Tests\TestFileCreationTrait; use Drupal\Tests\TestFileCreationTrait;
use Drupal\Tests\file\Functional\FileFieldCreationTrait; use Drupal\Tests\file\Functional\FileFieldCreationTrait;
...@@ -12,7 +12,7 @@ ...@@ -12,7 +12,7 @@
* *
* @group file * @group file
*/ */
class MaximumFileSizeExceededUploadTest extends JavascriptTestBase { class MaximumFileSizeExceededUploadTest extends WebDriverTestBase {
use FileFieldCreationTrait; use FileFieldCreationTrait;
use TestFileCreationTrait; use TestFileCreationTrait;
......
...@@ -2,15 +2,14 @@ ...@@ -2,15 +2,14 @@
namespace Drupal\Tests\image\FunctionalJavascript; namespace Drupal\Tests\image\FunctionalJavascript;
use Drupal\FunctionalJavascriptTests\DrupalSelenium2Driver; use Drupal\FunctionalJavascriptTests\WebDriverTestBase;
use Drupal\FunctionalJavascriptTests\JavascriptTestBase;
use Drupal\Tests\image\Kernel\ImageFieldCreationTrait; use Drupal\Tests\image\Kernel\ImageFieldCreationTrait;
use Drupal\Tests\TestFileCreationTrait; use Drupal\Tests\TestFileCreationTrait;
/** /**
* This class provides methods specifically for testing Image's field handling. * This class provides methods specifically for testing Image's field handling.
*/ */
abstract class ImageFieldTestBase extends JavascriptTestBase { abstract class ImageFieldTestBase extends WebDriverTestBase {
use ImageFieldCreationTrait; use ImageFieldCreationTrait;
use TestFileCreationTrait { use TestFileCreationTrait {
...@@ -29,11 +28,6 @@ abstract class ImageFieldTestBase extends JavascriptTestBase { ...@@ -29,11 +28,6 @@ abstract class ImageFieldTestBase extends JavascriptTestBase {
'image_module_test', 'image_module_test',
]; ];
/**
* {@inheritdoc}
*/
protected $minkDefaultDriverClass = DrupalSelenium2Driver::class;
/** /**
* An user with permissions to administer content types and image styles. * An user with permissions to administer content types and image styles.
* *
......
...@@ -7,7 +7,7 @@ ...@@ -7,7 +7,7 @@
use Drupal\field\Entity\FieldConfig; use Drupal\field\Entity\FieldConfig;
use Drupal\field\Entity\FieldStorageConfig; use Drupal\field\Entity\FieldStorageConfig;
use Drupal\filter\Entity\FilterFormat; use Drupal\filter\Entity\FilterFormat;
use Drupal\FunctionalJavascriptTests\JavascriptTestBase; use Drupal\FunctionalJavascriptTests\WebDriverTestBase;
use Drupal\node\Entity\NodeType;