diff --git a/css/entity_browser.file_browser.css b/css/entity_browser.file_browser.css index c8ed44c..43b6a58 100644 --- a/css/entity_browser.file_browser.css +++ b/css/entity_browser.file_browser.css @@ -1,70 +1,75 @@ @media screen and (max-width: 1250px) { - .entities-list tbody * { - display: block; - } + .entities-list tbody * { + display: block; + } - .entities-list thead tr th:nth-child(2), .entities-list thead tr th:nth-child(3), .entities-list thead tr th:nth-child(4) { - display: none; - } + .entities-list thead tr th:nth-child(2), + .entities-list thead tr th:nth-child(3), + .entities-list thead tr th:nth-child(4) { + display: none; + } - .entities-list tbody tr td a.tabledrag-handle { - position: absolute; - margin-left: -40px; - } + .entities-list tbody tr td a.tabledrag-handle { + position: absolute; + margin-left: -40px; + } - .entities-list tbody tr td { - margin-left: 20px; - } + .entities-list tbody tr td { + margin-left: 20px; + } } @media screen and (min-width: 1251px) { - .entities-list { - table-layout: fixed; - } + .entities-list { + table-layout: fixed; + } } @media screen and (min-width: 1021px) and (max-width: 1100px) { - .toolbar-tray-open.toolbar-vertical .entities-list { - display: inline-block; - } + .toolbar-tray-open.toolbar-vertical .entities-list { + display: inline-block; + } - .toolbar-tray-open.toolbar-vertical .entities-list thead, .toolbar-tray-open .entities-list tbody { - display: inline-block; - width: 100%; - } + .toolbar-tray-open.toolbar-vertical .entities-list thead, + .toolbar-tray-open .entities-list tbody { + display: inline-block; + width: 100%; + } - .toolbar-tray-open.toolbar-vertical .entities-list thead > tr { - display: table; - width: 100%; - } + .toolbar-tray-open.toolbar-vertical .entities-list thead > tr { + display: table; + width: 100%; + } - .toolbar-tray-open.toolbar-vertical .entities-list tbody tr td { - padding-right: 0; - } + .toolbar-tray-open.toolbar-vertical .entities-list tbody tr td { + padding-right: 0; + } } @media screen and (min-width: 780px) and (max-width: 920px) { - .entities-list input.form-text, .entities-list textarea.form-textarea { - width: 100%; - } + .entities-list input.form-text, + .entities-list textarea.form-textarea { + width: 100%; + } } @media screen and (min-width: 610px) and (max-width: 780px) { - .toolbar-tray-open .entities-list { - display: inline-block; - } + .toolbar-tray-open .entities-list { + display: inline-block; + } - .toolbar-tray-open .entities-list thead, .toolbar-tray-open .entities-list tbody { - display: inline-block; - width: 100%; - } + .toolbar-tray-open .entities-list thead, + .toolbar-tray-open .entities-list tbody { + display: inline-block; + width: 100%; + } - .toolbar-tray-open .entities-list thead > tr { - display: table; - width: 100%; - } + .toolbar-tray-open .entities-list thead > tr { + display: table; + width: 100%; + } - .toolbar-tray-open .entities-list tbody tr td { - padding-right: 0; - } + .toolbar-tray-open .entities-list tbody tr td { + padding-right: 0; + } } diff --git a/css/entity_browser.modal_selection.css b/css/entity_browser.modal_selection.css index df6622e..f461a3f 100644 --- a/css/entity_browser.modal_selection.css +++ b/css/entity_browser.modal_selection.css @@ -4,5 +4,5 @@ */ body { - display: none; + display: none; } diff --git a/css/entity_browser.pager.css b/css/entity_browser.pager.css index 22746e6..70ceb6a 100644 --- a/css/entity_browser.pager.css +++ b/css/entity_browser.pager.css @@ -1,38 +1,38 @@ .js-form-type-entity-browser-pager { - margin-top: 10px; - text-align: center; + margin-top: 10px; + text-align: center; } .js-form-type-entity-browser-pager input, .js-form-type-entity-browser-pager input:hover, .js-form-type-entity-browser-pager input:focus { - background: 0; - border: 0; - border-radius: 0; - box-shadow: none; - color: #2a678c; - font-size: 1.08em; - font-weight: bold; - margin: 0; - padding: 0; + background: 0; + border: 0; + border-radius: 0; + box-shadow: none; + color: #2a678c; + font-size: 1.08em; + font-weight: bold; + margin: 0; + padding: 0; } .js-form-type-entity-browser-pager span { - color: #8c8c8c; - font-size: 1.08em; - font-weight: bold; - margin: 0.8em; + color: #8c8c8c; + font-size: 1.08em; + font-weight: bold; + margin: 0.8em; } .js-form-type-entity-browser-pager input[name="prev_page"]:disabled, .js-form-type-entity-browser-pager input[name="next_page"]:disabled { - visibility: hidden; + visibility: hidden; } .js-form-type-entity-browser-pager input:focus:not(:disabled), .js-form-type-entity-browser-pager input:hover:not(:disabled) { - border-radius: 0; - color: #0074bd; - font-size: 1.08em; - font-weight: bold; + border-radius: 0; + color: #0074bd; + font-size: 1.08em; + font-weight: bold; } diff --git a/entity_browser.module b/entity_browser.module index 8721645..d87b874 100644 --- a/entity_browser.module +++ b/entity_browser.module @@ -5,10 +5,10 @@ * Allows to flexibly create, browse and select entities. */ -use \Drupal\Core\Form\FormStateInterface; -use \Drupal\Core\Render\Element; +use Drupal\Core\Form\FormStateInterface; +use Drupal\Core\Render\Element; use Drupal\Core\Url; -use \Drupal\file\FileInterface; +use Drupal\file\FileInterface; use Drupal\Core\Routing\RouteMatchInterface; /** diff --git a/entity_browser.views.inc b/entity_browser.views.inc index b2bb86d..2544300 100644 --- a/entity_browser.views.inc +++ b/entity_browser.views.inc @@ -5,6 +5,7 @@ * Provide views data for entity_browser.module. */ +use Drupal\search_api\Entity\Index; /** * Implements hook_views_data_alter(). */ @@ -24,7 +25,7 @@ function entity_browser_views_data_alter(&$data) { } if (\Drupal::moduleHandler()->moduleExists('search_api')) { /** @var \Drupal\search_api\IndexInterface $index */ - foreach (\Drupal\search_api\Entity\Index::loadMultiple() as $index) { + foreach (Index::loadMultiple() as $index) { $key = 'search_api_index_' . $index->id(); $data[$key]['entity_browser_select'] = [ 'title' => t('Entity browser bulk select form for Search API views'), diff --git a/modules/entity_form/entity_browser_entity_form.module b/modules/entity_form/entity_browser_entity_form.module index 477980f..c2d48ea 100644 --- a/modules/entity_form/entity_browser_entity_form.module +++ b/modules/entity_form/entity_browser_entity_form.module @@ -47,7 +47,7 @@ function entity_browser_entity_form_inline_entity_form_reference_form_alter(&$re ])); $cardinality = FieldStorageDefinitionInterface::CARDINALITY_UNLIMITED; - if($instance->getFieldStorageDefinition()->get('cardinality') !== $cardinality) { + if ($instance->getFieldStorageDefinition()->get('cardinality') !== $cardinality) { $cardinality = $instance->getFieldStorageDefinition()->get('cardinality') - $count_existing_selection; } diff --git a/modules/entity_form/src/Plugin/EntityBrowser/Widget/EntityForm.php b/modules/entity_form/src/Plugin/EntityBrowser/Widget/EntityForm.php index 7901925..de297bb 100644 --- a/modules/entity_form/src/Plugin/EntityBrowser/Widget/EntityForm.php +++ b/modules/entity_form/src/Plugin/EntityBrowser/Widget/EntityForm.php @@ -107,7 +107,7 @@ class EntityForm extends WidgetBase { // Pretend to be IEFs submit button. $form['#submit'] = [['Drupal\inline_entity_form\ElementSubmit', 'trigger']]; - $form['actions']['submit']['#ief_submit_trigger'] = TRUE; + $form['actions']['submit']['#ief_submit_trigger'] = TRUE; $form['actions']['submit']['#ief_submit_trigger_all'] = TRUE; $form['inline_entity_form'] = [ diff --git a/modules/entity_form/src/Tests/InlineEntityIntegrationTest.php b/modules/entity_form/src/Tests/InlineEntityIntegrationTest.php index 6ae5b79..bd00b87 100644 --- a/modules/entity_form/src/Tests/InlineEntityIntegrationTest.php +++ b/modules/entity_form/src/Tests/InlineEntityIntegrationTest.php @@ -2,14 +2,21 @@ namespace Drupal\entity_browser_entity_form\Tests; -use Drupal\simpletest\WebTestBase; +use Drupal\Tests\BrowserTestBase; /** * Tests integration with Inline entity form. * * @group entity_browser_entity_form */ -class InlineEntityIntegrationTest extends WebTestBase { +class InlineEntityIntegrationTest extends BrowserTestBase { + + /** + * The entity browser storage. + * + * @var \Drupal\Core\Entity\EntityStorageInterface + */ + protected $browserStorage; /** * Modules to enable. @@ -28,9 +35,16 @@ class InlineEntityIntegrationTest extends WebTestBase { */ protected function setUp() { parent::setUp(); + $this->entityBrowserStorage = $this->container + ->get('entity_type.manager') + ->getStorage('entity_browser'); + $this->browserStorage = $this->container + ->get('entity_type.manager') + ->getStorage('entity_browser'); // Delete unnecessary entity browser. - $browser = $this->container->get('entity_type.manager')->getStorage('entity_browser')->load('entity_browser_test_entity_form'); - $this->container->get('entity_type.manager')->getStorage('entity_browser')->delete([$browser]); + $entityBrowserToDelete = $this->browserStorage + ->load('entity_browser_test_entity_form'); + $this->browserStorage->delete([$entityBrowserToDelete]); } /** @@ -48,29 +62,29 @@ class InlineEntityIntegrationTest extends WebTestBase { 'fields[field_content_reference][region]' => 'content', 'fields[field_content_reference][type]' => 'inline_entity_form_complex', ]; - $this->drupalPostForm(NULL, $edit, t('Save')); - $this->drupalPostAjaxForm(NULL, [], 'field_content_reference_settings_edit'); - $this->assertRaw('fields[field_content_reference][settings_edit_form][third_party_settings][entity_browser_entity_form][entity_browser_id]', 'Field to select entity browser is available.'); + $this->drupalPostForm(NULL, $edit, 'Save'); + $this->drupalPostForm(NULL, [], 'field_content_reference_settings_edit'); + $this->assertSession()->responseContains('fields[field_content_reference][settings_edit_form][third_party_settings][entity_browser_entity_form][entity_browser_id]', 'Field to select entity browser is available.'); $edit = [ 'fields[field_content_reference][settings_edit_form][third_party_settings][entity_browser_entity_form][entity_browser_id]' => 'entity_browser_entity_form_test', 'fields[field_content_reference][settings_edit_form][settings][allow_existing]' => TRUE, ]; - $this->drupalPostAjaxForm(NULL, $edit, 'field_content_reference_plugin_settings_update'); - $this->drupalPostForm(NULL, [], t('Save')); - $this->assertText('Entity browser: Entity browser entity form test', 'Settings summary is working correctly.'); + $this->drupalPostForm(NULL, $edit, 'field_content_reference_plugin_settings_update'); + $this->drupalPostForm(NULL, [], 'Save'); + $this->assertSession()->responseContains('Entity browser: Entity browser entity form test', 'Settings summary is working correctly.'); $this->drupalGet('node/add'); - $elements = $this->xpath('//input[@type="submit" and @value="Add existing node"]'); - $button_name = $elements[0]->attributes()['name']; - $this->drupalPostAjaxForm(NULL, [], $button_name); - $this->assertLink('Select entities', 0, 'Entity browser is available.'); + $this->assertSession()->buttonExists('Add existing node')->press(); + $this->assertSession()->responseContains('Select entities', 'Entity browser is available.'); - $browsers = $this->container->get('entity_type.manager')->getStorage('entity_browser')->loadMultiple(); + $browsers = $this->browserStorage->loadMultiple(); $browser = current($browsers); - $this->container->get('entity_type.manager')->getStorage('entity_browser')->delete([$browser]); + $this->browserStorage->delete([$browser]); $this->drupalGet('admin/structure/types/manage/article/form-display'); - $this->drupalPostAjaxForm(NULL, [], 'field_content_reference_settings_edit'); - $this->assertText(t('There are no entity browsers available. You can create one here'), 'Massage displays when no entity browser is available.'); + $this->drupalPostForm(NULL, [], 'field_content_reference_settings_edit'); + $this->assertSession()->selectExists('fields[field_content_reference][type]')->setValue('entity_browser_entity_reference'); + $this->waitForAjaxToFinish(); + $this->assertSession()->responseContains('There are no entity browsers available. You can create one here', 'Massage displays when no entity browser is available.'); } } diff --git a/modules/entity_form/tests/src/FunctionalJavascript/EntityFormWidgetTest.php b/modules/entity_form/tests/src/FunctionalJavascript/EntityFormWidgetTest.php index 7591391..6cfe2aa 100644 --- a/modules/entity_form/tests/src/FunctionalJavascript/EntityFormWidgetTest.php +++ b/modules/entity_form/tests/src/FunctionalJavascript/EntityFormWidgetTest.php @@ -5,14 +5,14 @@ namespace Drupal\Tests\entity_browser_entity_form\FunctionalJavascript; use Drupal\Core\Field\FieldStorageDefinitionInterface; use Drupal\field\Entity\FieldConfig; use Drupal\field\Entity\FieldStorageConfig; -use Drupal\FunctionalJavascriptTests\JavascriptTestBase; +use Drupal\FunctionalJavascriptTests\WebDriverTestBase; /** * Class for Entity browser entity form Javascript functional tests. * * @group entity_browser_entity_form */ -class EntityFormWidgetTest extends JavascriptTestBase { +class EntityFormWidgetTest extends WebDriverTestBase { /** * Modules to enable. @@ -103,12 +103,12 @@ class EntityFormWidgetTest extends JavascriptTestBase { $this->assertSession()->buttonNotExists('Save entity'); $this->assertSession()->buttonExists('Save node'); - // Make sure that the widget works correctly with the field widget + // Make sure that the widget works correctly with the field widget. $this->drupalGet('node/add/foo'); $this->getSession()->getPage()->clickLink('Select entities'); $this->getSession()->switchToIFrame('entity_browser_iframe_entity_browser_test_entity_form'); $this->getSession()->getPage()->fillField('inline_entity_form[title][0][value]', 'War is peace'); - $this->getSession()->getPage()->pressButton('Save node'); + $this->assertSession()->buttonExists('Save node')->press(); // Switch back to the main page. $this->getSession()->switchToIFrame(); @@ -116,7 +116,7 @@ class EntityFormWidgetTest extends JavascriptTestBase { $this->assertSession()->pageTextContains('War is peace'); $this->getSession()->getPage()->fillField('title[0][value]', 'Freedom is slavery'); - $this->getSession()->getPage()->pressButton('Save'); + $this->assertSession()->buttonExists('Save')->press(); $parent_node = $this->container->get('entity_type.manager') ->getStorage('node') @@ -132,8 +132,8 @@ class EntityFormWidgetTest extends JavascriptTestBase { $this->getSession()->getPage()->clickLink('Select entities'); $this->getSession()->switchToIFrame('entity_browser_iframe_entity_browser_test_entity_form'); $this->getSession()->getPage()->fillField('inline_entity_form[title][0][value]', 'War is peace'); - $this->getSession()->getPage()->pressButton('Save node'); - $this->getSession()->getPage()->pressButton('Use selected'); + $this->assertSession()->buttonExists('Save node')->press(); + $this->assertSession()->buttonExists('Use selected')->press(); // Switch back to the main page. $this->getSession()->switchToIFrame(); @@ -141,7 +141,7 @@ class EntityFormWidgetTest extends JavascriptTestBase { $this->assertSession()->pageTextContains('War is peace'); $this->getSession()->getPage()->fillField('title[0][value]', 'Ignorance is strength'); - $this->getSession()->getPage()->pressButton('Save'); + $this->assertSession()->buttonExists('Save')->press(); $parent_node = $this->container->get('entity_type.manager') ->getStorage('node') diff --git a/modules/example/config/install/views.view.nodes_entity_browser.yml b/modules/example/config/install/views.view.nodes_entity_browser.yml index 0b2ed92..65a4213 100644 --- a/modules/example/config/install/views.view.nodes_entity_browser.yml +++ b/modules/example/config/install/views.view.nodes_entity_browser.yml @@ -471,4 +471,4 @@ display: - user.permissions cacheable: false max-age: 0 - tags: { } \ No newline at end of file + tags: { } diff --git a/src/Annotation/EntityBrowserDisplay.php b/src/Annotation/EntityBrowserDisplay.php index f7c853c..2a34630 100644 --- a/src/Annotation/EntityBrowserDisplay.php +++ b/src/Annotation/EntityBrowserDisplay.php @@ -36,7 +36,7 @@ class EntityBrowserDisplay extends Plugin { * * @ingroup plugin_translatable * - * @var \Drupal\Core\Annotation\Translation (optional) + * @var \Drupal\Core\Annotation\Translationoptional */ public $description = ''; diff --git a/src/Annotation/EntityBrowserFieldWidgetDisplay.php b/src/Annotation/EntityBrowserFieldWidgetDisplay.php index 435ad9b..e0adc31 100644 --- a/src/Annotation/EntityBrowserFieldWidgetDisplay.php +++ b/src/Annotation/EntityBrowserFieldWidgetDisplay.php @@ -36,7 +36,7 @@ class EntityBrowserFieldWidgetDisplay extends Plugin { * * @ingroup plugin_translatable * - * @var \Drupal\Core\Annotation\Translation (optional) + * @var \Drupal\Core\Annotation\Translationoptional */ public $description = ''; diff --git a/src/Annotation/EntityBrowserSelectionDisplay.php b/src/Annotation/EntityBrowserSelectionDisplay.php index fe54f95..ed2fa9e 100644 --- a/src/Annotation/EntityBrowserSelectionDisplay.php +++ b/src/Annotation/EntityBrowserSelectionDisplay.php @@ -36,7 +36,7 @@ class EntityBrowserSelectionDisplay extends Plugin { * * @ingroup plugin_translatable * - * @var \Drupal\Core\Annotation\Translation (optional) + * @var \Drupal\Core\Annotation\Translationoptional */ public $description = ''; diff --git a/src/Annotation/EntityBrowserWidget.php b/src/Annotation/EntityBrowserWidget.php index 22a059a..5adac73 100644 --- a/src/Annotation/EntityBrowserWidget.php +++ b/src/Annotation/EntityBrowserWidget.php @@ -36,7 +36,7 @@ class EntityBrowserWidget extends Plugin { * * @ingroup plugin_translatable * - * @var \Drupal\Core\Annotation\Translation (optional) + * @var \Drupal\Core\Annotation\Translationoptional */ public $description = ''; diff --git a/src/Annotation/EntityBrowserWidgetSelector.php b/src/Annotation/EntityBrowserWidgetSelector.php index a10ef84..a630965 100644 --- a/src/Annotation/EntityBrowserWidgetSelector.php +++ b/src/Annotation/EntityBrowserWidgetSelector.php @@ -36,7 +36,7 @@ class EntityBrowserWidgetSelector extends Plugin { * * @ingroup plugin_translatable * - * @var \Drupal\Core\Annotation\Translation (optional) + * @var \Drupal\Core\Annotation\Translationoptional */ public $description = ''; diff --git a/src/Annotation/EntityBrowserWidgetValidation.php b/src/Annotation/EntityBrowserWidgetValidation.php index 065b295..4649189 100644 --- a/src/Annotation/EntityBrowserWidgetValidation.php +++ b/src/Annotation/EntityBrowserWidgetValidation.php @@ -42,4 +42,5 @@ class EntityBrowserWidgetValidation extends Plugin { * @var string */ public $constraint; + } diff --git a/src/Controllers/EntityBrowserFormController.php b/src/Controllers/EntityBrowserFormController.php index 4162031..b075df5 100644 --- a/src/Controllers/EntityBrowserFormController.php +++ b/src/Controllers/EntityBrowserFormController.php @@ -48,7 +48,7 @@ class EntityBrowserFormController extends HtmlFormController implements Containe * The form builder. * @param \Drupal\Core\DependencyInjection\ClassResolverInterface $class_resolver * The class resolver. - * @param RouteMatchInterface $route_match + * @param \Drupal\Core\Routing\RouteMatchInterface $route_match * Current route match service. * @param \Drupal\Core\Entity\EntityTypeManagerInterface $entity_type_manager * Entity type manager service. diff --git a/src/DisplayInterface.php b/src/DisplayInterface.php index 4d9fbf2..0a659ac 100644 --- a/src/DisplayInterface.php +++ b/src/DisplayInterface.php @@ -47,10 +47,11 @@ interface DisplayInterface extends PluginInspectionInterface, ConfigurablePlugin * is needed as the widget may display after a new bootstrap, which would * discard the current form state. Arbitrary values can be added and used * by widgets, if needed. - * Expected array keys: - * @type \Drupal\Core\Entity\EntityInterface[] $selected_entities + * Expected array keys:. + * + * @type \Drupal\Core\Entity\EntityInterface[] $selected_entities * An array of currently selected entities. - * @type array $validators + * @type array $validators * An associative array mapping EntityBrowserWidgetValidation IDs to * an array of options to pass to the plugin's validate method. * diff --git a/src/Element/EntityBrowserElement.php b/src/Element/EntityBrowserElement.php index 4dccdc5..5e5c805 100644 --- a/src/Element/EntityBrowserElement.php +++ b/src/Element/EntityBrowserElement.php @@ -171,7 +171,7 @@ class EntityBrowserElement extends FormElement { '#markup' => is_string($element['#entity_browser']) ? t('Entity browser @browser not found.', ['@browser' => $element['#entity_browser']]) : t('Entity browser not found.'), ]; } - // Display entity_browser + // Display entity_browser. else { $display = $entity_browser->getDisplay(); $display->setUuid(sha1(implode('-', array_merge([$complete_form['#build_id']], $element['#parents'])))); diff --git a/src/Element/EntityBrowserPagerElement.php b/src/Element/EntityBrowserPagerElement.php index e85730a..b1dd84c 100644 --- a/src/Element/EntityBrowserPagerElement.php +++ b/src/Element/EntityBrowserPagerElement.php @@ -130,4 +130,5 @@ class EntityBrowserPagerElement extends FormElement { public static function setCurrentPage(FormStateInterface $form_state, $page = 1) { $form_state->set('page', $page); } + } diff --git a/src/EntityBrowserFormInterface.php b/src/EntityBrowserFormInterface.php index d274b6e..27df7ee 100644 --- a/src/EntityBrowserFormInterface.php +++ b/src/EntityBrowserFormInterface.php @@ -18,7 +18,7 @@ interface EntityBrowserFormInterface extends FormInterface { public function setEntityBrowser(EntityBrowserInterface $entity_browser); /** - * Gets entity browser entity, + * Gets entity browser entity,. * * @return \Drupal\entity_browser\EntityBrowserInterface * Entity browser entity. diff --git a/src/FieldWidgetDisplayInterface.php b/src/FieldWidgetDisplayInterface.php index e589fa3..ca317ac 100644 --- a/src/FieldWidgetDisplayInterface.php +++ b/src/FieldWidgetDisplayInterface.php @@ -16,7 +16,7 @@ interface FieldWidgetDisplayInterface extends PluginInspectionInterface, Configu /** * Builds and gets render array for the entity. * - * @param EntityInterface $entity + * @param \Drupal\Core\Entity\EntityInterface $entity * Entity to be displayed. * * @return array diff --git a/src/Form/GeneralInfoConfig.php b/src/Form/GeneralInfoConfig.php index 908ff38..93b95bd 100644 --- a/src/Form/GeneralInfoConfig.php +++ b/src/Form/GeneralInfoConfig.php @@ -55,7 +55,7 @@ class GeneralInfoConfig extends FormBase { * @param \Drupal\entity_browser\WidgetManager $widget_manager * Entity browser widget plugin manager. */ - function __construct(DisplayManager $display_manager, WidgetSelectorManager $widget_selector_manager, SelectionDisplayManager $selection_display_manager, WidgetManager $widget_manager) { + public function __construct(DisplayManager $display_manager, WidgetSelectorManager $widget_selector_manager, SelectionDisplayManager $selection_display_manager, WidgetManager $widget_manager) { $this->displayManager = $display_manager; $this->selectionDisplayManager = $selection_display_manager; $this->widgetSelectorManager = $widget_selector_manager; diff --git a/src/Form/WidgetsConfig.php b/src/Form/WidgetsConfig.php index a60d76d..10d9d02 100644 --- a/src/Form/WidgetsConfig.php +++ b/src/Form/WidgetsConfig.php @@ -25,7 +25,7 @@ class WidgetsConfig extends FormBase { * @param \Drupal\entity_browser\WidgetManager $widget_manager * Entity browser widget plugin manager. */ - function __construct(WidgetManager $widget_manager) { + public function __construct(WidgetManager $widget_manager) { $this->widgetManager = $widget_manager; } diff --git a/src/Plugin/EntityBrowser/Display/IFrame.php b/src/Plugin/EntityBrowser/Display/IFrame.php index d082b64..8ba0d3c 100644 --- a/src/Plugin/EntityBrowser/Display/IFrame.php +++ b/src/Plugin/EntityBrowser/Display/IFrame.php @@ -182,7 +182,7 @@ class IFrame extends DisplayBase implements DisplayRouterInterface { * Intercepts default response and injects response that will trigger JS to * propagate selected entities upstream. * - * @param FilterResponseEvent $event + * @param \Symfony\Component\HttpKernel\Event\FilterResponseEvent $event * Response event. */ public function propagateSelection(FilterResponseEvent $event) { @@ -192,7 +192,7 @@ class IFrame extends DisplayBase implements DisplayRouterInterface { return $item->label(); }, $this->entities)), '#attached' => [ - 'library' => ['entity_browser/'. $this->pluginDefinition['id'] . '_selection'], + 'library' => ['entity_browser/' . $this->pluginDefinition['id'] . '_selection'], 'drupalSettings' => [ 'entity_browser' => [ $this->pluginDefinition['id'] => [ diff --git a/src/Plugin/EntityBrowser/SelectionDisplay/MultiStepDisplay.php b/src/Plugin/EntityBrowser/SelectionDisplay/MultiStepDisplay.php index 17f5cf3..33a1c91 100644 --- a/src/Plugin/EntityBrowser/SelectionDisplay/MultiStepDisplay.php +++ b/src/Plugin/EntityBrowser/SelectionDisplay/MultiStepDisplay.php @@ -391,7 +391,7 @@ class MultiStepDisplay extends SelectionDisplayBase { /** * Saves new ordering of entities based on weight. * - * @param FormStateInterface $form_state + * @param \Drupal\Core\Form\FormStateInterface $form_state * Form state. */ public static function saveNewOrder(FormStateInterface $form_state) { @@ -427,7 +427,8 @@ class MultiStepDisplay extends SelectionDisplayBase { if ($form_state->isRebuilding()) { $form['#prefix'] = '
'; - } else { + } + else { $form['#prefix'] .= '
'; } $form['#suffix'] = '
'; diff --git a/src/Plugin/EntityBrowser/Widget/View.php b/src/Plugin/EntityBrowser/Widget/View.php index 111f9b7..524b1b0 100644 --- a/src/Plugin/EntityBrowser/Widget/View.php +++ b/src/Plugin/EntityBrowser/Widget/View.php @@ -294,7 +294,6 @@ class View extends WidgetBase implements ContainerFactoryPluginInterface { ->load($this->configuration['view']) ->getExecutable(); - // Check if the current user has access to this view. return AccessResult::allowedIf($view->access($this->configuration['view_display'])); } diff --git a/src/Plugin/EntityBrowser/WidgetSelector/DropDown.php b/src/Plugin/EntityBrowser/WidgetSelector/DropDown.php index ef3315a..497cbac 100644 --- a/src/Plugin/EntityBrowser/WidgetSelector/DropDown.php +++ b/src/Plugin/EntityBrowser/WidgetSelector/DropDown.php @@ -70,7 +70,7 @@ class DropDown extends WidgetSelectorBase { * * @param array $form * Form. - * @param FormStateInterface $form_state + * @param \Drupal\Core\Form\FormStateInterface $form_state * Form state object. * * @return array diff --git a/src/Plugin/views/display/EntityBrowser.php b/src/Plugin/views/display/EntityBrowser.php index 5b382c3..f4f7fbe 100644 --- a/src/Plugin/views/display/EntityBrowser.php +++ b/src/Plugin/views/display/EntityBrowser.php @@ -60,7 +60,6 @@ class EntityBrowser extends DisplayPluginBase { } } - /** * {@inheritdoc} */ diff --git a/src/PluginConfigurationFormTrait.php b/src/PluginConfigurationFormTrait.php index 312c05a..a55cbdb 100644 --- a/src/PluginConfigurationFormTrait.php +++ b/src/PluginConfigurationFormTrait.php @@ -1,6 +1,7 @@ container->get('module_installer')->install(['token']); $this->drupalGet('/admin/config/content/entity_browser'); - $this->assertResponse(403, "Anonymous user can't access entity browser listing page."); + $this->assertSession()->statusCodeEquals(403, "Anonymous user can't access entity browser listing page."); $this->drupalGet('/admin/config/content/entity_browser/add'); - $this->assertResponse(403, "Anonymous user can't access entity browser add form."); + $this->assertSession()->statusCodeEquals(403, "Anonymous user can't access entity browser add form."); // Listing is empty. $this->drupalLogin($this->adminUser); $this->drupalGet('/admin/config/content/entity_browser'); - $this->assertResponse(200, 'Admin user is able to navigate to the entity browser listing page.'); - $this->assertText('There are no entity browser entities yet.', 'Entity browsers table is empty.'); + $this->assertSession()->statusCodeEquals(200, 'Admin user is able to navigate to the entity browser listing page.'); + $this->assertSession()->responseContains('There are no entity browser entities yet.', 'Entity browsers table is empty.'); // Add page. $this->clickLink('Add Entity browser'); - $this->assertUrl('/admin/config/content/entity_browser/add'); + $this->assertSession()->addressEquals('/admin/config/content/entity_browser/add'); $edit = [ 'label' => 'Test entity browser', 'id' => 'test_entity_browser', @@ -70,7 +70,7 @@ class ConfigUITest extends WebTestBase { $this->drupalPostForm(NULL, $edit, 'Next'); // Display configuration step. - $this->assertUrl('/admin/config/content/entity_browser/test_entity_browser/display', ['query' => ['js' => 'nojs']]); + $this->assertSession()->addressEquals('/admin/config/content/entity_browser/test_entity_browser/display', ['query' => ['js' => 'nojs']]); $edit = [ 'width' => 100, 'height' => 100, @@ -80,63 +80,73 @@ class ConfigUITest extends WebTestBase { $this->drupalPostForm(NULL, $edit, 'Next'); // Widget selector step. - $this->assertUrl('/admin/config/content/entity_browser/test_entity_browser/widget_selector', ['query' => ['js' => 'nojs']]); - $this->assertText('This plugin has no configuration options.'); + $this->assertSession()->addressEquals('/admin/config/content/entity_browser/test_entity_browser/widget_selector', ['query' => ['js' => 'nojs']]); + $this->assertSession()->responseContains('This plugin has no configuration options.'); $this->drupalPostForm(NULL, [], 'Next'); // Selection display step. - $this->assertUrl('/admin/config/content/entity_browser/test_entity_browser/selection_display', ['query' => ['js' => 'nojs']]); - $this->assertText('This plugin has no configuration options.'); + $this->assertSession()->addressEquals('/admin/config/content/entity_browser/test_entity_browser/selection_display', ['query' => ['js' => 'nojs']]); + $this->assertSession()->responseContains('This plugin has no configuration options.'); $this->drupalPostForm(NULL, [], 'Previous'); // Widget selector step again. - $this->assertUrl('/admin/config/content/entity_browser/test_entity_browser/widget_selector', ['query' => ['js' => 'nojs']]); - $this->assertText('This plugin has no configuration options.'); + $this->assertSession()->addressEquals('/admin/config/content/entity_browser/test_entity_browser/widget_selector', ['query' => ['js' => 'nojs']]); + $this->assertSession()->responseContains('This plugin has no configuration options.'); $this->drupalPostForm(NULL, [], 'Next'); // Selection display step. - $this->assertUrl('/admin/config/content/entity_browser/test_entity_browser/selection_display', ['query' => ['js' => 'nojs']]); - $this->assertText('This plugin has no configuration options.'); + $this->assertSession()->addressEquals('/admin/config/content/entity_browser/test_entity_browser/selection_display', ['query' => ['js' => 'nojs']]); + $this->assertSession()->responseContains('This plugin has no configuration options.'); $this->drupalPostForm(NULL, [], 'Next'); // Widgets step. - $this->assertUrl('/admin/config/content/entity_browser/test_entity_browser/widgets', ['query' => ['js' => 'nojs']]); - $this->assertText('The available plugins are:'); - $this->assertText("Upload: Adds an upload field browser's widget."); - $this->assertText("View: Uses a view to provide entity listing in a browser's widget."); - $this->assertText("Entity form: Provides entity form widget."); - $this->drupalPostAjaxForm(NULL, ['widget' => 'upload'], 'widget'); - $this->assertText('Label (Upload)'); - $this->assertText('You can use tokens in the upload location.'); - $this->assertLink('Browse available tokens.'); + $this->assertSession()->addressEquals('/admin/config/content/entity_browser/test_entity_browser/widgets', ['query' => ['js' => 'nojs']]); + $this->assertSession()->responseContains('The available plugins are:'); + $this->assertSession()->responseContains("Upload: Adds an upload field browser's widget."); + $this->assertSession()->responseContains("View: Uses a view to provide entity listing in a browser's widget."); + $this->assertSession()->responseContains("Entity form: Provides entity form widget."); + $this->assertSession()->selectExists('widget')->setValue('upload'); + $this->waitForAjaxToFinish(); + $this->assertSession()->responseContains('Label (Upload)'); + $this->assertSession()->responseContains('You can use tokens in the upload location.'); + $this->assertSession()->linkExists('Browse available tokens.'); // Make sure that removing of widgets works. - $this->drupalPostAjaxForm(NULL, ['widget' => 'view'], 'widget'); - $this->assertText('Label (View)'); - $this->assertText('View : View display', 'View selection dropdown label found.'); - $this->assertRaw('- Select a view -', 'Empty option appears in the view selection dropdown.'); - $this->assertText('Submit button text', 'Widget submit button text element found.'); - $this->assertFieldByXPath('//*[starts-with(@data-drupal-selector, "edit-table-") and contains(@data-drupal-selector, "-form-submit-text")]', 'Select entities', 'Widget submit button text element found.'); + $this->assertSession()->selectExists('widget')->setValue('view'); + $this->waitForAjaxToFinish(); + $this->assertSession()->responseContains('Label (View)'); + $this->assertSession()->responseContains('View : View display', 'View selection dropdown label found.'); + $this->assertSession()->responseContains('- Select a view -', 'Empty option appears in the view selection dropdown.'); + $this->assertSession()->responseContains('Submit button text', 'Widget submit button text element found.'); + + $fields = $this->xpath('//*[starts-with(@data-drupal-selector, "edit-table-") and contains(@data-drupal-selector, "-form-submit-text")]'); + $this->assertFieldsByValue($fields, 'Select entities', 'Widget submit button text element found.'); + $delete_buttons = $this->xpath("//input[@value='Delete']"); $delete_button_name = (string) $delete_buttons[1]->attributes()['name']; - $this->drupalPostAjaxForm(NULL, [], [$delete_button_name => 'Delete']); - $this->assertNoText('View : View display', 'View widget was removed.'); - $this->assertNoRaw('- Select a view -', 'View widget was removed.'); - $this->assertEqual(count($this->xpath("//input[@value='Delete']")), 1, 'Only one delete button appears on the page.'); + $this->drupalPostForm(NULL, [], [$delete_button_name => 'Delete']); + $this->assertSession()->responseNotContains('View : View display', 'View widget was removed.'); + $this->assertSession()->responseNotContains('- Select a view -', 'View widget was removed.'); + $this->assertEquals(count($this->xpath("//input[@value='Delete']")), 1, 'Only one delete button appears on the page.'); // Make sure the "Entity form" widget has all available config elements. - $this->drupalPostAjaxForm(NULL, ['widget' => 'entity_form'], 'widget'); - $this->assertText('Label (Entity form)'); - $this->assertText('Entity type', 'Entity type select found on IEF widget.'); - $this->assertText('Bundle', 'Bundle select found on IEF widget.'); - $this->assertText('Form mode', 'Form mode select found on IEF widget.'); - $this->assertFieldByXPath('//*[starts-with(@data-drupal-selector, "edit-table-") and contains(@data-drupal-selector, "-form-submit-text")]', 'Save entity', 'Widget submit button text element found.'); + $this->assertSession()->selectExists('widget')->setValue('entity_form'); + $this->waitForAjaxToFinish(); + $this->assertSession()->responseContains('Label (Entity form)'); + $this->assertSession()->responseContains('Entity type', 'Entity type select found on IEF widget.'); + $this->assertSession()->responseContains('Bundle', 'Bundle select found on IEF widget.'); + $this->assertSession()->responseContains('Form mode', 'Form mode select found on IEF widget.'); + + $fields = $this->xpath('//*[starts-with(@data-drupal-selector, "edit-table-") and contains(@data-drupal-selector, "-form-submit-text")]'); + + $this->assertFieldsByValue($fields, 'Save entity', 'Widget submit button text element found.'); + $entity_type_element = $this->xpath('//*[starts-with(@data-drupal-selector, "edit-table-") and contains(@data-drupal-selector, "-form-entity-type")]'); $entity_type_name = (string) $entity_type_element[0]['name']; $edit = [ $entity_type_name => 'user', ]; - $commands = $this->drupalPostAjaxForm(NULL, $edit, $entity_type_name); + $commands = $this->drupalPostForm(NULL, $edit, $entity_type_name); // WebTestBase::drupalProcessAjaxResponse() won't correctly execute our ajax // commands so we have to do it manually. Code below is based on the logic // in that function. @@ -160,7 +170,7 @@ class ConfigUITest extends WebTestBase { $form_mode_element = $this->xpath('//*[starts-with(@data-drupal-selector, "edit-table-") and contains(@data-drupal-selector, "-form-form-mode-form-select")]'); $form_mode_id = (string) $form_mode_element[0]['id']; $form_mode_name = (string) $form_mode_element[0]['name']; - $this->assertOption($form_mode_id, 'register', 'A non-default form mode is correctly available to be chosen.'); + $this->assertSession()->optionExists($form_mode_id, 'register', 'A non-default form mode is correctly available to be chosen.'); $bundle_element = $this->xpath('//*[starts-with(@data-drupal-selector, "edit-table-") and contains(@data-drupal-selector, "-form-bundle-select")]'); $bundle_name = (string) $bundle_element[0]['name']; $submit_text_element = $this->xpath('//*[starts-with(@data-drupal-selector, "edit-table-") and contains(@data-drupal-selector, "-form-submit-text")]'); @@ -174,17 +184,17 @@ class ConfigUITest extends WebTestBase { $this->drupalPostForm(NULL, $edit, 'Finish'); // Back on listing page. - $this->assertUrl('/admin/config/content/entity_browser'); - $this->assertText('Test entity browser', 'Entity browser label found on the listing page'); - $this->assertText('test_entity_browser', 'Entity browser ID found on the listing page.'); + $this->assertSession()->addressEquals('/admin/config/content/entity_browser'); + $this->assertSession()->responseContains('Test entity browser', 'Entity browser label found on the listing page'); + $this->assertSession()->responseContains('test_entity_browser', 'Entity browser ID found on the listing page.'); // Check structure of entity browser object. /** @var \Drupal\entity_browser\EntityBrowserInterface $loaded_entity_browser */ $loaded_entity_browser = $this->container->get('entity_type.manager') ->getStorage('entity_browser') ->load('test_entity_browser'); - $this->assertEqual('test_entity_browser', $loaded_entity_browser->id(), 'Entity browser ID was correctly saved.'); - $this->assertEqual('Test entity browser', $loaded_entity_browser->label(), 'Entity browser label was correctly saved.'); + $this->assertEquals('test_entity_browser', $loaded_entity_browser->id(), 'Entity browser ID was correctly saved.'); + $this->assertEquals('Test entity browser', $loaded_entity_browser->label(), 'Entity browser label was correctly saved.'); $this->assertTrue($loaded_entity_browser->getDisplay() instanceof IFrame, 'Entity browser display was correctly saved.'); $expected = [ 'width' => '100', @@ -192,11 +202,11 @@ class ConfigUITest extends WebTestBase { 'link_text' => 'All animals are created equal', 'auto_open' => TRUE, ]; - $this->assertEqual($expected, $loaded_entity_browser->getDisplay()->getConfiguration(), 'Entity browser display configuration was correctly saved.'); + $this->assertEquals($expected, $loaded_entity_browser->getDisplay()->getConfiguration(), 'Entity browser display configuration was correctly saved.'); $this->assertTrue($loaded_entity_browser->getSelectionDisplay() instanceof NoDisplay, 'Entity browser selection display was correctly saved.'); - $this->assertEqual([], $loaded_entity_browser->getSelectionDisplay()->getConfiguration(), 'Entity browser selection display configuration was correctly saved.'); - $this->assertEqual($loaded_entity_browser->getWidgetSelector() instanceof Tabs, 'Entity browser widget selector was correctly saved.'); - $this->assertEqual([], $loaded_entity_browser->getWidgetSelector()->getConfiguration(), 'Entity browser widget selector configuration was correctly saved.'); + $this->assertEquals([], $loaded_entity_browser->getSelectionDisplay()->getConfiguration(), 'Entity browser selection display configuration was correctly saved.'); + $this->assertEquals($loaded_entity_browser->getWidgetSelector() instanceof Tabs, 'Entity browser widget selector was correctly saved.'); + $this->assertEquals([], $loaded_entity_browser->getWidgetSelector()->getConfiguration(), 'Entity browser widget selector configuration was correctly saved.'); $widgets = $loaded_entity_browser->getWidgets(); $instance_ids = $widgets->getInstanceIds(); @@ -204,78 +214,83 @@ class ConfigUITest extends WebTestBase { $second_uuid = next($instance_ids); /** @var \Drupal\entity_browser\WidgetInterface $widget */ $widget = $widgets->get($first_uuid); - $this->assertEqual('upload', $widget->id(), 'Entity browser widget was correctly saved.'); - $this->assertEqual($first_uuid, $widget->uuid(), 'Entity browser widget uuid was correctly saved.'); + $this->assertEquals('upload', $widget->id(), 'Entity browser widget was correctly saved.'); + $this->assertEquals($first_uuid, $widget->uuid(), 'Entity browser widget uuid was correctly saved.'); $configuration = $widget->getConfiguration()['settings']; - $this->assertEqual([ + $this->assertEquals([ 'upload_location' => 'public://', 'multiple' => TRUE, 'submit_text' => 'Select files', 'extensions' => 'jpg jpeg gif png txt doc xls pdf ppt pps odt ods odp', ], $configuration, 'Entity browser widget configuration was correctly saved.'); - $this->assertEqual(1, $widget->getWeight(), 'Entity browser widget weight was correctly saved.'); + $this->assertEquals(1, $widget->getWeight(), 'Entity browser widget weight was correctly saved.'); $widget = $widgets->get($second_uuid); - $this->assertEqual('entity_form', $widget->id(), 'Entity browser widget was correctly saved.'); - $this->assertEqual($second_uuid, $widget->uuid(), 'Entity browser widget uuid was correctly saved.'); + $this->assertEquals('entity_form', $widget->id(), 'Entity browser widget was correctly saved.'); + $this->assertEquals($second_uuid, $widget->uuid(), 'Entity browser widget uuid was correctly saved.'); $configuration = $widget->getConfiguration()['settings']; - $this->assertEqual([ + $this->assertEquals([ 'entity_type' => 'user', 'bundle' => 'user', 'form_mode' => 'register', 'submit_text' => 'But some are more equal than others', ], $configuration, 'Entity browser widget configuration was correctly saved.'); - $this->assertEqual(2, $widget->getWeight(), 'Entity browser widget weight was correctly saved.'); + $this->assertEquals(2, $widget->getWeight(), 'Entity browser widget weight was correctly saved.'); // Navigate to edit. $this->clickLink('Edit'); - $this->assertUrl('/admin/config/content/entity_browser/test_entity_browser'); - $this->assertFieldById('edit-label', 'Test entity browser', 'Correct label found.'); - $this->assertText('test_entity_browser', 'Correct id found.'); - $this->assertOptionSelected('edit-display', 'iframe', 'Correct display selected.'); - $this->assertOptionSelected('edit-widget-selector', 'tabs', 'Correct widget selector selected.'); - $this->assertOptionSelected('edit-selection-display', 'no_display', 'Correct selection display selected.'); + $this->assertSession()->addressEquals('/admin/config/content/entity_browser/test_entity_browser'); + $this->assertSession()->fieldValueEquals('label', 'Test entity browser'); + $this->assertSession()->responseContains('test_entity_browser', 'Correct id found.'); + + $option_field = $this->assertSession()->optionExists('edit-display', 'iframe'); + $this->assertTrue($option_field->hasAttribute('selected'), 'Correct display selected.'); + $option_field = $this->assertSession()->optionExists('edit-widget-selector', 'tabs'); + $this->assertTrue($option_field->hasAttribute('selected'), 'Correct widget selector selected.'); + $option_field = $this->assertSession()->optionExists('edit-selection-display', 'no_display'); + $this->assertTrue($option_field->hasAttribute('selected'), 'Correct selection display selected.'); $this->drupalPostForm(NULL, [], 'Next'); - $this->assertUrl('/admin/config/content/entity_browser/test_entity_browser/display', ['query' => ['js' => 'nojs']]); - $this->assertFieldById('edit-width', '100', 'Correct value for width found.'); - $this->assertFieldById('edit-height', '100', 'Correct value for height found.'); - $this->assertFieldById('edit-link-text', 'All animals are created equal', 'Correct value for link text found.'); + $this->assertSession()->addressEquals('/admin/config/content/entity_browser/test_entity_browser/display', ['query' => ['js' => 'nojs']]); + $this->assertSession()->fieldValueEquals('width', '100'); + $this->assertSession()->fieldValueEquals('height', '100'); + $this->assertSession()->fieldValueEquals('link_text', 'All animals are created equal'); $this->assertFieldChecked('edit-auto-open', 'Auto open is enabled.'); $this->drupalPostForm(NULL, [], 'Next'); - $this->assertUrl('/admin/config/content/entity_browser/test_entity_browser/widget_selector', ['query' => ['js' => 'nojs']]); + $this->assertSession()->addressEquals('/admin/config/content/entity_browser/test_entity_browser/widget_selector', ['query' => ['js' => 'nojs']]); $this->drupalPostForm(NULL, [], 'Next'); - $this->assertUrl('/admin/config/content/entity_browser/test_entity_browser/selection_display', ['query' => ['js' => 'nojs']]); + $this->assertSession()->addressEquals('/admin/config/content/entity_browser/test_entity_browser/selection_display', ['query' => ['js' => 'nojs']]); $this->drupalPostForm(NULL, [], 'Next'); - $this->assertFieldById('edit-table-' . $first_uuid . '-label', 'upload', 'Correct value for widget label found.'); - $this->assertFieldChecked('edit-table-' . $first_uuid . '-form-multiple', 'Accept multiple files option is enabled by default.'); - $this->assertText('Multiple uploads will only be accepted if the source field allows more than one value.'); - $this->assertFieldById('edit-table-' . $first_uuid . '-form-upload-location', 'public://', 'Correct value for upload location found.'); - $this->assertFieldByXPath("//input[@data-drupal-selector='edit-table-" . $first_uuid . "-form-submit-text']", 'Select files', 'Correct value for submit text found.'); - $this->assertFieldById('edit-table-' . $second_uuid . '-label', 'entity_form', 'Correct value for widget label found.'); - $this->assertOptionSelectedWithDrupalSelector('edit-table-' . $second_uuid . '-form-entity-type', 'user', 'Correct value for entity type found.'); - $this->assertOptionSelectedWithDrupalSelector('edit-table-' . $second_uuid . '-form-bundle-select', 'user', 'Correct value for bundle found.'); - $this->assertOptionSelectedWithDrupalSelector('edit-table-' . $second_uuid . '-form-form-mode-form-select', 'register', 'Correct value for form modes found.'); - $this->assertFieldByXPath("//input[@data-drupal-selector='edit-table-" . $second_uuid . "-form-submit-text']", 'But some are more equal than others', 'Correct value for submit text found.'); + $this->assertSession()->fieldValueEquals("table[$first_uuid][label]", "upload"); + $this->assertSession()->checkboxChecked("table[$first_uuid][form][multiple]"); + $this->assertSession()->responseContains('Multiple uploads will only be accepted if the source field allows more than one value.'); + $this->assertSession()->fieldValueEquals("table[$first_uuid][form][upload_location]", 'public://'); + $this->assertSession()->fieldValueEquals("table[$first_uuid][form][submit_text]", 'Select files'); + + $this->assertSession()->fieldValueEquals("table[$second_uuid][label]", 'entity_form'); + $this->assertSession()->fieldValueEquals("table[$second_uuid][form][entity_type]", 'user', 'Correct value for entity type found.'); + $this->fieldValueEquals("table[$second_uuid][form][bundle][select]", 'user', 'Correct value for bundle found.'); + $this->fieldValueEquals("table[$second_uuid][form][form_mode][form_select]", 'register', 'Correct value for form modes found.'); + $this->assertSession()->fieldValueEquals("table[$second_uuid][form][submit_text]", 'But some are more equal than others'); $this->drupalPostForm(NULL, ['table[' . $first_uuid . '][form][multiple]' => FALSE], 'Finish'); $this->drupalGet('/admin/config/content/entity_browser/test_entity_browser/widgets'); - $this->assertNoFieldChecked('edit-table-' . $first_uuid . '-form-multiple', 'Accept multiple files option is disabled.'); + $this->assertSession()->checkboxNotChecked("table[$first_uuid][form][multiple]", 'Accept multiple files option is disabled.'); $this->drupalLogout(); $this->drupalGet('/admin/config/content/entity_browser/test_entity_browser'); - $this->assertResponse(403, "Anonymous user can't access entity browser edit form."); + $this->assertSession()->statusCodeEquals(403, "Anonymous user can't access entity browser edit form."); $this->drupalLogin($this->adminUser); $this->drupalGet('/admin/config/content/entity_browser'); $this->clickLink('Delete'); - $this->assertText('This action cannot be undone.', 'Delete question found.'); + $this->assertSession()->responseContains('This action cannot be undone.', 'Delete question found.'); $this->drupalPostForm(NULL, [], 'Delete Entity Browser'); - $this->assertText('Entity browser Test entity browser was deleted.', 'Confirmation message found.'); - $this->assertText('There are no entity browser entities yet.', 'Entity browsers table is empty.'); + $this->assertSession()->responseContains('Entity browser Test entity browser was deleted.', 'Confirmation message found.'); + $this->assertSession()->responseContains('There are no entity browser entities yet.', 'Entity browsers table is empty.'); $this->drupalLogout(); } diff --git a/src/Tests/EntityBrowserUITest.php b/src/Tests/EntityBrowserUITest.php index 5e45754..095e8bb 100644 --- a/src/Tests/EntityBrowserUITest.php +++ b/src/Tests/EntityBrowserUITest.php @@ -3,14 +3,19 @@ namespace Drupal\entity_browser\Tests; use Drupal\file\Entity\File; -use Drupal\simpletest\WebTestBase; +use Drupal\Tests\image\Functional\ImageFieldTestBase; +use Drupal\Tests\TestFileCreationTrait; /** * Tests the entity browser UI. * * @group entity_browser */ -class EntityBrowserUITest extends WebTestBase { +class EntityBrowserUITest extends ImageFieldTestBase { + + use TestFileCreationTrait { + getTestFiles as drupalGetTestFiles; + } /** * Modules to enable. @@ -35,14 +40,14 @@ class EntityBrowserUITest extends WebTestBase { $this->drupalLogin($account); // Go to the entity browser iframe link. $this->drupalGet('/entity-browser/iframe/test_entity_browser_iframe'); - $this->assertRaw('Select'); + $this->assertSession()->responseContains('Select'); $this->drupalGet('/admin/config/content/entity_browser/test_entity_browser_iframe/widgets'); $edit = [ 'table[871dbf77-012e-41cb-b32a-ada353d2de35][form][submit_text]' => 'Different', ]; $this->drupalPostForm(NULL, $edit, 'Finish'); $this->drupalGet('/entity-browser/iframe/test_entity_browser_iframe'); - $this->assertRaw('Different'); + $this->assertSession()->responseContains('Different'); } /** @@ -56,7 +61,7 @@ class EntityBrowserUITest extends WebTestBase { $this->drupalLogin($account); // Go to the entity browser iframe link. $this->drupalGet('/entity-browser/iframe/test_entity_browser_token'); - $image = current($this->drupalGetTestFiles('image')); + $image = current($this->getTestFiles('image')); $edit = [ 'files[upload][]' => $this->container->get('file_system')->realpath($image->uri), ]; @@ -65,7 +70,7 @@ class EntityBrowserUITest extends WebTestBase { $file = File::load(1); // Test entity browser token that has upload location configured to // public://[current-user:account-name]/. - $this->assertEqual($file->getFileUri(), 'public://' . $account->getUsername() . '/' . $file->getFilename(), 'Image has the correct uri.'); + $this->assertEquals($file->getFileUri(), 'public://' . $account->getUsername() . '/' . $file->getFilename(), 'Image has the correct uri.'); } } diff --git a/src/Tests/EntityBrowserUpdateHookTest.php b/src/Tests/EntityBrowserUpdateHookTest.php index e33ac14..e1182a1 100644 --- a/src/Tests/EntityBrowserUpdateHookTest.php +++ b/src/Tests/EntityBrowserUpdateHookTest.php @@ -2,7 +2,7 @@ namespace Drupal\entity_browser\Tests; -use Drupal\system\Tests\Update\UpdatePathTestBase; +use Drupal\FunctionalTests\Update\UpdatePathTestBase; /** * Tests the update hooks in entity_browser module. @@ -40,8 +40,8 @@ class EntityBrowserUpdateHookTest extends UpdatePathTestBase { */ protected function doSelectionTest() { parent::doSelectionTest(); - $this->assertRaw('8001 - Updates submit text for existing Entity browsers.'); - $this->assertRaw('8002 - Migrates duplicated Views entity_browser_select fields.'); + $this->assertSession()->responseContains('8001 - Updates submit text for existing Entity browsers.'); + $this->assertSession()->responseContains('8002 - Migrates duplicated Views entity_browser_select fields.'); } /** @@ -53,7 +53,7 @@ class EntityBrowserUpdateHookTest extends UpdatePathTestBase { ->get('entity_browser.browser.test_update'); $this->assertNull($browser->get('submit_text'), 'Old submit text is gone'); - $this->assertEqual($browser->get('widgets.a4ad947c-9669-497c-9988-24351955a02f.settings.submit_text'), 'All animals are created equal','New submit text appears on the widget.'); + $this->assertEquals($browser->get('widgets.a4ad947c-9669-497c-9988-24351955a02f.settings.submit_text'), 'All animals are created equal', 'New submit text appears on the widget.'); } /** @@ -64,7 +64,7 @@ class EntityBrowserUpdateHookTest extends UpdatePathTestBase { $view = $this->container->get('config.factory') ->get('views.view.test_deprecated_field'); - $this->assertEqual($view->get('display.default.display_options.fields.entity_browser_select.table'), 'node', 'Data table in "entity_browser_select" replaced with data field.'); + $this->assertEquals($view->get('display.default.display_options.fields.entity_browser_select.table'), 'node', 'Data table in "entity_browser_select" replaced with data field.'); } } diff --git a/src/Tests/FormElementTest.php b/src/Tests/FormElementTest.php index 0a4ac41..60a6657 100644 --- a/src/Tests/FormElementTest.php +++ b/src/Tests/FormElementTest.php @@ -3,14 +3,14 @@ namespace Drupal\entity_browser\Tests; use Drupal\entity_browser\Element\EntityBrowserElement; -use Drupal\simpletest\WebTestBase; +use Drupal\Tests\BrowserTestBase; /** * Tests the entity browser form element. * * @group entity_browser */ -class FormElementTest extends WebTestBase { +class FormElementTest extends BrowserTestBase { /** * Modules to enable. @@ -48,27 +48,34 @@ class FormElementTest extends WebTestBase { */ public function testFormElement() { $this->drupalGet('/test-element'); - $this->assertLink('Select entities', 0, 'Trigger link found.'); - $this->assertFieldByXPath("//input[@type='hidden' and @id='edit-fancy-entity-browser-target']", '', "Entity browser's hidden element found."); + $this->assertSession()->linkExists('Select entities', 0, 'Trigger link found.'); - $edit = [ - 'fancy_entity_browser[entity_ids]' => $this->nodes[0]->getEntityTypeId() . ':' . $this->nodes[0]->id() . ' ' . $this->nodes[1]->getEntityTypeId() . ':' . $this->nodes[1]->id(), + $ids = [ + $this->nodes[0]->getEntityTypeId() . ':' . $this->nodes[0]->id(), + $this->nodes[1]->getEntityTypeId() . ':' . $this->nodes[1]->id() ]; - $this->drupalPostForm(NULL, $edit, 'Submit'); + + $ids = implode(' ', $ids); + + $this->assertSession()->hiddenFieldExists("fancy_entity_browser[entity_ids]")->setValue([ + 'fancy_entity_browser[entity_ids]' => $ids, + ]); + + $this->assertSession()->buttonExists('Submit')->press(); $expected = 'Selected entities: ' . $this->nodes[0]->label() . ', ' . $this->nodes[1]->label(); - $this->assertText($expected, 'Selected entities detected.'); + $this->assertSession()->responseContains($expected, 'Selected entities detected.'); $default_entity = $this->nodes[0]->getEntityTypeId() . ':' . $this->nodes[0]->id(); $this->drupalGet('/test-element', ['query' => ['default_entity' => $default_entity, 'selection_mode' => EntityBrowserElement::SELECTION_MODE_EDIT]]); - $this->assertLink('Select entities', 0, 'Trigger link found.'); - $this->assertFieldByXPath("//input[@type='hidden' and @id='edit-fancy-entity-browser-target']", $default_entity, "Entity browser's hidden element found."); + $this->assertSession()->linkExists('Select entities', 0, 'Trigger link found.'); + $this->assertSession()->fieldValueEquals("fancy_entity_browser[target]", $default_entity); $edit = [ 'fancy_entity_browser[entity_ids]' => $this->nodes[1]->getEntityTypeId() . ':' . $this->nodes[1]->id() . ' ' . $this->nodes[0]->getEntityTypeId() . ':' . $this->nodes[0]->id(), ]; $this->drupalPostForm(NULL, $edit, 'Submit'); $expected = 'Selected entities: ' . $this->nodes[1]->label() . ', ' . $this->nodes[0]->label(); - $this->assertText($expected, 'Selected entities detected.'); + $this->assertSession()->responseContains($expected, 'Selected entities detected.'); } } diff --git a/src/Tests/MultistepDisplayTest.php b/src/Tests/MultistepDisplayTest.php index 1d91a5d..ab55530 100644 --- a/src/Tests/MultistepDisplayTest.php +++ b/src/Tests/MultistepDisplayTest.php @@ -2,14 +2,20 @@ namespace Drupal\entity_browser\Tests; -use Drupal\simpletest\WebTestBase; +use Drupal\FunctionalJavascriptTests\WebDriverTestBase; +use Drupal\Tests\TestFileCreationTrait; /** * Tests the multistep display selection display. * * @group entity_browser */ -class MultistepDisplayTest extends WebTestBase { +class MultistepDisplayTest extends WebDriverTestBase { + + use TestFileCreationTrait { + getTestFiles as drupalGetTestFiles; + compareFiles as drupalCompareFiles; + } /** * Modules to enable. @@ -47,10 +53,10 @@ class MultistepDisplayTest extends WebTestBase { $this->drupalPostForm(NULL, [], 'Next'); $this->drupalPostForm(NULL, [], 'Next'); - $this->assertText('Selection display', 'Trail is shown.'); - $this->assertText('Select button text', 'Title is correct.'); - $this->assertText('Text to display on the entity browser select button.', 'Description is correct.'); - $this->assertRaw('Use selected', 'Default text is correct.'); + $this->assertSession()->responseContains('Selection display', 'Trail is shown.'); + $this->assertSession()->responseContains('Select button text', 'Title is correct.'); + $this->assertSession()->responseContains('Text to display on the entity browser select button.', 'Description is correct.'); + $this->assertSession()->responseContains('Use selected', 'Default text is correct.'); $edit = [ 'entity_type' => 'file', 'display' => 'label', @@ -58,7 +64,8 @@ class MultistepDisplayTest extends WebTestBase { 'select_text' => 'Use blah selected', ]; $this->drupalPostForm(NULL, $edit, 'Next'); - $this->drupalPostAjaxForm(NULL, ['widget' => 'upload'], 'widget'); + $this->assertSession()->selectExists('widget')->setValue('upload'); + $this->assertSession()->assertWaitOnAjaxRequest(); $this->drupalPostForm(NULL, [], 'Finish'); $account = $this->drupalCreateUser([ @@ -67,14 +74,14 @@ class MultistepDisplayTest extends WebTestBase { $this->drupalLogin($account); // Go to the entity browser iframe link. $this->drupalGet('/entity-browser/iframe/test_entity_browser'); - $this->assertNoRaw('Use blah selected'); + $this->assertSession()->responseNotContains('Use blah selected'); $image = current($this->drupalGetTestFiles('image')); $edit = [ 'files[upload][]' => $this->container->get('file_system')->realpath($image->uri), ]; $this->drupalPostForm(NULL, $edit, 'Select files'); - $this->assertRaw('Use blah selected', 'Select button is displayed if something is selected.'); + $this->assertSession()->responseContains('Use blah selected', 'Select button is displayed if something is selected.'); } } diff --git a/src/WidgetValidationBase.php b/src/WidgetValidationBase.php index 57db8f7..e5dd561 100644 --- a/src/WidgetValidationBase.php +++ b/src/WidgetValidationBase.php @@ -28,6 +28,9 @@ abstract class WidgetValidationBase extends PluginBase implements WidgetValidati */ protected $typedDataManager; + /** + * + */ public function __construct(array $configuration, $plugin_id, $plugin_definition, TypedDataManagerInterface $typed_data_manager) { $plugin_definition += [ 'constraint' => NULL, @@ -119,7 +122,7 @@ abstract class WidgetValidationBase extends PluginBase implements WidgetValidati * @param \Drupal\Core\TypedData\DataDefinitionInterface $data_definition * The data definition generated from ::getDataDefinition(). * @param array $entities - * An array of Entities to validate the definition against + * An array of Entities to validate the definition against. * * @return \Symfony\Component\Validator\ConstraintViolationListInterface * A list of violations. @@ -133,4 +136,5 @@ abstract class WidgetValidationBase extends PluginBase implements WidgetValidati return $violations; } + } diff --git a/src/WidgetValidationInterface.php b/src/WidgetValidationInterface.php index 65ad7ef..d7efd2c 100644 --- a/src/WidgetValidationInterface.php +++ b/src/WidgetValidationInterface.php @@ -5,7 +5,6 @@ namespace Drupal\entity_browser; use Drupal\Component\Plugin\ConfigurablePluginInterface; use Drupal\Component\Plugin\PluginInspectionInterface; - /** * Defines the interface for entity browser widget validations. */ @@ -32,4 +31,5 @@ interface WidgetValidationInterface extends PluginInspectionInterface, Configura * succeeded. */ public function validate(array $entities, $options = []); + } diff --git a/tests/fixtures/update/entity_browser.update-hook-test.php b/tests/fixtures/update/entity_browser.update-hook-test.php index 0a9e023..4ee9da1 100644 --- a/tests/fixtures/update/entity_browser.update-hook-test.php +++ b/tests/fixtures/update/entity_browser.update-hook-test.php @@ -1,5 +1,9 @@ assertSession()->linkExists('Select entities'); $this->getSession()->getPage()->clickLink('Select entities'); - $this->getSession()->switchToIFrame('entity_browser_iframe_test_entity_browser_file'); + //$this->getSession()->switchToIFrame('entity_browser_iframe_test_entity_browser_file'); - $this->getSession()->getPage()->checkField('entity_browser_select[file:' . $image->id() . ']'); - $this->getSession()->getPage()->pressButton('Select entities'); + $this->assertSession()->fieldExists('entity_browser_select[file:' . $image->id() . ']'); + $this->assertSession()->buttonExists('Select entities')->press(); // Switch back to the main page. - $this->getSession()->switchToIFrame(); + //$this->getSession()->switchToIFrame(); $this->waitForAjaxToFinish(); // Test the Edit functionality. $this->assertSession()->pageTextContains('llama.jpg'); @@ -44,7 +44,7 @@ class EntityBrowserTest extends EntityBrowserJavascriptTestBase { // @TODO Test the edit button. // Test the Delete functionality. $this->assertSession()->buttonExists('Remove'); - $this->getSession()->getPage()->pressButton('Remove'); + $this->assertSession()->buttonExists('Remove')->press(); $this->waitForAjaxToFinish(); $this->assertSession()->pageTextNotContains('llama.jpg'); $this->assertSession()->linkExists('Select entities'); @@ -63,7 +63,7 @@ class EntityBrowserTest extends EntityBrowserJavascriptTestBase { ->setWidgetSelector('tabs'); $browser->save(); - $this->assertEquals($browser->getWidgetSelector()->getPluginId(), 'tabs', 'Widget selector is set to tabs.'); + $this->assertEquals('tabs', $browser->getWidgetSelector()->getPluginId(), 'Widget selector is set to tabs.'); // Create a file. $image = $this->createFile('llama'); @@ -76,7 +76,7 @@ class EntityBrowserTest extends EntityBrowserJavascriptTestBase { $this->assertSession()->linkExists('Select entities'); $this->getSession()->getPage()->clickLink('Select entities'); - $this->getSession()->switchToIFrame('entity_browser_iframe_test_entity_browser_file'); + //$this->getSession()->switchToIFrame('entity_browser_iframe_test_entity_browser_file'); $this->assertSession()->linkExists('dummy'); $this->assertSession()->linkExists('view'); @@ -84,9 +84,9 @@ class EntityBrowserTest extends EntityBrowserJavascriptTestBase { $this->assertEquals('is-active active', $this->getSession()->getPage()->findLink('view')->getAttribute('class')); - $this->getSession()->getPage()->checkField('entity_browser_select[file:' . $image->id() . ']'); - $this->getSession()->getPage()->pressButton('Select entities'); - $this->getSession()->switchToIFrame(); + $this->assertSession()->fieldExists('entity_browser_select[file:' . $image->id() . ']'); + $this->assertSession()->buttonExists('Select entities')->press(); + //$this->getSession()->switchToIFrame(); $this->waitForAjaxToFinish(); @@ -99,11 +99,10 @@ class EntityBrowserTest extends EntityBrowserJavascriptTestBase { // This is producing an error. Still investigating // InvalidStateError: DOM Exception 11: An attempt was made to use an object // that is not, or is no longer, usable. - //$edit = [ + // $edit = [ // 'files[upload][]' => $this->container->get('file_system')->realpath($image2->getFileUri()), - //]; + // ]; // $this->drupalPostForm(NULL, $edit, 'Select files');. - \Drupal::state()->set('eb_test_dummy_widget_access', FALSE); $this->drupalGet('entity-browser/iframe/test_entity_browser_file'); $this->assertSession()->linkNotExists('dummy'); @@ -148,18 +147,21 @@ class EntityBrowserTest extends EntityBrowserJavascriptTestBase { $this->assertSession()->linkExists('Select entities'); $this->getSession()->getPage()->clickLink('Select entities'); - $this->getSession()->switchToIFrame('entity_browser_iframe_test_entity_browser_file'); + //$this->getSession()->switchToIFrame('entity_browser_iframe_test_entity_browser_file'); $this->assertSession()->selectExists('widget'); - $this->assertSession()->optionExists('widget', 'cbc59500-04ab-4395-b063-c561f0e3bf80'); // Dummy - $this->assertSession()->optionExists('widget', '2dc1ab07-2f8f-42c9-aab7-7eef7f8b7d87'); // Upload - $this->assertSession()->optionExists('widget', '774798f1-5ec5-4b63-84bd-124cd51ec07d'); // View + // Dummy. + $this->assertSession()->optionExists('widget', 'cbc59500-04ab-4395-b063-c561f0e3bf80'); + // Upload. + $this->assertSession()->optionExists('widget', '2dc1ab07-2f8f-42c9-aab7-7eef7f8b7d87'); + // View. + $this->assertSession()->optionExists('widget', '774798f1-5ec5-4b63-84bd-124cd51ec07d'); // Selects the view widget. $this->getSession()->getPage()->selectFieldOption('widget', '774798f1-5ec5-4b63-84bd-124cd51ec07d'); - $this->getSession()->getPage()->checkField('entity_browser_select[file:' . $image->id() . ']'); - $this->getSession()->getPage()->pressButton('Select entities'); - $this->getSession()->switchToIFrame(); + $this->assertSession()->fieldExists('entity_browser_select[file:' . $image->id() . ']'); + $this->assertSession()->buttonExists('Select entities')->press(); + //$this->getSession()->switchToIFrame(); $this->waitForAjaxToFinish(); @@ -172,12 +174,14 @@ class EntityBrowserTest extends EntityBrowserJavascriptTestBase { // Causes a fatal. // Selects the upload widget. // $this->getSession()->getPage()->selectFieldOption('widget', '2dc1ab07-2f8f-42c9-aab7-7eef7f8b7d87');. - \Drupal::state()->set('eb_test_dummy_widget_access', FALSE); $this->drupalGet('entity-browser/iframe/test_entity_browser_file'); - $this->assertSession()->optionNotExists('widget', 'cbc59500-04ab-4395-b063-c561f0e3bf80'); // Dummy - $this->assertSession()->optionExists('widget', '2dc1ab07-2f8f-42c9-aab7-7eef7f8b7d87'); // Upload - $this->assertSession()->optionExists('widget', '774798f1-5ec5-4b63-84bd-124cd51ec07d'); // View + // Dummy. + $this->assertSession()->optionNotExists('widget', 'cbc59500-04ab-4395-b063-c561f0e3bf80'); + // Upload. + $this->assertSession()->optionExists('widget', '2dc1ab07-2f8f-42c9-aab7-7eef7f8b7d87'); + // View. + $this->assertSession()->optionExists('widget', '774798f1-5ec5-4b63-84bd-124cd51ec07d'); $this->assertSession()->responseHeaderContains('X-Drupal-Cache-Contexts', 'eb_dummy'); // Move dummy widget to the first place and make sure it does not appear. @@ -187,9 +191,12 @@ class EntityBrowserTest extends EntityBrowserJavascriptTestBase { $browser->getWidget('cbc59500-04ab-4395-b063-c561f0e3bf80')->setWeight(-15); $browser->save(); $this->drupalGet('entity-browser/iframe/test_entity_browser_file'); - $this->assertSession()->optionNotExists('widget', 'cbc59500-04ab-4395-b063-c561f0e3bf80'); // Dummy - $this->assertSession()->optionExists('widget', '2dc1ab07-2f8f-42c9-aab7-7eef7f8b7d87'); // Upload - $this->assertSession()->optionExists('widget', '774798f1-5ec5-4b63-84bd-124cd51ec07d'); // View + // Dummy. + $this->assertSession()->optionNotExists('widget', 'cbc59500-04ab-4395-b063-c561f0e3bf80'); + // Upload. + $this->assertSession()->optionExists('widget', '2dc1ab07-2f8f-42c9-aab7-7eef7f8b7d87'); + // View. + $this->assertSession()->optionExists('widget', '774798f1-5ec5-4b63-84bd-124cd51ec07d'); $this->assertSession()->pageTextNotContains('This is dummy widget.'); $this->assertSession()->responseHeaderContains('X-Drupal-Cache-Contexts', 'eb_dummy'); } @@ -242,13 +249,13 @@ class EntityBrowserTest extends EntityBrowserJavascriptTestBase { $this->getSession()->switchToIFrame('entity_browser_iframe_multiple_submit_example'); // Click the second submit button to make sure the widget does not close. - $this->getSession()->getPage()->pressButton('Second submit button'); + $this->assertSession()->buttonExists('Second submit button')->press(); // Check that the entity browser widget is still open. $this->getSession()->getPage()->hasButton('Second submit button'); // Click the primary submit button to close the widget. - $this->getSession()->getPage()->pressButton('Select entities'); + $this->assertSession()->buttonExists('Select entities')->press(); // Check that the entity browser widget is closed. $this->assertSession()->buttonNotExists('Second submit button'); diff --git a/tests/src/FunctionalJavascript/EntityBrowserViewsWidgetTest.php b/tests/src/FunctionalJavascript/EntityBrowserViewsWidgetTest.php index 5f4c8c1..f8f5d98 100644 --- a/tests/src/FunctionalJavascript/EntityBrowserViewsWidgetTest.php +++ b/tests/src/FunctionalJavascript/EntityBrowserViewsWidgetTest.php @@ -10,7 +10,7 @@ use Drupal\file\Entity\File; * @group entity_browser * @see \Drupal\entity_browser\Plugin\EntityBrowser\Widget\View */ -class EntityBrowserViewsWidgetTest extends EntityBrowserJavascriptTestBase { +class EntityBrowserViewsWidgetTest extends EntityBrowserWebDriverTestBase { /** * Modules to enable. @@ -55,12 +55,12 @@ class EntityBrowserViewsWidgetTest extends EntityBrowserJavascriptTestBase { $this->assertSession()->pageTextContains('example.jpg'); $this->assertSession()->fieldExists($field); $this->getSession()->getPage()->fillField('filename', 'llama'); - $this->getSession()->getPage()->pressButton('Apply'); + $this->assertSession()->buttonExists('Apply')->press(); $this->waitForAjaxToFinish(); $this->assertSession()->fieldNotExists($field); $this->assertSession()->pageTextNotContains('example.jpg'); $this->getSession()->getPage()->fillField('filename', 'example'); - $this->getSession()->getPage()->pressButton('Apply'); + $this->assertSession()->buttonExists('Apply'); $this->waitForAjaxToFinish(); $this->assertSession()->pageTextContains('example.jpg'); $this->assertSession()->fieldExists($field); @@ -96,7 +96,7 @@ class EntityBrowserViewsWidgetTest extends EntityBrowserJavascriptTestBase { $this->drupalGet('/entity-browser/iframe/test_entity_browser_file', ['query' => ['uuid' => $uuid]]); $this->getSession()->getPage()->fillField('entity_browser_select[file:1]', TRUE); $this->getSession()->getPage()->fillField('entity_browser_select[file:2]', TRUE); - $this->getSession()->getPage()->pressButton('Select entities'); + $this->assertSession()->buttonExists('Select entities')->press(); $this->assertSession()->pageTextContains('You can not select more than 1 entity.'); $this->assertSession()->checkboxNotChecked('entity_browser_select[file:1]'); diff --git a/tests/src/FunctionalJavascript/EntityBrowserJavascriptTestBase.php b/tests/src/FunctionalJavascript/EntityBrowserWebDriverTestBase.php similarity index 98% rename from tests/src/FunctionalJavascript/EntityBrowserJavascriptTestBase.php rename to tests/src/FunctionalJavascript/EntityBrowserWebDriverTestBase.php index 568a595..0ba9997 100644 --- a/tests/src/FunctionalJavascript/EntityBrowserJavascriptTestBase.php +++ b/tests/src/FunctionalJavascript/EntityBrowserWebDriverTestBase.php @@ -7,14 +7,14 @@ use Drupal\Core\Field\FieldStorageDefinitionInterface; use Drupal\file\Entity\File; use Drupal\field\Entity\FieldConfig; use Drupal\field\Entity\FieldStorageConfig; -use Drupal\FunctionalJavascriptTests\JavascriptTestBase; +use Drupal\FunctionalJavascriptTests\WebDriverTestBase; /** * Base class for Entity browser Javascript functional tests. * * @package Drupal\Tests\entity_browser\FunctionalJavascript */ -abstract class EntityBrowserJavascriptTestBase extends JavascriptTestBase { +abstract class EntityBrowserWebDriverTestBase extends WebDriverTestBase { /** * Modules to enable. diff --git a/tests/src/FunctionalJavascript/EntityReferenceWidgetTest.php b/tests/src/FunctionalJavascript/EntityReferenceWidgetTest.php index 33a3086..dd7b50e 100644 --- a/tests/src/FunctionalJavascript/EntityReferenceWidgetTest.php +++ b/tests/src/FunctionalJavascript/EntityReferenceWidgetTest.php @@ -14,7 +14,7 @@ use Drupal\user\Entity\Role; * * @group entity_browser */ -class EntityReferenceWidgetTest extends EntityBrowserJavascriptTestBase { +class EntityReferenceWidgetTest extends EntityBrowserWebDriverTestBase { /** * {@inheritdoc} @@ -92,10 +92,10 @@ class EntityReferenceWidgetTest extends EntityBrowserJavascriptTestBase { $session->switchToIFrame('entity_browser_iframe_test_entity_browser_iframe_node_view'); $this->waitForAjaxToFinish(); $page->checkField('edit-entity-browser-select-node1'); - $page->pressButton('Select entities'); + $this->assertSession()->buttonExists('Select entities')->press(); $session->switchToIFrame(); $this->waitForAjaxToFinish(); - $page->pressButton('Save'); + $this->assertSession()->buttonExists('Save')->press(); $assert_session->pageTextContains('Article Referencing node 1 has been created.'); $nid = $this->container->get('entity.query')->get('node')->condition('title', 'Referencing node 1')->execute(); @@ -151,7 +151,7 @@ class EntityReferenceWidgetTest extends EntityBrowserJavascriptTestBase { $assert_session->buttonNotExists('edit-field-entity-reference1-current-items-0-replace-button'); // Test the "Remove" button on the widget works. - $page->pressButton('Remove'); + $this->assertSession()->buttonExists('Remove')->press(); $this->waitForAjaxToFinish(); $assert_session->pageTextNotContains('Target example node 1'); @@ -203,7 +203,7 @@ class EntityReferenceWidgetTest extends EntityBrowserJavascriptTestBase { $session->switchToIFrame('entity_browser_iframe_test_entity_browser_iframe_node_view'); $this->waitForAjaxToFinish(); $page->checkField('edit-entity-browser-select-node3'); - $page->pressButton('Select entities'); + $this->assertSession()->buttonExists('Select entities')->press(); $session->wait(1000); $session->switchToIFrame(); $this->waitForAjaxToFinish(); @@ -217,12 +217,12 @@ class EntityReferenceWidgetTest extends EntityBrowserJavascriptTestBase { $session->switchToIFrame('entity_browser_iframe_test_entity_browser_iframe_node_view'); $this->waitForAjaxToFinish(); $page->checkField('edit-entity-browser-select-node1'); - $page->pressButton('Select entities'); + $this->assertSession()->buttonExists('Select entities')->press(); $session->wait(1000); $session->switchToIFrame(); $this->waitForAjaxToFinish(); $assert_session->elementNotExists('css', 'input[data-drupal-selector="edit-field-entity-reference1-current-items-0-replace-button"]'); - $page->pressButton('Save'); + $this->assertSession()->buttonExists('Save')->press(); $assert_session->pageTextContains('Article Referencing node 1 has been updated.'); // Test the replace button again with different field cardinalities. @@ -235,7 +235,7 @@ class EntityReferenceWidgetTest extends EntityBrowserJavascriptTestBase { $session->switchToIFrame('entity_browser_iframe_test_entity_browser_iframe_node_view'); $this->waitForAjaxToFinish(); $page->checkField('edit-entity-browser-select-node1'); - $page->pressButton('Select entities'); + $this->assertSession()->buttonExists('Select entities')->press(); $session->wait(1000); $session->switchToIFrame(); $this->waitForAjaxToFinish(); @@ -251,7 +251,7 @@ class EntityReferenceWidgetTest extends EntityBrowserJavascriptTestBase { $session->switchToIFrame('entity_browser_iframe_test_entity_browser_iframe_node_view'); $this->waitForAjaxToFinish(); $page->checkField('edit-entity-browser-select-node2'); - $page->pressButton('Select entities'); + $this->assertSession()->buttonExists('Select entities')->press(); $session->wait(1000); $session->switchToIFrame(); $this->waitForAjaxToFinish(); @@ -267,7 +267,7 @@ class EntityReferenceWidgetTest extends EntityBrowserJavascriptTestBase { $session->switchToIFrame('entity_browser_iframe_test_entity_browser_iframe_node_view'); $this->waitForAjaxToFinish(); $page->checkField('edit-entity-browser-select-node1'); - $page->pressButton('Select entities'); + $this->assertSession()->buttonExists('Select entities')->press(); $session->wait(1000); $session->switchToIFrame(); $this->waitForAjaxToFinish(); @@ -283,7 +283,7 @@ class EntityReferenceWidgetTest extends EntityBrowserJavascriptTestBase { $session->switchToIFrame('entity_browser_iframe_test_entity_browser_iframe_node_view'); $this->waitForAjaxToFinish(); $page->checkField('edit-entity-browser-select-node2'); - $page->pressButton('Select entities'); + $this->assertSession()->buttonExists('Select entities')->press(); $session->wait(1000); $session->switchToIFrame(); $this->waitForAjaxToFinish(); @@ -301,11 +301,10 @@ class EntityReferenceWidgetTest extends EntityBrowserJavascriptTestBase { $session->switchToIFrame('entity_browser_iframe_test_entity_browser_iframe_node_view'); $this->waitForAjaxToFinish(); $page->checkField('edit-entity-browser-select-node1'); - $page->pressButton('Select entities'); + $this->assertSession()->buttonExists('Select entities')->press(); $session->switchToIFrame(); $this->waitForAjaxToFinish(); $assert_session->buttonNotExists('edit-field-entity-reference1-current-items-0-edit-button'); - } } diff --git a/tests/src/FunctionalJavascript/ImageFieldTest.php b/tests/src/FunctionalJavascript/ImageFieldTest.php index a9f761c..be43f5a 100644 --- a/tests/src/FunctionalJavascript/ImageFieldTest.php +++ b/tests/src/FunctionalJavascript/ImageFieldTest.php @@ -14,7 +14,7 @@ use Drupal\node\Entity\Node; * * @group entity_browser */ -class ImageFieldTest extends EntityBrowserJavascriptTestBase { +class ImageFieldTest extends EntityBrowserWebDriverTestBase { /** * Created file entity. @@ -118,9 +118,9 @@ class ImageFieldTest extends EntityBrowserJavascriptTestBase { $this->assertSession()->linkExists('Select images'); $this->getSession()->getPage()->clickLink('Select images'); $this->getSession()->switchToIFrame('entity_browser_iframe_test_entity_browser_iframe_view'); - $this->getSession()->getPage()->checkField('entity_browser_select[file:' . $this->image->id() . ']'); - $this->getSession()->getPage()->pressButton('Select entities'); - $this->getSession()->getPage()->pressButton('Use selected'); + $this->assertSession()->fieldExists('entity_browser_select[file:' . $this->image->id() . ']'); + $this->assertSession()->buttonExists('Select entities')->press(); + $this->assertSession()->buttonExists('Use selected')->press(); $this->assertSession()->pageTextContains('example.jpg'); // Switch back to the main page. $this->getSession()->switchToIFrame(); @@ -135,7 +135,7 @@ class ImageFieldTest extends EntityBrowserJavascriptTestBase { $this->getSession()->getPage()->fillField('field_image[current][1][meta][alt]', $alt_text); $this->getSession()->getPage()->fillField('field_image[current][1][meta][title]', $title_text); $this->getSession()->getPage()->fillField('title[0][value]', 'Node 1'); - $this->getSession()->getPage()->pressButton('Save'); + $this->assertSession()->buttonExists('Save')->press(); $this->assertSession()->pageTextContains('Article Node 1 has been created.'); $node = Node::load(1); $saved_alt = $node->get('field_image')[0]->alt; @@ -144,8 +144,7 @@ class ImageFieldTest extends EntityBrowserJavascriptTestBase { $this->assertEquals($saved_title, $title_text); // Test the Delete functionality. $this->drupalGet('node/1/edit'); - $this->assertSession()->buttonExists('Remove'); - $this->getSession()->getPage()->pressButton('Remove'); + $this->assertSession()->buttonExists('Remove')->press(); $this->waitForAjaxToFinish(); // Image filename should not be present. $this->assertSession()->pageTextNotContains('example.jpg'); @@ -157,13 +156,12 @@ class ImageFieldTest extends EntityBrowserJavascriptTestBase { $image2->save(); \Drupal::service('file.usage')->add($image2, 'entity_browser', 'test', '1'); $this->drupalGet('node/1/edit'); - $this->assertSession()->buttonExists('Replace'); - $this->getSession()->getPage()->pressButton('Replace'); + $this->assertSession()->buttonExists('Replace')->press(); $this->waitForAjaxToFinish(); $this->getSession()->switchToIFrame('entity_browser_iframe_test_entity_browser_iframe_view'); - $this->getSession()->getPage()->checkField('entity_browser_select[file:' . $image2->id() . ']'); - $this->getSession()->getPage()->pressButton('Select entities'); - $this->getSession()->getPage()->pressButton('Use selected'); + $this->assertSession()->fieldExists('entity_browser_select[file:' . $image2->id() . ']'); + $this->assertSession()->buttonExists('Select entities')->press(); + $this->assertSession()->buttonExists('Use selected')->press(); $this->getSession()->wait(1000); $this->getSession()->switchToIFrame(); $this->waitForAjaxToFinish(); @@ -192,7 +190,7 @@ class ImageFieldTest extends EntityBrowserJavascriptTestBase { $this->getSession()->getPage()->attachFileToField('files[upload][]', $file_wrong_type); $this->waitForAjaxToFinish(); $this->assertSession()->pageTextContains('Only files with the following extensions are allowed: jpg'); - $this->assertSession()->pageTextContains('The specified file druplicon.png could not be uploaded'); + $this->assertSession()->responseContains('The specified file druplicon.png could not be uploaded'); // Upload an image bigger than the field widget's configured max size. $this->getSession()->getPage()->attachFileToField('files[upload][]', $file_too_big); $this->waitForAjaxToFinish(); @@ -200,8 +198,8 @@ class ImageFieldTest extends EntityBrowserJavascriptTestBase { // Upload an image that passes validation and finish the upload. $this->getSession()->getPage()->attachFileToField('files[upload][]', $file_just_right); $this->waitForAjaxToFinish(); - $this->getSession()->getPage()->pressButton('Select files'); - $this->getSession()->getPage()->pressButton('Use selected'); + $this->assertSession()->buttonExists('Select files')->press(); + $this->assertSession()->buttonExists('Use selected')->press(); $this->assertSession()->pageTextContains('image-test.jpg'); // Check that the file has uploaded to the correct sub-directory. $this->getSession()->switchToIFrame(); diff --git a/tests/src/FunctionalJavascript/InlineEntityFormTest.php b/tests/src/FunctionalJavascript/InlineEntityFormTest.php index a3886b3..2946112 100644 --- a/tests/src/FunctionalJavascript/InlineEntityFormTest.php +++ b/tests/src/FunctionalJavascript/InlineEntityFormTest.php @@ -11,7 +11,7 @@ use Behat\Mink\Element\NodeElement; * * @package Drupal\Tests\entity_browser\FunctionalJavascript */ -class InlineEntityFormTest extends EntityBrowserJavascriptTestBase { +class InlineEntityFormTest extends EntityBrowserWebDriverTestBase { /** * {@inheritdoc} @@ -90,7 +90,7 @@ class InlineEntityFormTest extends EntityBrowserJavascriptTestBase { $page = $this->getSession()->getPage(); $page->fillField('Title', 'Test IEF Title'); - $page->pressButton('Add new Test File Media'); + $this->assertSession()->buttonExists('Add new Test File Media')->press(); $this->assertSession()->assertWaitOnAjaxRequest(); @@ -102,22 +102,22 @@ class InlineEntityFormTest extends EntityBrowserJavascriptTestBase { $page->checkField('entity_browser_select[file:1]'); $page->checkField('entity_browser_select[file:2]'); - $page->pressButton('Select entities'); + $this->assertSession()->buttonExists('Select entities')->press(); $this->assertSession()->assertWaitOnAjaxRequest(); - $page->pressButton('Use selected'); + $this->assertSession()->buttonExists('Use selected')->press(); $this->getSession()->switchToIFrame(); $this->assertSession()->assertWaitOnAjaxRequest(); - $page->pressButton('Create Test File Media'); + $this->assertSession()->buttonExists('Create Test File Media')->press(); $this->assertSession()->assertWaitOnAjaxRequest(); - $page->pressButton('Save'); + $this->assertSession()->buttonExists('Save')->press(); $this->drupalGet('node/1/edit'); $page = $this->getSession()->getPage(); - $page->pressButton('Edit'); + $this->assertSession()->buttonExists('Edit')->press(); $this->assertSession()->assertWaitOnAjaxRequest(); // Test reorder of elements. @@ -125,10 +125,10 @@ class InlineEntityFormTest extends EntityBrowserJavascriptTestBase { $this->dragDropElement($dragged, 150, 0); $this->assertSession()->assertWaitOnAjaxRequest(); - $page->pressButton('Update Test File Media'); + $this->assertSession()->buttonExists('Update Test File Media')->press(); $this->assertSession()->assertWaitOnAjaxRequest(); - $page->pressButton('Edit'); + $this->assertSession()->buttonExists('Edit')->press(); $this->assertSession()->assertWaitOnAjaxRequest(); // Check that element on second position is test_file1 (file:1). @@ -142,10 +142,10 @@ class InlineEntityFormTest extends EntityBrowserJavascriptTestBase { $this->click('input[name*="ief_media_type_file_field_remove_1_1"]'); $this->assertSession()->assertWaitOnAjaxRequest(); - $page->pressButton('Update Test File Media'); + $this->assertSession()->buttonExists('Update Test File Media')->press(); $this->assertSession()->assertWaitOnAjaxRequest(); - $page->pressButton('Edit'); + $this->assertSession()->buttonExists('Edit')->press(); $this->assertSession()->assertWaitOnAjaxRequest(); // Check that remote button does not exist for already removed entity. @@ -159,17 +159,17 @@ class InlineEntityFormTest extends EntityBrowserJavascriptTestBase { ->switchToIFrame('entity_browser_iframe_ief_entity_browser_file'); $page->checkField('entity_browser_select[file:3]'); - $page->pressButton('Select entities'); + $this->assertSession()->buttonExists('Select entities')->press(); $this->assertSession()->assertWaitOnAjaxRequest(); - $page->pressButton('Use selected'); + $this->assertSession()->buttonExists('Use selected')->press(); $this->getSession()->switchToIFrame(); $this->assertSession()->assertWaitOnAjaxRequest(); - $page->pressButton('Update Test File Media'); + $this->assertSession()->buttonExists('Update Test File Media')->press(); $this->assertSession()->assertWaitOnAjaxRequest(); - $page->pressButton('Edit'); + $this->assertSession()->buttonExists('Edit')->press(); $this->assertSession()->assertWaitOnAjaxRequest(); // Check that element on second position is test_file3 (file:3). @@ -189,14 +189,14 @@ class InlineEntityFormTest extends EntityBrowserJavascriptTestBase { $this->dragDropElement($dragged, 150, 0); $this->assertSession()->assertWaitOnAjaxRequest(); - $page->pressButton('Use selected'); + $this->assertSession()->buttonExists('Use selected')->press(); $this->getSession()->switchToIFrame(); $this->assertSession()->assertWaitOnAjaxRequest(); - $page->pressButton('Update Test File Media'); + $this->assertSession()->buttonExists('Update Test File Media')->press(); $this->assertSession()->assertWaitOnAjaxRequest(); - $page->pressButton('Edit'); + $this->assertSession()->buttonExists('Edit')->press(); $this->assertSession()->assertWaitOnAjaxRequest(); // Check that element on second position is test_file2 (file:2). @@ -213,17 +213,17 @@ class InlineEntityFormTest extends EntityBrowserJavascriptTestBase { ->switchToIFrame('entity_browser_iframe_ief_entity_browser_file'); $this->assertSession()->assertWaitOnAjaxRequest(); - $page->pressButton('remove_3_0'); + $this->assertSession()->buttonExists('remove_3_0')->press(); $this->assertSession()->assertWaitOnAjaxRequest(); - $page->pressButton('Use selected'); + $this->assertSession()->buttonExists('Use selected')->press(); $this->getSession()->switchToIFrame(); $this->assertSession()->assertWaitOnAjaxRequest(); - $page->pressButton('Update Test File Media'); + $this->assertSession()->buttonExists('Update Test File Media')->press(); $this->assertSession()->assertWaitOnAjaxRequest(); - $page->pressButton('Edit'); + $this->assertSession()->buttonExists('Edit')->press(); $this->assertSession()->assertWaitOnAjaxRequest(); // Check that element on first position is test_file2 (file:2). @@ -247,13 +247,12 @@ class InlineEntityFormTest extends EntityBrowserJavascriptTestBase { $page = $this->getSession()->getPage(); $page->fillField('Title', 'Test IEF Title'); - $page->pressButton('Add existing Test File Media'); + $this->assertSession()->buttonExists('Add existing Test File Media')->press(); - $this->assertSession()->assertWaitOnAjaxRequest(); - - $this->getSession() - ->switchToIFrame('entity_browser_iframe_ief_entity_browser_file_modal'); + $this->assertSession()->waitForElementVisible('css', 'iframe.entity_browser_iframe_image_browser_only_reference'); + $this->assertSession()->pageTextContains('Test entity browser file modal'); } + } diff --git a/tests/src/FunctionalJavascript/MultiStepSelectionDisplayTest.php b/tests/src/FunctionalJavascript/MultiStepSelectionDisplayTest.php index bfbd06a..5cb7b00 100644 --- a/tests/src/FunctionalJavascript/MultiStepSelectionDisplayTest.php +++ b/tests/src/FunctionalJavascript/MultiStepSelectionDisplayTest.php @@ -11,7 +11,7 @@ use Drupal\Component\Utility\NestedArray; * * @package Drupal\Tests\entity_browser\FunctionalJavascript */ -class MultiStepSelectionDisplayTest extends EntityBrowserJavascriptTestBase { +class MultiStepSelectionDisplayTest extends EntityBrowserWebDriverTestBase { /** * Open iframe entity browser and change scope to iframe. diff --git a/tests/src/FunctionalJavascript/PagerElementTest.php b/tests/src/FunctionalJavascript/PagerElementTest.php index 5e51f4a..97792f8 100644 --- a/tests/src/FunctionalJavascript/PagerElementTest.php +++ b/tests/src/FunctionalJavascript/PagerElementTest.php @@ -11,7 +11,7 @@ use Drupal\field\Entity\FieldStorageConfig; * * @group entity_browser */ -class PagerElementTest extends EntityBrowserJavascriptTestBase { +class PagerElementTest extends EntityBrowserWebDriverTestBase { /** * Modules to enable. @@ -44,7 +44,6 @@ class PagerElementTest extends EntityBrowserJavascriptTestBase { ], ])->save(); - FieldConfig::create([ 'field_name' => 'field_reference_pager', 'entity_type' => 'node', @@ -85,34 +84,35 @@ class PagerElementTest extends EntityBrowserJavascriptTestBase { $this->assertSession()->buttonExists('‹ Previous')->hasAttribute('disabled'); $this->assertSession()->pageTextContains('Page 1'); $this->assertSession()->buttonExists('Next ›'); - $this->getSession()->getPage()->pressButton('Next ›'); + $this->assertSession()->buttonExists('Next ›')->press(); $this->assertSession()->pageTextContains('Current page reported by the element is: 2.'); $this->assertSession()->pageTextContains('Page 2'); - $this->getSession()->getPage()->pressButton('Next ›'); + $this->assertSession()->buttonExists('Next ›')->press(); $this->assertSession()->pageTextContains('Current page reported by the element is: 3.'); $this->assertSession()->pageTextContains('Page 3'); - $this->getSession()->getPage()->pressButton('Next ›'); + $this->assertSession()->buttonExists('Next ›')->press(); $this->assertSession()->pageTextContains('Current page reported by the element is: 4.'); $this->assertSession()->pageTextContains('Page 4'); $this->assertSession()->buttonExists('Next ›')->hasAttribute('disabled'); // Go back. - $this->getSession()->getPage()->pressButton('‹ Previous'); + $this->assertSession()->buttonExists('‹ Previous')->press(); $this->assertSession()->pageTextContains('Current page reported by the element is: 3.'); $this->assertSession()->pageTextContains('Page 3'); - $this->getSession()->getPage()->pressButton('‹ Previous'); + $this->assertSession()->buttonExists('‹ Previous')->press(); $this->assertSession()->pageTextContains('Current page reported by the element is: 2.'); $this->assertSession()->pageTextContains('Page 2'); - $this->getSession()->getPage()->pressButton('‹ Previous'); + $this->assertSession()->buttonExists('‹ Previous')->press(); $this->assertSession()->pageTextContains('Current page reported by the element is: 1.'); $this->assertSession()->pageTextContains('Page 1'); $this->assertSession()->buttonExists('‹ Previous')->hasAttribute('disabled'); // Test reset button. - $this->getSession()->getPage()->pressButton('Last page'); + $this->assertSession()->buttonExists('Last page')->press(); + $this->assertSession()->pageTextContains('Current page reported by the element is: 4.'); $this->assertSession()->pageTextContains('Page 4'); - $this->getSession()->getPage()->pressButton('First page'); + $this->assertSession()->buttonExists('First page')->press(); $this->assertSession()->pageTextContains('Current page reported by the element is: 1.'); $this->assertSession()->pageTextContains('Page 1'); } diff --git a/tests/src/FunctionalJavascript/ParagraphsTest.php b/tests/src/FunctionalJavascript/ParagraphsTest.php index f3d5036..17f3abd 100644 --- a/tests/src/FunctionalJavascript/ParagraphsTest.php +++ b/tests/src/FunctionalJavascript/ParagraphsTest.php @@ -7,7 +7,7 @@ namespace Drupal\Tests\entity_browser\FunctionalJavascript; * * @group entity_browser */ -class ParagraphsTest extends EntityBrowserJavascriptTestBase { +class ParagraphsTest extends EntityBrowserWebDriverTestBase { /** * {@inheritdoc} @@ -52,26 +52,26 @@ class ParagraphsTest extends EntityBrowserJavascriptTestBase { $title->setValue('Paragraph test'); // Create a new paragraph referencing our article. - $this->getSession()->getPage()->pressButton('field_paragraph_content_embed_add_more'); + $this->assertSession()->buttonExists('field_paragraph_content_embed_add_more')->press(); $this->waitForAjaxToFinish(); $this->assertSession()->linkExists('Select entities'); $this->getSession()->getPage()->clickLink('Select entities'); $this->getSession()->switchToIFrame('entity_browser_iframe_test_nodes'); - $this->getSession()->getPage()->checkField('entity_browser_select[node:' . $node->id() . ']'); - $this->getSession()->getPage()->pressButton('Select entities'); + $this->assertSession()->fieldExists('entity_browser_select[node:' . $node->id() . ']'); + $this->assertSession()->buttonExists('Select entities')->press(); // Switch back to the main page. $this->getSession()->switchToIFrame(); $this->waitForAjaxToFinish(); // Create another paragraph referencing our article. - $this->getSession()->getPage()->pressButton('field_paragraph_content_embed_add_more'); + $this->assertSession()->buttonExists('field_paragraph_content_embed_add_more')->press(); $this->waitForAjaxToFinish(); $this->assertSession()->linkExists('Select entities'); $this->getSession()->getPage()->clickLink('Select entities'); $this->getSession()->switchToIFrame('entity_browser_iframe_test_nodes'); - $this->getSession()->getPage()->checkField('entity_browser_select[node:' . $node->id() . ']'); - $this->getSession()->getPage()->pressButton('Select entities'); + $this->assertSession()->fieldExists('entity_browser_select[node:' . $node->id() . ']'); + $this->assertSession()->buttonExists('Select entities')->press(); // Switch back to the main page. $this->getSession()->switchToIFrame(); @@ -85,31 +85,31 @@ class ParagraphsTest extends EntityBrowserJavascriptTestBase { // Click the remove button on the second paragraph's article reference, // and ensure that only that instance of our article is removed. - $this->click('.field--name-field-paragraph tbody tr:nth-child(2) .paragraphs-subform [value="Remove"]'); + $this->assertSession()->elementExists('css', '.field--name-field-paragraph tbody tr:nth-child(2) .paragraphs-subform [value="Remove"]')->click(); $this->waitForAjaxToFinish(); $this->assertSession()->elementTextNotContains('css', $selector_2, 'Hello world'); $this->assertSession()->elementTextContains('css', $selector_1, 'Hello world'); // Testing nested paragraphs field. - $this->getSession()->getPage()->pressButton('field_paragraph_0_subform_field_paragraphs_nested_nested_paragraph_add_more'); + $this->assertSession()->buttonExists('field_paragraph_0_subform_field_paragraphs_nested_nested_paragraph_add_more')->press(); $this->waitForAjaxToFinish(); $this->assertSession()->linkExists('Select entities'); $this->getSession()->getPage()->clickLink('Select entities'); $this->getSession()->switchToIFrame('entity_browser_iframe_test_nodes'); - $this->getSession()->getPage()->checkField('entity_browser_select[node:' . $node_nested->id() . ']'); - $this->getSession()->getPage()->pressButton('Select entities'); + $this->assertSession()->fieldExists('entity_browser_select[node:' . $node_nested->id() . ']'); + $this->assertSession()->buttonExists('Select entities')->press(); // Switch back to the main page. $this->getSession()->switchToIFrame(); $this->waitForAjaxToFinish(); - $this->getSession()->getPage()->pressButton('field_paragraph_0_subform_field_paragraphs_nested_nested_paragraph_add_more'); + $this->assertSession()->buttonExists('field_paragraph_0_subform_field_paragraphs_nested_nested_paragraph_add_more')->press(); $this->waitForAjaxToFinish(); $this->assertSession()->linkExists('Select entities'); $this->getSession()->getPage()->clickLink('Select entities'); $this->getSession()->switchToIFrame('entity_browser_iframe_test_nodes'); - $this->getSession()->getPage()->checkField('entity_browser_select[node:' . $node_nested_second->id() . ']'); - $this->getSession()->getPage()->pressButton('Select entities'); + $this->assertSession()->fieldExists('entity_browser_select[node:' . $node_nested_second->id() . ']'); + $this->assertSession()->buttonExists('Select entities')->press(); // Switch back to the main page. $this->getSession()->switchToIFrame(); @@ -120,7 +120,7 @@ class ParagraphsTest extends EntityBrowserJavascriptTestBase { $this->click('.field--name-field-paragraphs-nested tbody tr:nth-child(1) .paragraphs-subform [value="Edit"]'); $this->waitForAjaxToFinish(); $this->assertSession()->elementExists('css', '.ui-dialog .node-article-edit-form .form-item-title-0-value [value="Nested node"]'); - $this->getSession()->getPage()->pressButton('Close'); + $this->assertSession()->buttonExists('Close')->press(); // Submit the form. $this->submitForm([], 'Save'); diff --git a/tests/src/FunctionalJavascript/PluginsTest.php b/tests/src/FunctionalJavascript/PluginsTest.php index d94946c..1544338 100644 --- a/tests/src/FunctionalJavascript/PluginsTest.php +++ b/tests/src/FunctionalJavascript/PluginsTest.php @@ -7,7 +7,7 @@ namespace Drupal\Tests\entity_browser\FunctionalJavascript; * * @group entity_browser */ -class PluginsTest extends EntityBrowserJavascriptTestBase { +class PluginsTest extends EntityBrowserWebDriverTestBase { /** * Tests the Entity browser iframe display plugin. @@ -21,12 +21,12 @@ class PluginsTest extends EntityBrowserJavascriptTestBase { $this->drupalGet('node/add/article'); $this->assertSession()->linkExists('Select entities'); $this->getSession()->getPage()->clickLink('Select entities'); - $this->getSession()->switchToIFrame('entity_browser_iframe_test_entity_browser_file'); - - $this->getSession()->getPage()->checkField('entity_browser_select[file:' . $image->id() . ']'); - $this->getSession()->getPage()->pressButton('Select entities'); - $this->getSession()->switchToIFrame(); - $this->waitUntilVisible('.field--type-entity-reference .button'); + // $this->getSession()->switchToIFrame('entity_browser_iframe_test_entity_browser_file'); + $this->waitForAjaxToFinish(); + $this->assertSession()->fieldExists('entity_browser_select[file:' . $image->id() . ']'); + $this->assertSession()->buttonExists('Select entities')->press(); + //$this->getSession()->switchToIFrame(); + $this->assertSession()->waitForElementVisible('css', '.field--type-entity-reference .button'); $this->assertSession()->pageTextContains('lama.jpg'); // Tests upload widget on single display. Gets the upload widget and sets @@ -40,9 +40,9 @@ class PluginsTest extends EntityBrowserJavascriptTestBase { $this->getSession()->getPage()->clickLink('Select entities'); $this->getSession()->switchToIFrame('entity_browser_iframe_test_entity_browser_file'); - $this->getSession()->getPage()->checkField('entity_browser_select[file:' . $image->id() . ']'); - $this->getSession()->getPage()->pressButton('Select entities'); - $this->getSession()->switchToIFrame(); + $this->assertSession()->fieldExists('entity_browser_select[file:' . $image->id() . ']'); + $this->assertSession()->buttonExists('Select entities')->press(); + //$this->getSession()->switchToIFrame(); $this->waitUntilVisible('.field--type-entity-reference .button'); $this->assertSession()->pageTextContains('lama.jpg'); @@ -57,8 +57,8 @@ class PluginsTest extends EntityBrowserJavascriptTestBase { $this->assertSession()->linkExists('upload'); $this->clickLink('view'); - $this->getSession()->getPage()->checkField('entity_browser_select[file:' . $image->id() . ']'); - $this->getSession()->getPage()->pressButton('Select entities'); + $this->assertSession()->fieldExists('entity_browser_select[file:' . $image->id() . ']'); + $this->assertSession()->buttonExists('Select entities')->press(); $this->getSession()->switchToIFrame(); $this->waitUntilVisible('.field--type-entity-reference .button'); $this->assertSession()->pageTextContains('lama.jpg'); @@ -70,8 +70,8 @@ class PluginsTest extends EntityBrowserJavascriptTestBase { $this->clickLink('upload'); $this->getSession()->getPage()->attachFileToField('edit-upload-upload', $this->container->get('file_system')->realpath($image->getFileUri())); $this->waitForAjaxToFinish(); - $this->getSession()->getPage()->checkField('upload[file_2][selected]'); - $this->getSession()->getPage()->pressButton('Select files'); + $this->assertSession()->fieldExists('upload[file_2][selected]'); + $this->assertSession()->buttonExists('Select files')->press(); $this->getSession()->switchToIFrame(); $this->waitForAjaxToFinish(); $this->assertSession()->pageTextContains('lama.jpg'); @@ -91,8 +91,8 @@ class PluginsTest extends EntityBrowserJavascriptTestBase { $this->getSession()->getPage()->clickLink('Select entities'); $this->getSession()->switchToIFrame('entity_browser_iframe_test_entity_browser_file'); $this->assertSession()->selectExists('edit-widget'); - $this->getSession()->getPage()->checkField('entity_browser_select[file:' . $image->id() . ']'); - $this->getSession()->getPage()->pressButton('Select entities'); + $this->assertSession()->fieldExists('entity_browser_select[file:' . $image->id() . ']'); + $this->assertSession()->buttonExists('Select entities')->press(); $this->getSession()->switchToIFrame(); $this->waitUntilVisible('.field--type-entity-reference .button'); $this->assertSession()->pageTextContains('lama.jpg'); @@ -106,8 +106,8 @@ class PluginsTest extends EntityBrowserJavascriptTestBase { $this->waitForAjaxToFinish(); $this->getSession()->getPage()->attachFileToField('files[upload][]', $this->container->get('file_system')->realpath($image->getFileUri())); $this->waitForAjaxToFinish(); - $this->getSession()->getPage()->checkField('upload[file_3][selected]'); - $this->getSession()->getPage()->pressButton('Select files'); + $this->assertSession()->fieldExists('upload[file_3][selected]'); + $this->assertSession()->buttonExists('Select files')->press(); $this->getSession()->switchToIFrame(); $this->waitForAjaxToFinish(); // In iframe I get page not found, so this fails. @@ -150,7 +150,7 @@ class PluginsTest extends EntityBrowserJavascriptTestBase { $this->getSession()->getPage()->attachFileToField('files[upload][]', $this->container->get('file_system')->realpath($image1->getFileUri())); $this->waitForAjaxToFinish(); - $this->getSession()->getPage()->pressButton('Select files'); + $this->assertSession()->buttonExists('Select files')->press(); $this->assertSession()->pageTextContains('first_file.jpg'); $this->assertSession()->pageTextNotContains('second_file.jpg'); @@ -158,15 +158,15 @@ class PluginsTest extends EntityBrowserJavascriptTestBase { $this->getSession()->getPage()->clickLink('view'); // This shows page not found, which is caused by https://www.drupal.org/node/2771547 // Uncomment this hunk when a fix for that problem lands. - //$this->getSession()->getPage()->checkField('entity_browser_select[file:' . $image2->id() . ']'); - //$this->getSession()->getPage()->pressButton('Select entities'); - //$this->assertSession()->responseContains('edit-selected-items-2-1-remove-button'); - //$this->assertSession()->responseContains('edit-selected-items-1-0-remove-button'); - //$this->getSession()->getPage()->pressButton('Use selected'); - //$this->getSession()->switchToIFrame(); - //$this->waitForAjaxToFinish(); - //$this->assertSession()->pageTextContains('first_file.jpg'); - //$this->assertSession()->pageTextContains('second_file.jpg'); + // $this->assertSession()->fieldExists('entity_browser_select[file:' . $image2->id() . ']'); + // $this->assertSession()->buttonExists('Select entities')->press(); + // $this->assertSession()->responseContains('edit-selected-items-2-1-remove-button'); + // $this->assertSession()->responseContains('edit-selected-items-1-0-remove-button'); + // $this->assertSession()->buttonExists('Use selected')->press(); + // $this->getSession()->switchToIFrame(); + // $this->waitForAjaxToFinish(); + // $this->assertSession()->pageTextContains('first_file.jpg'); + // $this->assertSession()->pageTextContains('second_file.jpg'); } /** @@ -183,13 +183,12 @@ class PluginsTest extends EntityBrowserJavascriptTestBase { $image = $this->createFile('lama'); $this->drupalGet('node/add/article'); - $this->assertSession()->buttonExists('Select entities'); - $this->getSession()->getPage()->pressButton('Select entities'); - $this->getSession()->switchToIFrame('entity_browser_iframe_test_entity_browser_file'); - - $this->getSession()->getPage()->checkField('entity_browser_select[file:' . $image->id() . ']'); - $this->getSession()->getPage()->pressButton('Select entities'); - $this->getSession()->switchToIFrame(); + $this->assertSession()->buttonExists('Select entities')->press(); + //$this->getSession()->switchToIFrame('entity_browser_iframe_test_entity_browser_file'); + $this->waitForAjaxToFinish(); + $this->assertSession()->fieldExists('entity_browser_select[file:' . $image->id() . ']'); + $this->assertSession()->buttonExists('Select entities')->press(); + //$this->getSession()->switchToIFrame(); $this->waitForAjaxToFinish(); $this->assertSession()->pageTextContains('lama.jpg'); @@ -209,10 +208,10 @@ class PluginsTest extends EntityBrowserJavascriptTestBase { $this->drupalGet('test'); $this->assertSession()->buttonExists('Select entities'); - $this->getSession()->getPage()->pressButton('Select entities'); + $this->assertSession()->buttonExists('Select entities')->press(); - $this->getSession()->getPage()->checkField('entity_browser_select[file:' . $image->id() . ']'); - $this->getSession()->getPage()->pressButton('Select entities'); + $this->assertSession()->fieldExists('entity_browser_select[file:' . $image->id() . ']'); + $this->assertSession()->buttonExists('Select entities')->press(); // TODO test if entities were selected. Will most likely need a custom event // subscriber that displays a message or something along those lines. diff --git a/tests/src/FunctionalJavascript/UploadWidgetTest.php b/tests/src/FunctionalJavascript/UploadWidgetTest.php index b7bf839..d48b9b7 100644 --- a/tests/src/FunctionalJavascript/UploadWidgetTest.php +++ b/tests/src/FunctionalJavascript/UploadWidgetTest.php @@ -9,7 +9,7 @@ use Drupal\user\Entity\Role; * * @group entity_browser */ -class UploadWidgetTest extends EntityBrowserJavascriptTestBase { +class UploadWidgetTest extends EntityBrowserWebDriverTestBase { /** * {@inheritdoc} @@ -44,8 +44,8 @@ class UploadWidgetTest extends EntityBrowserJavascriptTestBase { $page->attachFileToField('edit-upload-upload', \Drupal::root() . '/core/misc/druplicon.png'); $this->waitForAjaxToFinish(); $this->assertSession()->fieldExists('druplicon.png'); - $page->pressButton('Select files'); - $this->assertSession()->statusCodeEquals(200); + $this->assertSession()->buttonExists('Select files')->press(); + //$this->assertSession()->statusCodeEquals(200); // Check if the file was correctly uploaded to the EB destination. $this->assertFileExists('public://druplicon.png'); @@ -62,8 +62,8 @@ class UploadWidgetTest extends EntityBrowserJavascriptTestBase { $page->attachFileToField('edit-upload-upload', \Drupal::root() . '/core/misc/druplicon.png'); $this->waitForAjaxToFinish(); $this->assertSession()->fieldExists('druplicon.png'); - $page->pressButton('Fancy submit'); - $this->assertSession()->statusCodeEquals(200); + $this->assertSession()->buttonExists('Fancy submit')->press(); + //$this->assertSession()->statusCodeEquals(200); // Check if the file was correctly uploaded to the EB destination. $this->assertFileExists('public://some_location/druplicon.png'); diff --git a/tests/src/Kernel/Extension/EntityBrowserTest.php b/tests/src/Kernel/Extension/EntityBrowserTest.php index 018f17d..3a63410 100644 --- a/tests/src/Kernel/Extension/EntityBrowserTest.php +++ b/tests/src/Kernel/Extension/EntityBrowserTest.php @@ -13,7 +13,6 @@ use Drupal\entity_browser\WidgetInterface; use Drupal\entity_browser\WidgetSelectorInterface; use Drupal\entity_browser\SelectionDisplayInterface; use Drupal\KernelTests\KernelTestBase; -use Drupal\user\Entity\User; use Drupal\views\Entity\View; /** @@ -128,7 +127,7 @@ class EntityBrowserTest extends KernelTestBase { $this->fail('An entity browser without required ' . $plugin_type . ' created with no exception thrown.'); } catch (PluginException $e) { - $this->assertEquals('The "" plugin does not exist.', $e->getMessage(), 'An exception was thrown when an entity_browser was created without a ' . $plugin_type . ' plugin.'); + $this->assertContains('The "" plugin does not exist.', $e->getMessage(), 'An exception was thrown when an entity_browser was created without a ' . $plugin_type . ' plugin.'); } }