&baz=false', 'rel' => 'alternate'], TRUE];
+ $render['#attached']['html_head_link'][] = [['href' => '/not-added-to-http-headers', 'rel' => 'alternate'], FALSE];
+ $render['#attached']['html_head_link'][] = [['href' => '/foo/bar', 'hreflang' => 'nl', 'rel' => 'alternate'], TRUE];
+ return $render;
+ }
+
}
diff --git a/core/modules/system/tests/src/Kernel/Migrate/d7/MigrateGlobalThemeSettingsTest.php b/core/modules/system/tests/src/Kernel/Migrate/d7/MigrateGlobalThemeSettingsTest.php
new file mode 100644
index 000000000..56ee5b631
--- /dev/null
+++ b/core/modules/system/tests/src/Kernel/Migrate/d7/MigrateGlobalThemeSettingsTest.php
@@ -0,0 +1,49 @@
+executeMigration('d7_global_theme_settings');
+ }
+
+ /**
+ * Tests migration of global theme settings to configuration.
+ */
+ public function testMigrateThemeSettings() {
+ $config = $this->config('system.theme.global');
+
+ $this->assertSame('image/png', $config->get('favicon.mimetype'));
+ $this->assertSame('public://somefavicon.png', $config->get('favicon.path'));
+ $this->assertFalse($config->get('favicon.use_default'));
+
+ $this->assertFalse($config->get('features.comment_user_picture'));
+ $this->assertFalse($config->get('features.comment_user_verification'));
+ $this->assertFalse($config->get('features.favicon'));
+ $this->assertFalse($config->get('features.node_user_picture'));
+ $this->assertFalse($config->get('features.logo'));
+ $this->assertTrue($config->get('features.name'));
+ $this->assertFalse($config->get('features.slogan'));
+
+ $this->assertSame('public://customlogo.png', $config->get('logo.path'));
+ $this->assertTrue($config->get('logo.use_default'));
+ }
+
+}
diff --git a/core/modules/system/tests/src/Unit/Transliteration/MachineNameControllerTest.php b/core/modules/system/tests/src/Unit/Transliteration/MachineNameControllerTest.php
index dbd1f1a3b..90696fda4 100644
--- a/core/modules/system/tests/src/Unit/Transliteration/MachineNameControllerTest.php
+++ b/core/modules/system/tests/src/Unit/Transliteration/MachineNameControllerTest.php
@@ -7,8 +7,8 @@ use Drupal\Tests\UnitTestCase;
use Drupal\Component\Transliteration\PhpTransliteration;
use Drupal\system\MachineNameController;
use Prophecy\Argument;
-use Symfony\Component\HttpFoundation\File\Exception\AccessDeniedException;
use Symfony\Component\HttpFoundation\Request;
+use Symfony\Component\HttpKernel\Exception\AccessDeniedHttpException;
/**
* Tests that the machine name controller can transliterate strings as expected.
@@ -103,7 +103,7 @@ class MachineNameControllerTest extends UnitTestCase {
public function testMachineNameControllerWithInvalidReplacePattern() {
$request = Request::create('', 'GET', ['text' => 'Bob', 'langcode' => 'en', 'replace' => 'Alice', 'replace_pattern' => 'Bob', 'replace_token' => 'invalid']);
- $this->setExpectedException(AccessDeniedException::class, "Invalid 'replace_token' query parameter.");
+ $this->setExpectedException(AccessDeniedHttpException::class, "Invalid 'replace_token' query parameter.");
$this->machineNameController->transliterate($request);
}
@@ -113,7 +113,7 @@ class MachineNameControllerTest extends UnitTestCase {
public function testMachineNameControllerWithMissingToken() {
$request = Request::create('', 'GET', ['text' => 'Bob', 'langcode' => 'en', 'replace' => 'Alice', 'replace_pattern' => 'Bob']);
- $this->setExpectedException(AccessDeniedException::class, "Missing 'replace_token' query parameter.");
+ $this->setExpectedException(AccessDeniedHttpException::class, "Missing 'replace_token' query parameter.");
$this->machineNameController->transliterate($request);
}
diff --git a/core/modules/taxonomy/migration_templates/d6_taxonomy_term.yml b/core/modules/taxonomy/migration_templates/d6_taxonomy_term.yml
index 44f9f7fb6..909fb4c11 100644
--- a/core/modules/taxonomy/migration_templates/d6_taxonomy_term.yml
+++ b/core/modules/taxonomy/migration_templates/d6_taxonomy_term.yml
@@ -5,6 +5,8 @@ migration_tags:
source:
plugin: taxonomy_term
process:
+ # If you are using this file to build a custom migration consider removing
+ # the tid field to allow incremental migrations.
tid: tid
vid:
plugin: migration
diff --git a/core/modules/taxonomy/migration_templates/d6_taxonomy_vocabulary.yml b/core/modules/taxonomy/migration_templates/d6_taxonomy_vocabulary.yml
index 654a07640..f7f588406 100644
--- a/core/modules/taxonomy/migration_templates/d6_taxonomy_vocabulary.yml
+++ b/core/modules/taxonomy/migration_templates/d6_taxonomy_vocabulary.yml
@@ -14,6 +14,7 @@ process:
entity_type: taxonomy_vocabulary
field: vid
length: 32
+ migrated: true
label: name
name: name
description: description
diff --git a/core/modules/taxonomy/migration_templates/d6_vocabulary_field.yml b/core/modules/taxonomy/migration_templates/d6_vocabulary_field.yml
index a1c97356f..0e1a48728 100644
--- a/core/modules/taxonomy/migration_templates/d6_vocabulary_field.yml
+++ b/core/modules/taxonomy/migration_templates/d6_vocabulary_field.yml
@@ -22,7 +22,10 @@ process:
'settings/target_type': 'constants/target_entity_type'
cardinality: cardinality
destination:
- plugin: md_entity:field_storage_config
+ plugin: entity:field_storage_config
+ dependencies:
+ module:
+ - entity_reference
migration_dependencies:
required:
- d6_taxonomy_vocabulary
diff --git a/core/modules/taxonomy/migration_templates/d7_taxonomy_term.yml b/core/modules/taxonomy/migration_templates/d7_taxonomy_term.yml
index 8d4adbbed..a47ab46b9 100644
--- a/core/modules/taxonomy/migration_templates/d7_taxonomy_term.yml
+++ b/core/modules/taxonomy/migration_templates/d7_taxonomy_term.yml
@@ -5,6 +5,8 @@ migration_tags:
source:
plugin: taxonomy_term
process:
+ # If you are using this file to build a custom migration consider removing
+ # the tid field to allow incremental migrations.
tid: tid
vid:
plugin: migration
diff --git a/core/modules/text/src/Plugin/Field/FieldFormatter/TextTrimmedFormatter.php b/core/modules/text/src/Plugin/Field/FieldFormatter/TextTrimmedFormatter.php
index 1842a4382..8d69571a5 100644
--- a/core/modules/text/src/Plugin/Field/FieldFormatter/TextTrimmedFormatter.php
+++ b/core/modules/text/src/Plugin/Field/FieldFormatter/TextTrimmedFormatter.php
@@ -74,7 +74,7 @@ class TextTrimmedFormatter extends FormatterBase {
// because text_pre_render_summary() must run last.
$element += \Drupal::service('element_info')->getInfo($element['#type']);
// Add the #pre_render callback that renders the text into a summary.
- $element['#pre_render'][] = '\Drupal\text\Plugin\field\FieldFormatter\TextTrimmedFormatter::preRenderSummary';
+ $element['#pre_render'][] = [TextTrimmedFormatter::class, 'preRenderSummary'];
// Pass on the trim length to the #pre_render callback via a property.
$element['#text_summary_trim_length'] = $this->getSetting('trim_length');
};
diff --git a/core/modules/user/migration_templates/d6_user.yml b/core/modules/user/migration_templates/d6_user.yml
index fa6326e93..c82c65750 100644
--- a/core/modules/user/migration_templates/d6_user.yml
+++ b/core/modules/user/migration_templates/d6_user.yml
@@ -5,6 +5,8 @@ migration_tags:
source:
plugin: d6_user
process:
+ # If you are using this file to build a custom migration consider removing
+ # the uid field to allow incremental migrations.
uid: uid
name: name
pass: pass
diff --git a/core/modules/user/migration_templates/d6_user_picture_file.yml b/core/modules/user/migration_templates/d6_user_picture_file.yml
index 3518d7a6e..d367f33b9 100644
--- a/core/modules/user/migration_templates/d6_user_picture_file.yml
+++ b/core/modules/user/migration_templates/d6_user_picture_file.yml
@@ -11,6 +11,9 @@ source:
# table are specified, and must end with a /.
source_base_path: ''
process:
+ # If you are using both this migration and d6_file in a custom migration
+ # and executing migrations incrementally, it is recommended that you
+ # remove the fid mapping from d6_file to avoid potential ID conflicts.
filename: filename
uid: uid
source_full_path:
diff --git a/core/modules/user/migration_templates/d7_user.yml b/core/modules/user/migration_templates/d7_user.yml
index b72e8c728..3910659fa 100644
--- a/core/modules/user/migration_templates/d7_user.yml
+++ b/core/modules/user/migration_templates/d7_user.yml
@@ -6,6 +6,8 @@ class: Drupal\user\Plugin\migrate\User
source:
plugin: d7_user
process:
+ # If you are using this file to build a custom migration consider removing
+ # the uid field to allow incremental migrations.
uid: uid
name: name
pass: pass
diff --git a/core/modules/user/migration_templates/user_picture_field.yml b/core/modules/user/migration_templates/user_picture_field.yml
index a484ab8d1..ff8bd8274 100644
--- a/core/modules/user/migration_templates/user_picture_field.yml
+++ b/core/modules/user/migration_templates/user_picture_field.yml
@@ -18,4 +18,7 @@ process:
type: 'constants/type'
cardinality: 'constants/cardinality'
destination:
- plugin: md_entity:field_storage_config
+ plugin: entity:field_storage_config
+ dependencies:
+ module:
+ - image
diff --git a/core/modules/user/migration_templates/user_profile_field.yml b/core/modules/user/migration_templates/user_profile_field.yml
index bf8189822..3ba0eee48 100644
--- a/core/modules/user/migration_templates/user_profile_field.yml
+++ b/core/modules/user/migration_templates/user_profile_field.yml
@@ -32,4 +32,4 @@ process:
map:
list: -1
destination:
- plugin: md_entity:field_storage_config
+ plugin: entity:field_storage_config
diff --git a/core/modules/user/tests/src/Functional/UserLoginHttpTest.php b/core/modules/user/tests/src/Functional/UserLoginHttpTest.php
index 356544119..29b97277c 100644
--- a/core/modules/user/tests/src/Functional/UserLoginHttpTest.php
+++ b/core/modules/user/tests/src/Functional/UserLoginHttpTest.php
@@ -10,6 +10,7 @@ use GuzzleHttp\Cookie\CookieJar;
use Psr\Http\Message\ResponseInterface;
use Symfony\Component\Serializer\Encoder\JsonEncoder;
use Symfony\Component\Serializer\Encoder\XmlEncoder;
+use Drupal\hal\Encoder\JsonEncoder as HALJsonEncoder;
use Symfony\Component\Serializer\Serializer;
/**
@@ -19,6 +20,13 @@ use Symfony\Component\Serializer\Serializer;
*/
class UserLoginHttpTest extends BrowserTestBase {
+ /**
+ * Modules to install.
+ *
+ * @var array
+ */
+ public static $modules = ['hal'];
+
/**
* The cookie jar.
*
@@ -39,7 +47,7 @@ class UserLoginHttpTest extends BrowserTestBase {
protected function setUp() {
parent::setUp();
$this->cookies = new CookieJar();
- $encoders = [new JsonEncoder(), new XmlEncoder()];
+ $encoders = [new JsonEncoder(), new XmlEncoder(), new HALJsonEncoder()];
$this->serializer = new Serializer([], $encoders);
}
@@ -90,7 +98,7 @@ class UserLoginHttpTest extends BrowserTestBase {
/** @var \Drupal\Core\Extension\ModuleInstaller $module_installer */
$module_installer = $this->container->get('module_installer');
$module_installer->install(['serialization']);
- $formats = ['json', 'xml'];
+ $formats = ['json', 'xml', 'hal_json'];
}
else {
// Without the serialization module only JSON is supported.
diff --git a/core/modules/views/src/Plugin/Block/ViewsBlock.php b/core/modules/views/src/Plugin/Block/ViewsBlock.php
index 43ff658f9..ad8d7c914 100644
--- a/core/modules/views/src/Plugin/Block/ViewsBlock.php
+++ b/core/modules/views/src/Plugin/Block/ViewsBlock.php
@@ -27,11 +27,6 @@ class ViewsBlock extends ViewsBlockBase {
// entry for the view output by passing FALSE, because we're going to cache
// the whole block instead.
if ($output = $this->view->buildRenderable($this->displayID, [], FALSE)) {
- // Override the label to the dynamic title configured in the view.
- if (empty($this->configuration['views_label']) && $this->view->getTitle()) {
- $output['#title'] = ['#markup' => $this->view->getTitle(), '#allowed_tags' => Xss::getHtmlTagList()];
- }
-
// Before returning the block output, convert it to a renderable array
// with contextual links.
$this->addContextualLinks($output);
@@ -41,6 +36,11 @@ class ViewsBlock extends ViewsBlockBase {
// #pre_render callback has already been applied.
$output = View::preRenderViewElement($output);
+ // Override the label to the dynamic title configured in the view.
+ if (empty($this->configuration['views_label']) && $this->view->getTitle()) {
+ $output['#title'] = ['#markup' => $this->view->getTitle(), '#allowed_tags' => Xss::getHtmlTagList()];
+ }
+
// When view_build is empty, the actual render array output for this View
// is going to be empty. In that case, return just #cache, so that the
// render system knows the reasons (cache contexts & tags) why this Views
diff --git a/core/modules/views/src/Plugin/views/area/TokenizeAreaPluginBase.php b/core/modules/views/src/Plugin/views/area/TokenizeAreaPluginBase.php
index 927c1727b..e8833787c 100644
--- a/core/modules/views/src/Plugin/views/area/TokenizeAreaPluginBase.php
+++ b/core/modules/views/src/Plugin/views/area/TokenizeAreaPluginBase.php
@@ -79,7 +79,7 @@ abstract class TokenizeAreaPluginBase extends AreaPluginBase {
foreach ($options[$type] as $key => $value) {
$items[] = $key . ' == ' . $value;
}
- $form['tokens']['tokens'] = array(
+ $form['tokens'][$type]['tokens'] = array(
'#theme' => 'item_list',
'#items' => $items,
);
diff --git a/core/modules/views/src/Plugin/views/display/EntityReference.php b/core/modules/views/src/Plugin/views/display/EntityReference.php
index 22c8c8cf8..bf2d46034 100644
--- a/core/modules/views/src/Plugin/views/display/EntityReference.php
+++ b/core/modules/views/src/Plugin/views/display/EntityReference.php
@@ -122,9 +122,12 @@ class EntityReference extends DisplayPluginBase {
// Restrict the autocomplete options based on what's been typed already.
if (isset($options['match'])) {
$style_options = $this->getOption('style');
- $value = db_like($options['match']) . '%';
- if ($options['match_operator'] != 'STARTS_WITH') {
- $value = '%' . $value;
+ $value = db_like($options['match']);
+ if ($options['match_operator'] !== '=') {
+ $value = $value . '%';
+ if ($options['match_operator'] != 'STARTS_WITH') {
+ $value = '%' . $value;
+ }
}
// Multiple search fields are OR'd together.
diff --git a/core/modules/views/src/Plugin/views/field/EntityOperations.php b/core/modules/views/src/Plugin/views/field/EntityOperations.php
index 974d3fbd8..f2a3ba997 100644
--- a/core/modules/views/src/Plugin/views/field/EntityOperations.php
+++ b/core/modules/views/src/Plugin/views/field/EntityOperations.php
@@ -165,4 +165,11 @@ class EntityOperations extends FieldPluginBase {
return $this->view;
}
+ /**
+ * {@inheritdoc}
+ */
+ public function clickSortable() {
+ return FALSE;
+ }
+
}
diff --git a/core/modules/views/src/Plugin/views/field/FieldPluginBase.php b/core/modules/views/src/Plugin/views/field/FieldPluginBase.php
index 103dd9dee..bdb44fafd 100644
--- a/core/modules/views/src/Plugin/views/field/FieldPluginBase.php
+++ b/core/modules/views/src/Plugin/views/field/FieldPluginBase.php
@@ -101,6 +101,13 @@ abstract class FieldPluginBase extends HandlerBase implements FieldHandlerInterf
*/
protected $renderer;
+ /**
+ * Keeps track of the last render index.
+ *
+ * @var int|NULL
+ */
+ protected $lastRenderIndex;
+
/**
* {@inheritdoc}
*/
@@ -1122,6 +1129,10 @@ abstract class FieldPluginBase extends HandlerBase implements FieldHandlerInterf
* {@inheritdoc}
*/
public function advancedRender(ResultRow $values) {
+ // Clean up values from previous render calls.
+ if ($this->lastRenderIndex != $values->index) {
+ $this->last_render_text = '';
+ }
if ($this->allowAdvancedRender() && $this instanceof MultiItemsFieldHandlerInterface) {
$raw_items = $this->getItems($values);
// If there are no items, set the original value to NULL.
@@ -1181,7 +1192,10 @@ abstract class FieldPluginBase extends HandlerBase implements FieldHandlerInterf
$this->last_render = $this->renderText($alter);
}
}
-
+ // If we rendered something, update the last render index.
+ if ((string) $this->last_render !== '') {
+ $this->lastRenderIndex = $values->index;
+ }
return $this->last_render;
}
@@ -1222,6 +1236,12 @@ abstract class FieldPluginBase extends HandlerBase implements FieldHandlerInterf
if (!empty($alter['alter_text']) && $alter['text'] !== '') {
$tokens = $this->getRenderTokens($alter);
$value = $this->renderAltered($alter, $tokens);
+ // $alter['text'] is entered through the views admin UI and will be safe
+ // because the output of $this->renderAltered() is run through
+ // Xss::filterAdmin().
+ // @see \Drupal\views\Plugin\views\PluginBase::viewsTokenReplace()
+ // @see \Drupal\Component\Utility\Xss::filterAdmin()
+ $value_is_safe = TRUE;
}
if (!empty($this->options['alter']['trim_whitespace'])) {
diff --git a/core/modules/views/src/Plugin/views/wizard/WizardPluginBase.php b/core/modules/views/src/Plugin/views/wizard/WizardPluginBase.php
index 068ed89b2..3f64626f6 100644
--- a/core/modules/views/src/Plugin/views/wizard/WizardPluginBase.php
+++ b/core/modules/views/src/Plugin/views/wizard/WizardPluginBase.php
@@ -1091,7 +1091,8 @@ abstract class WizardPluginBase extends PluginBase implements WizardInterface {
$block = $form_state->getValue('block');
$display_options['title'] = $block['title'];
$display_options['style'] = array('type' => $block['style']['style_plugin']);
- $display_options['row'] = array('type' => isset($block['style']['row_plugin']) ? $block['style']['row_plugin'] : 'fields');
+ $options = $this->rowStyleOptions();
+ $display_options['row'] = array('type' => (isset($block['style']['row_plugin']) && isset($options[$block['style']['row_plugin']])) ? $block['style']['row_plugin'] : 'fields');
$display_options['pager']['type'] = $block['pager'] ? 'full' : (empty($block['items_per_page']) ? 'none' : 'some');
$display_options['pager']['options']['items_per_page'] = $block['items_per_page'];
return $display_options;
diff --git a/core/modules/views/src/Tests/Handler/FieldEntityOperationsTest.php b/core/modules/views/src/Tests/Handler/FieldEntityOperationsTest.php
index d5adcb409..e76d54e34 100644
--- a/core/modules/views/src/Tests/Handler/FieldEntityOperationsTest.php
+++ b/core/modules/views/src/Tests/Handler/FieldEntityOperationsTest.php
@@ -25,7 +25,7 @@ class FieldEntityOperationsTest extends HandlerTestBase {
*
* @var array
*/
- public static $modules = array('node', 'language');
+ public static $modules = array('node', 'language', 'views_ui');
function setUp() {
parent::setUp();
@@ -83,6 +83,11 @@ class FieldEntityOperationsTest extends HandlerTestBase {
}
}
}
+
+ // Test that we can't enable click sorting on the operation field.
+ $this->drupalGet('admin/structure/views/nojs/display/test_entity_operations/page_2/style_options');
+ $this->assertField('style_options[info][title][sortable]');
+ $this->assertNoField('style_options[info][operations][sortable]');
}
}
diff --git a/core/modules/views/src/Tests/Plugin/DisplayEntityReferenceTest.php b/core/modules/views/src/Tests/Plugin/DisplayEntityReferenceTest.php
index 67d4d4516..96d036926 100644
--- a/core/modules/views/src/Tests/Plugin/DisplayEntityReferenceTest.php
+++ b/core/modules/views/src/Tests/Plugin/DisplayEntityReferenceTest.php
@@ -103,6 +103,21 @@ class DisplayEntityReferenceTest extends PluginTestBase {
$this->fieldName => 'text' . $i,
])->save();
}
+ EntityTest::create([
+ 'bundle' => 'entity_test',
+ 'name' => 'name',
+ $this->fieldName => 'tex',
+ ])->save();
+ EntityTest::create([
+ 'bundle' => 'entity_test',
+ 'name' => 'name',
+ $this->fieldName => 'TEX',
+ ])->save();
+ EntityTest::create([
+ 'bundle' => 'entity_test',
+ 'name' => 'name',
+ $this->fieldName => 'sometext',
+ ])->save();
}
/**
@@ -140,6 +155,48 @@ class DisplayEntityReferenceTest extends PluginTestBase {
$this->assertEqual(count($view->result), 2, 'Search returned two rows');
$view->destroy();
+ // Test the 'CONTAINS' match_operator.
+ $view = Views::getView('test_display_entity_reference');
+ $view->setDisplay('entity_reference_1');
+ $options = [
+ 'match' => 'tex',
+ 'match_operator' => 'CONTAINS',
+ 'limit' => 0,
+ 'ids' => NULL,
+ ];
+ $view->display_handler->setOption('entity_reference_options', $options);
+ $this->executeView($view);
+ $this->assertEqual(count($view->result), 13, 'Search returned thirteen rows');
+ $view->destroy();
+
+ // Test the 'STARTS_WITH' match_operator.
+ $view = Views::getView('test_display_entity_reference');
+ $view->setDisplay('entity_reference_1');
+ $options = [
+ 'match' => 'tex',
+ 'match_operator' => 'STARTS_WITH',
+ 'limit' => 0,
+ 'ids' => NULL,
+ ];
+ $view->display_handler->setOption('entity_reference_options', $options);
+ $this->executeView($view);
+ $this->assertEqual(count($view->result), 12, 'Search returned twelve rows');
+ $view->destroy();
+
+ // Test the '=' match_operator.
+ $view = Views::getView('test_display_entity_reference');
+ $view->setDisplay('entity_reference_1');
+ $options = [
+ 'match' => 'tex',
+ 'match_operator' => '=',
+ 'limit' => 0,
+ 'ids' => NULL,
+ ];
+ $view->display_handler->setOption('entity_reference_options', $options);
+ $this->executeView($view);
+ $this->assertEqual(count($view->result), 2, 'Search returned two rows');
+ $view->destroy();
+
// Add a relationship and a field using that relationship.
$this->drupalPostForm('admin/structure/views/nojs/add-handler/test_display_entity_reference/default/relationship', ['name[entity_test.user_id]' => TRUE], t('Add and configure relationships'));
$this->drupalPostForm(NULL, [], t('Apply'));
diff --git a/core/modules/views/src/Tests/Wizard/BasicTest.php b/core/modules/views/src/Tests/Wizard/BasicTest.php
index 1e2d05185..00237d79a 100644
--- a/core/modules/views/src/Tests/Wizard/BasicTest.php
+++ b/core/modules/views/src/Tests/Wizard/BasicTest.php
@@ -170,26 +170,6 @@ class BasicTest extends WizardTestBase {
$this->assertEqual($node['nid'][0]['value'], $node1->id(), 'The node of type page is exported.');
}
- /**
- * Tests the actual wizard form.
- *
- * @see \Drupal\views_ui\ViewAddForm::form()
- */
- public function testWizardForm() {
- $this->drupalGet('admin/structure/views/add');
-
- $result = $this->xpath('//small[@id = "edit-label-machine-name-suffix"]');
- $this->assertTrue(count($result), 'Ensure that the machine name is applied to the name field.');
-
- $this->drupalPostAjaxForm(NULL, array('show[wizard_key]' => 'users'), 'show[wizard_key]');
- $this->assertNoFieldByName('show[type]', NULL, 'The "of type" filter is not added for users.');
- $this->drupalPostAjaxForm(NULL, array('show[wizard_key]' => 'node'), 'show[wizard_key]');
- $this->assertNoFieldByName('show[type]', 'all', 'The "of type" filter is not added for nodes when there are no node types.');
- $this->drupalCreateContentType(array('type' => 'page'));
- $this->drupalPostAjaxForm(NULL, array('show[wizard_key]' => 'node'), 'show[wizard_key]');
- $this->assertFieldByName('show[type]', 'all', 'The "of type" filter is added for nodes when there is at least one node type.');
- }
-
/**
* Tests default plugin values are populated from the wizard form.
*
diff --git a/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_dropbutton.yml b/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_dropbutton.yml
index 8605dce89..2c0bb91c3 100644
--- a/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_dropbutton.yml
+++ b/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_dropbutton.yml
@@ -21,6 +21,8 @@ display:
display_options:
access:
type: perm
+ options:
+ perm: 'access content overview'
cache:
type: tag
query:
@@ -159,6 +161,108 @@ display:
hide_empty: false
empty_zero: false
hide_alter_empty: false
+ edit_node:
+ id: edit_node
+ table: node
+ field: edit_node
+ relationship: none
+ group_type: group
+ admin_label: ''
+ label: ''
+ exclude: true
+ alter:
+ alter_text: false
+ text: ''
+ make_link: false
+ path: ''
+ absolute: false
+ external: false
+ replace_spaces: false
+ path_case: none
+ trim_whitespace: false
+ alt: ''
+ rel: ''
+ link_class: ''
+ prefix: ''
+ suffix: ''
+ target: ''
+ nl2br: false
+ max_length: 0
+ word_boundary: true
+ ellipsis: true
+ more_link: false
+ more_link_text: ''
+ more_link_path: ''
+ strip_tags: false
+ trim: false
+ preserve_tags: ''
+ html: false
+ element_type: ''
+ element_class: ''
+ element_label_type: ''
+ element_label_class: ''
+ element_label_colon: false
+ element_wrapper_type: ''
+ element_wrapper_class: ''
+ element_default_classes: true
+ empty: ''
+ hide_empty: false
+ empty_zero: false
+ hide_alter_empty: true
+ text: edit
+ entity_type: node
+ plugin_id: entity_link_edit
+ delete_node:
+ id: delete_node
+ table: node
+ field: delete_node
+ relationship: none
+ group_type: group
+ admin_label: ''
+ label: ''
+ exclude: true
+ alter:
+ alter_text: false
+ text: ''
+ make_link: false
+ path: ''
+ absolute: false
+ external: false
+ replace_spaces: false
+ path_case: none
+ trim_whitespace: false
+ alt: ''
+ rel: ''
+ link_class: ''
+ prefix: ''
+ suffix: ''
+ target: ''
+ nl2br: false
+ max_length: 0
+ word_boundary: true
+ ellipsis: true
+ more_link: false
+ more_link_text: ''
+ more_link_path: ''
+ strip_tags: false
+ trim: false
+ preserve_tags: ''
+ html: false
+ element_type: ''
+ element_class: ''
+ element_label_type: ''
+ element_label_class: ''
+ element_label_colon: false
+ element_wrapper_type: ''
+ element_wrapper_class: ''
+ element_default_classes: true
+ empty: ''
+ hide_empty: false
+ empty_zero: false
+ hide_alter_empty: true
+ text: delete
+ entity_type: node
+ plugin_id: entity_link_delete
dropbutton:
id: dropbutton
table: views
@@ -211,6 +315,8 @@ display:
fields:
title: title
nothing: nothing
+ edit_node: edit_node
+ delete_node: delete_node
nid: '0'
destination: true
filters:
diff --git a/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_entity_operations.yml b/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_entity_operations.yml
index 8276613a3..bb84119f0 100644
--- a/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_entity_operations.yml
+++ b/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_entity_operations.yml
@@ -123,3 +123,46 @@ display:
position: null
display_options:
path: test-entity-operations
+ page_2:
+ display_plugin: page
+ id: page_2
+ display_title: 'Page 2'
+ position: null
+ display_options:
+ path: test-entity-operations-table
+ style:
+ type: table
+ options:
+ grouping: { }
+ row_class: ''
+ default_row_class: true
+ override: true
+ sticky: false
+ caption: ''
+ summary: ''
+ description: ''
+ columns:
+ title: title
+ operations: operations
+ info:
+ title:
+ sortable: false
+ default_sort_order: asc
+ align: ''
+ separator: ''
+ empty_column: false
+ responsive: ''
+ operations:
+ align: ''
+ separator: ''
+ empty_column: false
+ responsive: ''
+ default: '-1'
+ empty_table: false
+ row:
+ type: fields
+ options: { }
+ display_extenders: { }
+ defaults:
+ style: false
+ row: false
diff --git a/core/modules/views/tests/src/Kernel/Handler/FieldDropbuttonTest.php b/core/modules/views/tests/src/Kernel/Handler/FieldDropbuttonTest.php
new file mode 100644
index 000000000..b789bd62a
--- /dev/null
+++ b/core/modules/views/tests/src/Kernel/Handler/FieldDropbuttonTest.php
@@ -0,0 +1,167 @@
+installEntitySchema('node');
+ $this->installEntitySchema('user');
+ $this->installSchema('node', 'node_access');
+ $this->installConfig('node');
+ $this->installConfig('filter');
+
+ ViewTestData::createTestViews(get_class($this), ['views_test_config']);
+ // Create two node types.
+ $this->createContentType(['type' => 'foo']);
+ $this->createContentType(['type' => 'bar']);
+
+ // Create user 1.
+ $admin = $this->createUser();
+
+ // And three nodes.
+ $this->node1 = $this->createNode([
+ 'type' => 'bar',
+ 'title' => 'bazs',
+ 'status' => 1,
+ 'uid' => $admin->id(),
+ 'created' => REQUEST_TIME - 10,
+ ]);
+ $this->node2 = $this->createNode([
+ 'type' => 'foo',
+ 'title' => 'foos',
+ 'status' => 1,
+ 'uid' => $admin->id(),
+ 'created' => REQUEST_TIME - 5,
+ ]);
+ $this->node3 = $this->createNode([
+ 'type' => 'bar',
+ 'title' => 'bars',
+ 'status' => 1,
+ 'uid' => $admin->id(),
+ 'created' => REQUEST_TIME,
+ ]);
+
+ // Now create a user with the ability to edit bar but not foo.
+ $this->testUser = $this->createUser([
+ 'access content overview',
+ 'access content',
+ 'edit any bar content',
+ 'delete any bar content',
+ ]);
+ // And switch to that user.
+ $this->container->get('account_switcher')->switchTo($this->testUser);
+ }
+
+ /**
+ * Tests that dropbutton markup doesn't leak between rows.
+ */
+ public function testDropbuttonMarkupShouldNotLeakBetweenRows() {
+ $view = Views::getView('test_dropbutton');
+ $view->setDisplay();
+ $view->preExecute([]);
+ $view->execute();
+
+ $renderer = $this->container->get('renderer');
+ $dropbutton_output = [];
+
+ // Render each row and field in turn - the dropbutton plugin relies on
+ // output being set in previous versions.
+ foreach ($view->result as $index => $row) {
+ foreach (array_keys($view->field) as $field) {
+ $output = $renderer->executeInRenderContext(new RenderContext(), function () use ($view, $row, $field) {
+ return $view->field[$field]->advancedRender($row);
+ });
+ if ($field === 'dropbutton') {
+ $dropbutton_output[] = $output;
+ }
+ }
+ }
+
+ // The first row should contain edit links to node 3, as the user has
+ // access.
+ $this->assertContains($this->node3->toUrl('edit-form')->toString(), (string) $dropbutton_output[0]);
+ $this->assertContains($this->node3->toUrl('delete-form')->toString(), (string) $dropbutton_output[0]);
+
+ // Second row should be not contain links to edit/delete any content as user
+ // has no edit/delete permissions.
+ // It most certainly should not contain links to node 3, as node 2 is the
+ // entity that forms this row.
+ $this->assertNotContains($this->node3->toUrl('edit-form')->toString(), (string) $dropbutton_output[1]);
+ $this->assertNotContains($this->node3->toUrl('delete-form')->toString(), (string) $dropbutton_output[1]);
+ $this->assertNotContains($this->node2->toUrl('edit-form')->toString(), (string) $dropbutton_output[1]);
+ $this->assertNotContains($this->node2->toUrl('delete-form')->toString(), (string) $dropbutton_output[1]);
+
+ // Third row should contain links for node 1.
+ $this->assertContains($this->node1->toUrl('edit-form')->toString(), (string) $dropbutton_output[2]);
+ $this->assertContains($this->node1->toUrl('delete-form')->toString(), (string) $dropbutton_output[2]);
+ }
+
+}
diff --git a/core/modules/views/tests/src/Kernel/Handler/FieldKernelTest.php b/core/modules/views/tests/src/Kernel/Handler/FieldKernelTest.php
index a57e47869..be8a4f133 100644
--- a/core/modules/views/tests/src/Kernel/Handler/FieldKernelTest.php
+++ b/core/modules/views/tests/src/Kernel/Handler/FieldKernelTest.php
@@ -168,6 +168,67 @@ class FieldKernelTest extends ViewsKernelTestBase {
$this->assertSubString($output, $random_text);
}
+ /**
+ * Tests rewriting of the output with HTML.
+ */
+ public function testRewriteHtmlWithTokens() {
+ /** @var \Drupal\Core\Render\RendererInterface $renderer */
+ $renderer = \Drupal::service('renderer');
+
+ $view = Views::getView('test_view');
+ $view->initHandlers();
+ $this->executeView($view);
+ $row = $view->result[0];
+ $id_field = $view->field['id'];
+
+ $id_field->options['alter']['text'] = '{{ id }}
';
+ $id_field->options['alter']['alter_text'] = TRUE;
+ $output = $renderer->executeInRenderContext(new RenderContext(), function () use ($id_field, $row) {
+ return $id_field->theme($row);
+ });
+ $this->assertSubString($output, '1
');
+
+ // Add a non-safe HTML tag and make sure this gets removed.
+ $id_field->options['alter']['text'] = '{{ id }}
';
+ $id_field->options['alter']['alter_text'] = TRUE;
+ $output = $renderer->executeInRenderContext(new RenderContext(), function () use ($id_field, $row) {
+ return $id_field->theme($row);
+ });
+ $this->assertSubString($output, '1 alert("Script removed")
');
+ }
+
+ /**
+ * Tests rewriting of the output with HTML and aggregation.
+ */
+ public function testRewriteHtmlWithTokensAndAggregation() {
+ /** @var \Drupal\Core\Render\RendererInterface $renderer */
+ $renderer = \Drupal::service('renderer');
+
+ $view = Views::getView('test_view');
+ $view->setDisplay();
+ $view->displayHandlers->get('default')->options['fields']['id']['group_type'] = 'sum';
+ $view->displayHandlers->get('default')->setOption('group_by', TRUE);
+ $view->initHandlers();
+ $this->executeView($view);
+ $row = $view->result[0];
+ $id_field = $view->field['id'];
+
+ $id_field->options['alter']['text'] = '{{ id }}
';
+ $id_field->options['alter']['alter_text'] = TRUE;
+ $output = $renderer->executeInRenderContext(new RenderContext(), function () use ($id_field, $row) {
+ return $id_field->theme($row);
+ });
+ $this->assertSubString($output, '1
');
+
+ // Add a non-safe HTML tag and make sure this gets removed.
+ $id_field->options['alter']['text'] = '{{ id }}
';
+ $id_field->options['alter']['alter_text'] = TRUE;
+ $output = $renderer->executeInRenderContext(new RenderContext(), function () use ($id_field, $row) {
+ return $id_field->theme($row);
+ });
+ $this->assertSubString($output, '1 alert("Script removed")
');
+ }
+
/**
* Tests the arguments tokens on field level.
*/
diff --git a/core/modules/views/tests/src/Kernel/Plugin/ViewsBlockTest.php b/core/modules/views/tests/src/Kernel/Plugin/ViewsBlockTest.php
index f30db33a2..d06ae66ba 100644
--- a/core/modules/views/tests/src/Kernel/Plugin/ViewsBlockTest.php
+++ b/core/modules/views/tests/src/Kernel/Plugin/ViewsBlockTest.php
@@ -5,6 +5,7 @@ namespace Drupal\Tests\views\Kernel\Plugin;
use Drupal\views\Plugin\Block\ViewsBlock;
use Drupal\views\Tests\ViewTestData;
use Drupal\Tests\views\Kernel\ViewsKernelTestBase;
+use Drupal\views\Views;
/**
* Tests native behaviors of the block views plugin.
@@ -51,4 +52,79 @@ class ViewsBlockTest extends ViewsKernelTestBase {
$this->assertEqual($views_block->getMachineNameSuggestion(), 'views_block__test_view_block_block_1');
}
+ /**
+ * Tests that ViewsBlock::build() produces the right output with title tokens.
+ *
+ * @see \Drupal\views\Plugin\Block::build()
+ */
+ public function testBuildWithTitleToken() {
+ $view = Views::getView('test_view_block');
+ $view->setDisplay();
+
+ $sorts = [
+ 'name' => [
+ 'id' => 'name',
+ 'field' => 'name',
+ 'table' => 'views_test_data',
+ 'plugin_id' => 'standard',
+ 'order' => 'asc',
+ ],
+ ];
+ // Set the title to the 'name' field in the first row and add a sort order
+ // for consistent results on different databases.
+ $view->display_handler->setOption('title', '{{ name }}');
+ $view->display_handler->setOption('sorts', $sorts);
+ $view->save();
+
+ $plugin_definition = [
+ 'provider' => 'views',
+ ];
+ $plugin_id = 'views_block:test_view_block-block_1';
+ $views_block = ViewsBlock::create($this->container, [], $plugin_id, $plugin_definition);
+
+ $build = $views_block->build();
+ $this->assertEquals('George', $build['#title']['#markup']);
+ }
+
+ /**
+ * Tests ViewsBlock::build() with a title override.
+ *
+ * @see \Drupal\views\Plugin\Block::build()
+ */
+ public function testBuildWithTitleOverride() {
+ $view = Views::getView('test_view_block');
+ $view->setDisplay();
+
+ // Add a fixed argument that sets a title and save the view.
+ $view->displayHandlers->get('default')->overrideOption('arguments', array(
+ 'name' => array(
+ 'default_action' => 'default',
+ 'title_enable' => TRUE,
+ 'title' => 'Overridden title',
+ 'default_argument_type' => 'fixed',
+ 'default_argument_options' => [
+ 'argument' => 'fixed'
+ ],
+ 'validate' => array(
+ 'type' => 'none',
+ 'fail' => 'not found',
+ ),
+ 'id' => 'name',
+ 'table' => 'views_test_data',
+ 'field' => 'name',
+ 'plugin_id' => 'string',
+ )
+ ));
+ $view->save();
+
+ $plugin_definition = [
+ 'provider' => 'views',
+ ];
+ $plugin_id = 'views_block:test_view_block-block_1';
+ $views_block = ViewsBlock::create($this->container, [], $plugin_id, $plugin_definition);
+
+ $build = $views_block->build();
+ $this->assertEquals('Overridden title', $build['#title']['#markup']);
+ }
+
}
diff --git a/core/modules/views_ui/js/views-admin.js b/core/modules/views_ui/js/views-admin.js
index 3cc0f4c1a..761185ed6 100644
--- a/core/modules/views_ui/js/views-admin.js
+++ b/core/modules/views_ui/js/views-admin.js
@@ -733,12 +733,7 @@
* The event triggered.
*/
clickAddGroupButton: function (event) {
- // Due to conflicts between Drupal core's AJAX system and the Views AJAX
- // system, the only way to get this to work seems to be to trigger both
- // the mousedown and submit events.
- this.addGroupButton
- .trigger('mousedown')
- .trigger('submit');
+ this.addGroupButton.trigger('mousedown');
event.preventDefault();
},
@@ -750,7 +745,7 @@
* form button that should be clicked.
*/
clickRemoveGroupButton: function (event) {
- this.table.find('#' + event.data.buttonId).trigger('mousedown').trigger('submit');
+ this.table.find('#' + event.data.buttonId).trigger('mousedown');
event.preventDefault();
},
diff --git a/core/modules/views_ui/src/Form/Ajax/RearrangeFilter.php b/core/modules/views_ui/src/Form/Ajax/RearrangeFilter.php
index e8eedd750..ea2235b7b 100644
--- a/core/modules/views_ui/src/Form/Ajax/RearrangeFilter.php
+++ b/core/modules/views_ui/src/Form/Ajax/RearrangeFilter.php
@@ -129,6 +129,7 @@ class RearrangeFilter extends ViewsFormBase {
'class' => array('views-remove-group'),
),
'#group' => $id,
+ '#ajax' => ['url' => NULL],
);
}
$group_options[$id] = $id == 1 ? $this->t('Default group') : $this->t('Group @group', array('@group' => $id));
diff --git a/core/modules/views_ui/src/Tests/TokenizeAreaUITest.php b/core/modules/views_ui/src/Tests/TokenizeAreaUITest.php
new file mode 100644
index 000000000..38eb47567
--- /dev/null
+++ b/core/modules/views_ui/src/Tests/TokenizeAreaUITest.php
@@ -0,0 +1,45 @@
+ 'entity_test']);
+ $entity_test->save();
+
+ $default = $this->randomView([]);
+ $id = $default['id'];
+ $view = View::load($id);
+
+ $this->drupalGet($view->toUrl('edit-form'));
+
+ // Add a global NULL argument to the view for testing argument tokens.
+ $this->drupalPostForm("admin/structure/views/nojs/add-handler/$id/page_1/argument", ['name[views.null]' => 1], 'Add and configure contextual filters');
+ $this->drupalPostForm(NULL, [], 'Apply');
+
+ $this->drupalPostForm("admin/structure/views/nojs/add-handler/$id/page_1/header", ['name[views.area]' => 'views.area'], 'Add and configure header');
+ // Test that field tokens are shown.
+ $this->assertText('{{ title }} == Content: Title');
+ // Test that argument tokens are shown.
+ $this->assertText('{{ arguments.null }} == Global: Null title');
+ }
+
+}
diff --git a/core/modules/views_ui/tests/src/FunctionalJavascript/FilterCriteriaTest.php b/core/modules/views_ui/tests/src/FunctionalJavascript/FilterCriteriaTest.php
new file mode 100644
index 000000000..d67870d5f
--- /dev/null
+++ b/core/modules/views_ui/tests/src/FunctionalJavascript/FilterCriteriaTest.php
@@ -0,0 +1,71 @@
+drupalCreateUser([
+ 'administer site configuration',
+ 'administer views',
+ 'administer nodes',
+ 'access content overview',
+ ]);
+
+ // Disable automatic live preview to make the sequence of calls clearer.
+ \Drupal::configFactory()->getEditable('views.settings')->set('ui.always_live_preview', FALSE)->save();
+ $this->drupalLogin($admin_user);
+ }
+
+ /**
+ * Tests dialog for filter criteria.
+ */
+ public function testFilterCriteriaDialog() {
+ $this->drupalGet('admin/structure/views/view/content_recent');
+ $assert_session = $this->assertSession();
+ $page = $this->getSession()->getPage();
+
+ // Use the 'And/Or Rearrange' link for fields to open a dialog.
+ $dropbutton = $page->find('css', '.views-ui-display-tab-bucket.filter .dropbutton-toggle button');
+ $dropbutton->click();
+ $add_link = $page->findById('views-rearrange-filter');
+ $this->assertTrue($add_link->isVisible(), 'And/Or Rearrange button found.');
+ $add_link->click();
+ $assert_session->assertWaitOnAjaxRequest();
+
+ // Add a new filter group.
+ $create_new_filter_group = $page->findById('views-add-group-link');
+ $this->assertTrue($create_new_filter_group->isVisible(), 'Add group link found.');
+ $create_new_filter_group->click();
+ $assert_session->assertWaitOnAjaxRequest();
+
+ // Assert the existence of the new filter group by checking the remove group
+ // link.
+ $remove_link = $page->findLink('Remove group');
+ $this->assertTrue($remove_link->isVisible(), 'New group found.');
+
+ // Remove the group again and assert the group is not present anymore.
+ $remove_link->click();
+ $assert_session->assertWaitOnAjaxRequest();
+ $remove_link = $page->findLink('Remove group');
+ $this->assertEmpty($remove_link, 'Remove button not available');
+ }
+
+}
diff --git a/core/modules/views_ui/tests/src/FunctionalJavascript/LibraryCachingTest.php b/core/modules/views_ui/tests/src/FunctionalJavascript/LibraryCachingTest.php
index fc98e87ff..4cf51d57f 100644
--- a/core/modules/views_ui/tests/src/FunctionalJavascript/LibraryCachingTest.php
+++ b/core/modules/views_ui/tests/src/FunctionalJavascript/LibraryCachingTest.php
@@ -39,12 +39,12 @@ class LibraryCachingTest extends JavascriptTestBase {
$add_link = $page->findById('views-add-field');
$this->assertTrue($add_link->isVisible(), 'Add fields button found.');
$add_link->click();
- $this->getSession()->wait(5000, "jQuery('.ui-dialog-titlebar').length > 0");
+ $this->assertJsCondition("jQuery('.ui-dialog-titlebar').length > 0");
// Close the dialog and open it again. No no libraries will be loaded, but a
// cache entry will be made for not loading any libraries.
$page->pressButton('Close');
$add_link->click();
- $this->getSession()->wait(5000, "jQuery('.ui-dialog-titlebar').length > 0");
+ $this->assertJsCondition("jQuery('.ui-dialog-titlebar').length > 0");
$page->pressButton('Close');
// Reload the page.
@@ -55,14 +55,14 @@ class LibraryCachingTest extends JavascriptTestBase {
$preview = $page->findById('preview-submit');
// The first click will load all the libraries.
$preview->click();
- $this->getSession()->wait(5000, "jQuery('.ajax-progress').length === 0");
+ $this->assertJsCondition("jQuery('.ajax-progress').length === 0");
// The second click will not load any new libraries.
$preview->click();
- $this->getSession()->wait(5000, "jQuery('.ajax-progress').length === 0");
+ $this->assertJsCondition("jQuery('.ajax-progress').length === 0");
// Check to see if the dialogs still open.
$add_link = $page->findById('views-add-field');
$add_link->click();
- $this->getSession()->wait(5000, "jQuery('.ui-dialog-titlebar').length > 0");
+ $this->assertJsCondition("jQuery('.ui-dialog-titlebar').length > 0");
$page->pressButton('Close');
}
diff --git a/core/modules/views_ui/tests/src/FunctionalJavascript/ViewsWizardTest.php b/core/modules/views_ui/tests/src/FunctionalJavascript/ViewsWizardTest.php
index 6320f69ed..3fb1167e1 100644
--- a/core/modules/views_ui/tests/src/FunctionalJavascript/ViewsWizardTest.php
+++ b/core/modules/views_ui/tests/src/FunctionalJavascript/ViewsWizardTest.php
@@ -15,7 +15,7 @@ class ViewsWizardTest extends JavascriptTestBase {
/**
* {@inheritdoc}
*/
- public static $modules = ['node', 'views', 'views_ui', 'block'];
+ public static $modules = ['node', 'views', 'views_ui', 'block', 'user'];
/**
* {@inheritdoc}
@@ -56,6 +56,27 @@ class ViewsWizardTest extends JavascriptTestBase {
// Add a block display.
$page->findField('block[create]')->click();
$this->assertEquals($label_value, $page->findField('block[title]')->getValue());
+
+ // Select the entity type to display and test that the type selector is
+ // shown when expected.
+ $page->selectFieldOption('show[wizard_key]', 'node');
+ $this->assertSession()->assertWaitOnAjaxRequest();
+ $this->assertNull($page->findField('show[type]'), 'The "of type" filter is not added for nodes when there are no node types.');
+ $this->assertEquals('teasers', $page->findField('page[style][row_plugin]')->getValue(), 'The page display format shows the expected default value.');
+ $this->assertEquals('titles_linked', $page->findField('block[style][row_plugin]')->getValue(), 'The block display format shows the expected default value.');
+
+ $page->selectFieldOption('show[wizard_key]', 'users');
+ $this->assertSession()->assertWaitOnAjaxRequest();
+ $this->assertNull($page->findField('show[type]'), 'The "of type" filter is not added for users.');
+ $this->assertEquals('fields', $page->findField('page[style][row_plugin]')->getValue(), 'The page display format was updated to a valid value.');
+ $this->assertEquals('fields', $page->findField('block[style][row_plugin]')->getValue(), 'The block display format was updated to a valid value.');
+
+ $this->drupalCreateContentType(['type' => 'page']);
+ $page->selectFieldOption('show[wizard_key]', 'node');
+ $this->assertSession()->assertWaitOnAjaxRequest();
+ $this->assertNotNull($page->findField('show[type]'), 'The "of type" filter is added for nodes when there is at least one node type.');
+ $this->assertEquals('fields', $page->findField('page[style][row_plugin]')->getValue(), 'The page display format was not changed from a valid value.');
+ $this->assertEquals('fields', $page->findField('block[style][row_plugin]')->getValue(), 'The block display format was not changed from a valid value.');
}
}
diff --git a/core/tests/Drupal/FunctionalJavascriptTests/Core/MachineNameTest.php b/core/tests/Drupal/FunctionalJavascriptTests/Core/MachineNameTest.php
index 23c2f0bb9..10aa88e92 100644
--- a/core/tests/Drupal/FunctionalJavascriptTests/Core/MachineNameTest.php
+++ b/core/tests/Drupal/FunctionalJavascriptTests/Core/MachineNameTest.php
@@ -86,7 +86,7 @@ class MachineNameTest extends JavascriptTestBase {
$title_1->setValue($test_info['input']);
// Wait the set timeout for fetching the machine name.
- $this->getSession()->wait(1000, 'jQuery("#edit-machine-name-1-label-machine-name-suffix .machine-name-value").html() == "' . $test_info['expected'] . '"');
+ $this->assertJsCondition('jQuery("#edit-machine-name-1-label-machine-name-suffix .machine-name-value").html() == "' . $test_info['expected'] . '"');
// Validate the generated machine name.
$this->assertEquals($test_info['expected'], $machine_name_1_value->getHtml(), $test_info['message']);
diff --git a/core/tests/Drupal/FunctionalJavascriptTests/JavascriptTestBase.php b/core/tests/Drupal/FunctionalJavascriptTests/JavascriptTestBase.php
index 092d0cdb8..d5156eeb5 100644
--- a/core/tests/Drupal/FunctionalJavascriptTests/JavascriptTestBase.php
+++ b/core/tests/Drupal/FunctionalJavascriptTests/JavascriptTestBase.php
@@ -47,16 +47,18 @@ abstract class JavascriptTestBase extends BrowserTestBase {
* {@inheritdoc}
*/
protected function tearDown() {
- // Wait for all requests to finish. It is possible that an AJAX request is
- // still on-going.
- $result = $this->getSession()->wait(5000, '(typeof(jQuery)=="undefined" || (0 === jQuery.active && 0 === jQuery(\':animated\').length))');
- if (!$result) {
- // If the wait is unsuccessful, there may still be an AJAX request in
- // progress. If we tear down now, then this AJAX request may fail with
- // missing database tables, because tear down will have removed them. Rather
- // than allow it to fail, throw an explicit exception now explaining what
- // the problem is.
- throw new \RuntimeException('Unfinished AJAX requests whilst tearing down a test');
+ if ($this->mink) {
+ // Wait for all requests to finish. It is possible that an AJAX request is
+ // still on-going.
+ $result = $this->getSession()->wait(5000, '(typeof(jQuery)=="undefined" || (0 === jQuery.active && 0 === jQuery(\':animated\').length))');
+ if (!$result) {
+ // If the wait is unsuccessful, there may still be an AJAX request in
+ // progress. If we tear down now, then this AJAX request may fail with
+ // missing database tables, because tear down will have removed them.
+ // Rather than allow it to fail, throw an explicit exception now
+ // explaining what the problem is.
+ throw new \RuntimeException('Unfinished AJAX requests while tearing down a test');
+ }
}
parent::tearDown();
}
@@ -97,7 +99,7 @@ abstract class JavascriptTestBase extends BrowserTestBase {
* @param string $condition
* JS condition to wait until it becomes TRUE.
* @param int $timeout
- * (Optional) Timeout in milliseconds, defaults to 1000.
+ * (Optional) Timeout in milliseconds, defaults to 10000.
* @param string $message
* (optional) A message to display with the assertion. If left blank, a
* default message will be displayed.
@@ -106,7 +108,7 @@ abstract class JavascriptTestBase extends BrowserTestBase {
*
* @see \Behat\Mink\Driver\DriverInterface::evaluateScript()
*/
- protected function assertJsCondition($condition, $timeout = 1000, $message = '') {
+ protected function assertJsCondition($condition, $timeout = 10000, $message = '') {
$message = $message ?: "Javascript condition met:\n" . $condition;
$result = $this->getSession()->getDriver()->wait($timeout, $condition);
$this->assertTrue($result, $message);
@@ -143,4 +145,28 @@ abstract class JavascriptTestBase extends BrowserTestBase {
return new JSWebAssert($this->getSession($name), $this->baseUrl);
}
+ /**
+ * Gets the current Drupal javascript settings and parses into an array.
+ *
+ * Unlike BrowserTestBase::getDrupalSettings(), this implementation reads the
+ * current values of drupalSettings, capturing all changes made via javascript
+ * after the page was loaded.
+ *
+ * @return array
+ * The Drupal javascript settings array.
+ *
+ * @see \Drupal\Tests\BrowserTestBase::getDrupalSettings()
+ */
+ protected function getDrupalSettings() {
+ $script = <<getSession()->evaluateScript($script) ?: [];
+ }
+
}
diff --git a/core/tests/Drupal/FunctionalTests/Entity/ContentEntityFormCorrectUserInputMappingOnFieldDeltaElementsTest.php b/core/tests/Drupal/FunctionalTests/Entity/ContentEntityFormCorrectUserInputMappingOnFieldDeltaElementsTest.php
new file mode 100644
index 000000000..9f1468ba6
--- /dev/null
+++ b/core/tests/Drupal/FunctionalTests/Entity/ContentEntityFormCorrectUserInputMappingOnFieldDeltaElementsTest.php
@@ -0,0 +1,117 @@
+drupalCreateUser(['administer entity_test content']);
+ $this->drupalLogin($web_user);
+
+ // Create a field of field type "shape" with unlimited cardinality on the
+ // entity type "entity_test".
+ $this->entityTypeId = 'entity_test';
+ $this->fieldName = 'shape';
+
+ FieldStorageConfig::create([
+ 'field_name' => $this->fieldName,
+ 'entity_type' => $this->entityTypeId,
+ 'type' => 'shape',
+ 'cardinality' => FieldStorageDefinitionInterface::CARDINALITY_UNLIMITED,
+ ])
+ ->save();
+ FieldConfig::create([
+ 'entity_type' => $this->entityTypeId,
+ 'field_name' => $this->fieldName,
+ 'bundle' => $this->entityTypeId,
+ 'label' => 'Shape',
+ 'translatable' => FALSE,
+ ])
+ ->save();
+
+ entity_get_form_display($this->entityTypeId, $this->entityTypeId, 'default')
+ ->setComponent($this->fieldName, ['type' => 'shape_only_color_editable_widget'])
+ ->save();
+ }
+
+ /**
+ * Tests the correct user input mapping on complex fields.
+ */
+ public function testCorrectUserInputMappingOnComplexFields() {
+ /** @var ContentEntityStorageInterface $storage */
+ $storage = $this->container->get('entity_type.manager')->getStorage($this->entityTypeId);
+
+ /** @var ContentEntityInterface $entity */
+ $entity = $storage->create([$this->fieldName => [
+ ['shape' => 'rectangle', 'color' => 'green'],
+ ['shape' => 'circle', 'color' => 'blue'],
+ ]]);
+ $entity->save();
+
+ $this->drupalGet($this->entityTypeId . '/manage/' . $entity->id() . '/edit');
+
+ // Rearrange the field items.
+ $edit = array(
+ "$this->fieldName[0][_weight]" => 0,
+ "$this->fieldName[1][_weight]" => -1,
+ );
+ // Executing an ajax call is important before saving as it will trigger
+ // form state caching and so if for any reasons the form is rebuilt with
+ // the entity built based on the user submitted values with already
+ // reordered field items then the correct mapping will break after the form
+ // builder maps over the new form the user submitted values based on the
+ // previous delta ordering.
+ //
+ // This is how currently the form building process works and this test
+ // ensures the correct behavior no matter what changes would be made to the
+ // form builder or the content entity forms.
+ $this->drupalPostForm(NULL, $edit, t('Add another item'));
+ $this->drupalPostForm(NULL, [], t('Save'));
+
+ // Reload the entity.
+ $entity = $storage->load($entity->id());
+
+ // Assert that after rearranging the field items the user input will be
+ // mapped on the correct delta field items.
+ $this->assertEquals($entity->get($this->fieldName)->getValue(), [
+ ['shape' => 'circle', 'color' => 'blue'],
+ ['shape' => 'rectangle', 'color' => 'green'],
+ ]);
+ }
+
+}
diff --git a/core/tests/Drupal/KernelTests/Core/Entity/Element/EntityAutocompleteElementFormTest.php b/core/tests/Drupal/KernelTests/Core/Entity/Element/EntityAutocompleteElementFormTest.php
index ec81f7b38..c2d737bfb 100644
--- a/core/tests/Drupal/KernelTests/Core/Entity/Element/EntityAutocompleteElementFormTest.php
+++ b/core/tests/Drupal/KernelTests/Core/Entity/Element/EntityAutocompleteElementFormTest.php
@@ -8,6 +8,7 @@ use Drupal\Core\Form\FormInterface;
use Drupal\Core\Form\FormState;
use Drupal\Core\Form\FormStateInterface;
use Drupal\entity_test\Entity\EntityTest;
+use Drupal\entity_test\Entity\EntityTestStringId;
use Drupal\KernelTests\Core\Entity\EntityKernelTestBase;
use Drupal\user\Entity\User;
@@ -46,6 +47,7 @@ class EntityAutocompleteElementFormTest extends EntityKernelTestBase implements
parent::setUp();
$this->installSchema('system', ['key_value_expire']);
+ $this->installEntitySchema('entity_test_string_id');
\Drupal::service('router.builder')->rebuild();
$this->testUser = User::create(array(
@@ -68,6 +70,17 @@ class EntityAutocompleteElementFormTest extends EntityKernelTestBase implements
$entity->save();
$this->referencedEntities[] = $entity;
}
+
+ // Use special characters in the ID of some of the test entities so we can
+ // test if these are handled correctly.
+ for ($i = 0; $i < 2; $i++) {
+ $entity = EntityTestStringId::create([
+ 'name' => $this->randomMachineName(),
+ 'id' => $this->randomMachineName() . '&save();
+ $this->referencedEntities[] = $entity;
+ }
}
/**
@@ -150,6 +163,16 @@ class EntityAutocompleteElementFormTest extends EntityKernelTestBase implements
'#default_value' => array($this->referencedEntities[0], $this->referencedEntities[1]),
);
+ $form['single_string_id'] = array(
+ '#type' => 'entity_autocomplete',
+ '#target_type' => 'entity_test_string_id',
+ );
+ $form['tags_string_id'] = array(
+ '#type' => 'entity_autocomplete',
+ '#target_type' => 'entity_test_string_id',
+ '#tags' => TRUE,
+ );
+
return $form;
}
@@ -181,6 +204,8 @@ class EntityAutocompleteElementFormTest extends EntityKernelTestBase implements
$this->getAutocompleteInput($this->referencedEntities[0])
. ', tags - autocreated entity label with specific uid, '
. $this->getAutocompleteInput($this->referencedEntities[1]),
+ 'single_string_id' => $this->getAutocompleteInput($this->referencedEntities[2]),
+ 'tags_string_id' => $this->getAutocompleteInput($this->referencedEntities[2]) . ', ' . $this->getAutocompleteInput($this->referencedEntities[3]),
]);
$form_builder = $this->container->get('form_builder');
$form_builder->submitForm($this, $form_state);
@@ -231,6 +256,16 @@ class EntityAutocompleteElementFormTest extends EntityKernelTestBase implements
$this->assertEqual($value[1]['entity']->getOwnerId(), $this->testAutocreateUser->id());
// Third value is an existing entity.
$this->assertEqual($value[2]['target_id'], $this->referencedEntities[1]->id());
+
+ // Test the 'single_string_id' element.
+ $this->assertEquals($this->referencedEntities[2]->id(), $form_state->getValue('single_string_id'));
+
+ // Test the 'tags_string_id' element.
+ $expected = [
+ ['target_id' => $this->referencedEntities[2]->id()],
+ ['target_id' => $this->referencedEntities[3]->id()],
+ ];
+ $this->assertEquals($expected, $form_state->getValue('tags_string_id'));
}
/**
diff --git a/core/tests/Drupal/KernelTests/Core/Entity/EntityQueryRelationshipTest.php b/core/tests/Drupal/KernelTests/Core/Entity/EntityQueryRelationshipTest.php
index 846543820..60dc13c67 100644
--- a/core/tests/Drupal/KernelTests/Core/Entity/EntityQueryRelationshipTest.php
+++ b/core/tests/Drupal/KernelTests/Core/Entity/EntityQueryRelationshipTest.php
@@ -1,6 +1,8 @@
queryResults = $this->factory->get('entity_test')
->condition("user_id.entity.name", $this->accounts[0]->getUsername())
@@ -154,6 +156,56 @@ class EntityQueryRelationshipTest extends EntityKernelTestBase {
->condition("$this->fieldName.entity.name", $this->terms[0]->name->value, '<>')
->execute();
$this->assertResults(array(1, 2));
+ // This returns the 0th entity as that's only one pointing to the 0th
+ // account.
+ $this->queryResults = $this->factory->get('entity_test')
+ ->condition("user_id.entity:user.name", $this->accounts[0]->getUsername())
+ ->execute();
+ $this->assertResults(array(0));
+ // This returns the 1st and 2nd entity as those point to the 1st account.
+ $this->queryResults = $this->factory->get('entity_test')
+ ->condition("user_id.entity:user.name", $this->accounts[0]->getUsername(), '<>')
+ ->execute();
+ $this->assertResults(array(1, 2));
+ // This returns all three entities because all of them point to an
+ // account.
+ $this->queryResults = $this->factory->get('entity_test')
+ ->exists("user_id.entity:user.name")
+ ->execute();
+ $this->assertResults(array(0, 1, 2));
+ // This returns no entities because all of them point to an account.
+ $this->queryResults = $this->factory->get('entity_test')
+ ->notExists("user_id.entity:user.name")
+ ->execute();
+ $this->assertEqual(count($this->queryResults), 0);
+ // This returns the 0th entity as that's only one pointing to the 0th
+ // term (test without specifying the field column).
+ $this->queryResults = $this->factory->get('entity_test')
+ ->condition("$this->fieldName.entity:taxonomy_term.name", $this->terms[0]->name->value)
+ ->execute();
+ $this->assertResults(array(0));
+ // This returns the 0th entity as that's only one pointing to the 0th
+ // term (test with specifying the column name).
+ $this->queryResults = $this->factory->get('entity_test')
+ ->condition("$this->fieldName.target_id.entity:taxonomy_term.name", $this->terms[0]->name->value)
+ ->execute();
+ $this->assertResults(array(0));
+ // This returns the 1st and 2nd entity as those point to the 1st term.
+ $this->queryResults = $this->factory->get('entity_test')
+ ->condition("$this->fieldName.entity:taxonomy_term.name", $this->terms[0]->name->value, '<>')
+ ->execute();
+ $this->assertResults(array(1, 2));
+ }
+
+ /**
+ * Tests the invalid specifier in the query relationship.
+ */
+ public function testInvalidSpecifier() {
+ $this->setExpectedException(PluginNotFoundException::class);
+ $this->factory
+ ->get('taxonomy_term')
+ ->condition('langcode.language.foo', 'bar')
+ ->execute();
}
/**
diff --git a/core/tests/Drupal/KernelTests/Core/Entity/EntityViewBuilderTest.php b/core/tests/Drupal/KernelTests/Core/Entity/EntityViewBuilderTest.php
index 156b799d9..0143128f1 100644
--- a/core/tests/Drupal/KernelTests/Core/Entity/EntityViewBuilderTest.php
+++ b/core/tests/Drupal/KernelTests/Core/Entity/EntityViewBuilderTest.php
@@ -2,6 +2,7 @@
namespace Drupal\KernelTests\Core\Entity;
+use Drupal\Core\Entity\EntityViewBuilder;
use Drupal\Core\Language\LanguageInterface;
use Drupal\field\Tests\EntityReference\EntityReferenceTestTrait;
use Drupal\Core\Cache\Cache;
@@ -210,4 +211,23 @@ class EntityViewBuilderTest extends EntityKernelTestBase {
return $this->container->get('entity.manager')->getStorage($entity_type)->create($data);
}
+ /**
+ * Tests that viewing an entity without template does not specify #theme.
+ */
+ public function testNoTemplate() {
+ // Ensure that an entity type without explicit view builder uses the
+ // default.
+ $entity_type_manager = \Drupal::entityTypeManager();
+ $entity_type = $entity_type_manager->getDefinition('entity_test_base_field_display');
+ $this->assertTrue($entity_type->hasViewBuilderClass());
+ $this->assertEquals(EntityViewBuilder::class, $entity_type->getViewBuilderClass());
+
+ // Ensure that an entity without matching template does not have a #theme
+ // key.
+ $entity = $this->createTestEntity('entity_test');
+ $build = $entity_type_manager->getViewBuilder('entity_test')->view($entity);
+ $this->assertEquals($entity, $build['#entity_test']);
+ $this->assertFalse(array_key_exists('#theme', $build));
+ }
+
}
diff --git a/core/tests/Drupal/Tests/BrowserTestBase.php b/core/tests/Drupal/Tests/BrowserTestBase.php
index 8d0cd39a0..44908bb2f 100644
--- a/core/tests/Drupal/Tests/BrowserTestBase.php
+++ b/core/tests/Drupal/Tests/BrowserTestBase.php
@@ -258,7 +258,9 @@ abstract class BrowserTestBase extends \PHPUnit_Framework_TestCase {
/**
* Mink session manager.
*
- * @var \Behat\Mink\Mink
+ * This will not be initialized if there was an error during the test setup.
+ *
+ * @var \Behat\Mink\Mink|null
*/
protected $mink;
diff --git a/core/tests/Drupal/Tests/Component/Diff/DiffFormatterTest.php b/core/tests/Drupal/Tests/Component/Diff/DiffFormatterTest.php
new file mode 100644
index 000000000..70fb0dcf1
--- /dev/null
+++ b/core/tests/Drupal/Tests/Component/Diff/DiffFormatterTest.php
@@ -0,0 +1,57 @@
+ ['', [], []],
+ 'add' => [
+ "3a3\n> line2a\n",
+ ['line1', 'line2', 'line3'],
+ ['line1', 'line2', 'line2a', 'line3'],
+ ],
+ 'delete' => [
+ "3d3\n< line2a\n",
+ ['line1', 'line2', 'line2a', 'line3'],
+ ['line1', 'line2', 'line3'],
+ ],
+ 'change' => [
+ "3c3\n< line2a\n---\n> line2b\n",
+ ['line1', 'line2', 'line2a', 'line3'],
+ ['line1', 'line2', 'line2b', 'line3'],
+ ],
+ ];
+ }
+
+ /**
+ * Tests whether op classes returned by DiffEngine::diff() match expectations.
+ *
+ * @covers ::format
+ * @dataProvider provideTestDiff
+ */
+ public function testDiff($expected, $from, $to) {
+ $diff = new Diff($from, $to);
+ $formatter = new DiffFormatter();
+ $output = $formatter->format($diff);
+ $this->assertEquals($expected, $output);
+ }
+
+}
diff --git a/core/tests/Drupal/Tests/Core/Config/Entity/ConfigEntityStorageTest.php b/core/tests/Drupal/Tests/Core/Config/Entity/ConfigEntityStorageTest.php
index 6f020237f..62310a190 100644
--- a/core/tests/Drupal/Tests/Core/Config/Entity/ConfigEntityStorageTest.php
+++ b/core/tests/Drupal/Tests/Core/Config/Entity/ConfigEntityStorageTest.php
@@ -2,11 +2,27 @@
namespace Drupal\Tests\Core\Config\Entity;
+use Drupal\Component\Uuid\UuidInterface;
use Drupal\Core\Cache\Cache;
+use Drupal\Core\Cache\CacheTagsInvalidatorInterface;
+use Drupal\Core\Config\Config;
+use Drupal\Core\Config\ConfigFactoryInterface;
+use Drupal\Core\Config\ConfigManagerInterface;
+use Drupal\Core\Config\Entity\ConfigEntityBase;
use Drupal\Core\Config\Entity\ConfigEntityInterface;
+use Drupal\Core\Config\Entity\ConfigEntityStorage;
+use Drupal\Core\Config\Entity\ConfigEntityType;
+use Drupal\Core\Config\ImmutableConfig;
+use Drupal\Core\Config\TypedConfigManagerInterface;
use Drupal\Core\Entity\EntityInterface;
+use Drupal\Core\Entity\EntityManagerInterface;
+use Drupal\Core\Entity\Query\QueryFactoryInterface;
+use Drupal\Core\Entity\Query\QueryInterface;
+use Drupal\Core\Extension\ModuleHandlerInterface;
use Drupal\Core\Language\Language;
+use Drupal\Core\Language\LanguageManagerInterface;
use Drupal\Tests\UnitTestCase;
+use Prophecy\Argument;
use Symfony\Component\DependencyInjection\ContainerBuilder;
/**
@@ -15,13 +31,6 @@ use Symfony\Component\DependencyInjection\ContainerBuilder;
*/
class ConfigEntityStorageTest extends UnitTestCase {
- /**
- * The entity type.
- *
- * @var \Drupal\Core\Config\Entity\ConfigEntityTypeInterface|\PHPUnit_Framework_MockObject_MockObject
- */
- protected $entityType;
-
/**
* The type ID of the entity under test.
*
@@ -32,21 +41,21 @@ class ConfigEntityStorageTest extends UnitTestCase {
/**
* The module handler.
*
- * @var \Drupal\Core\Extension\ModuleHandlerInterface|\PHPUnit_Framework_MockObject_MockObject
+ * @var \Drupal\Core\Extension\ModuleHandlerInterface|\Prophecy\Prophecy\ProphecyInterface
*/
protected $moduleHandler;
/**
* The UUID service.
*
- * @var \Drupal\Component\Uuid\UuidInterface|\PHPUnit_Framework_MockObject_MockObject
+ * @var \Drupal\Component\Uuid\UuidInterface|\Prophecy\Prophecy\ProphecyInterface
*/
protected $uuidService;
/**
* The language manager.
*
- * @var \Drupal\Core\Language\LanguageManagerInterface|\PHPUnit_Framework_MockObject_MockObject
+ * @var \Drupal\Core\Language\LanguageManagerInterface|\Prophecy\Prophecy\ProphecyInterface
*/
protected $languageManager;
@@ -60,52 +69,31 @@ class ConfigEntityStorageTest extends UnitTestCase {
/**
* The config factory service.
*
- * @var \Drupal\Core\Config\ConfigFactoryInterface|\PHPUnit_Framework_MockObject_MockObject
+ * @var \Drupal\Core\Config\ConfigFactoryInterface|\Prophecy\Prophecy\ProphecyInterface
*/
protected $configFactory;
/**
* The entity query.
*
- * @var \Drupal\Core\Entity\Query\QueryInterface|\PHPUnit_Framework_MockObject_MockObject
+ * @var \Drupal\Core\Entity\Query\QueryInterface|\Prophecy\Prophecy\ProphecyInterface
*/
protected $entityQuery;
- /**
- * The entity manager used for testing.
- *
- * @var \Drupal\Core\Entity\EntityManagerInterface|\PHPUnit_Framework_MockObject_MockObject
- */
- protected $entityManager;
-
/**
* The mocked cache backend.
*
- * @var \Drupal\Core\Cache\CacheTagsInvalidatorInterface|\PHPUnit_Framework_MockObject_MockObject
+ * @var \Drupal\Core\Cache\CacheTagsInvalidatorInterface|\Prophecy\Prophecy\ProphecyInterface
*/
protected $cacheTagsInvalidator;
- /**
- * The mocked typed config manager.
- *
- * @var \Drupal\Core\Config\TypedConfigManagerInterface|\PHPUnit_Framework_MockObject_MockObject
- */
- protected $typedConfigManager;
-
/**
* The configuration manager.
*
- * @var \Drupal\Core\Config\ConfigManagerInterface|\PHPUnit_Framework_MockObject_MockObject
+ * @var \Drupal\Core\Config\ConfigManagerInterface|\Prophecy\Prophecy\ProphecyInterface
*/
protected $configManager;
- /**
- * The cache contexts manager.
- *
- * @var \Drupal\Core\Cache\Context\CacheContextsManager|\PHPUnit_Framework_MockObject_MockObject
- */
- protected $cacheContextsManager;
-
/**
* {@inheritdoc}
*
@@ -114,76 +102,56 @@ class ConfigEntityStorageTest extends UnitTestCase {
protected function setUp() {
parent::setUp();
- $this->entityType = $this->getMock('Drupal\Core\Config\Entity\ConfigEntityTypeInterface');
$this->entityTypeId = 'test_entity_type';
- $this->entityType->expects($this->any())
- ->method('getKey')
- ->will($this->returnValueMap(array(
- array('id', 'id'),
- array('uuid', 'uuid'),
- array('langcode', 'langcode'),
- )));
- $this->entityType->expects($this->any())
- ->method('id')
- ->will($this->returnValue($this->entityTypeId));
- $this->entityType->expects($this->any())
- ->method('getConfigPrefix')
- ->will($this->returnValue('the_config_prefix'));
- $this->entityType->expects($this->any())
- ->method('getClass')
- ->will($this->returnValue(get_class($this->getMockEntity())));
- $this->entityType->expects($this->any())
- ->method('getListCacheTags')
- ->willReturn(array('test_entity_type_list'));
- $this->moduleHandler = $this->getMock('Drupal\Core\Extension\ModuleHandlerInterface');
+ $entity_type = new ConfigEntityType([
+ 'id' => $this->entityTypeId,
+ 'class' => get_class($this->getMockEntity()),
+ 'provider' => 'the_provider',
+ 'config_prefix' => 'the_config_prefix',
+ 'entity_keys' => [
+ 'id' => 'id',
+ 'uuid' => 'uuid',
+ 'langcode' => 'langcode',
+ ],
+ 'list_cache_tags' => [$this->entityTypeId . '_list'],
+ ]);
- $this->uuidService = $this->getMock('Drupal\Component\Uuid\UuidInterface');
+ $this->moduleHandler = $this->prophesize(ModuleHandlerInterface::class);
- $this->languageManager = $this->getMock('Drupal\Core\Language\LanguageManagerInterface');
- $this->languageManager->expects($this->any())
- ->method('getCurrentLanguage')
- ->willReturn(new Language(array('id' => 'hu')));
+ $this->uuidService = $this->prophesize(UuidInterface::class);
- $this->configFactory = $this->getMock('Drupal\Core\Config\ConfigFactoryInterface');
+ $this->languageManager = $this->prophesize(LanguageManagerInterface::class);
+ $this->languageManager->getCurrentLanguage()->willReturn(new Language(['id' => 'hu']));
- $this->entityQuery = $this->getMock('Drupal\Core\Entity\Query\QueryInterface');
+ $this->configFactory = $this->prophesize(ConfigFactoryInterface::class);
- $this->entityStorage = $this->getMockBuilder('Drupal\Core\Config\Entity\ConfigEntityStorage')
- ->setConstructorArgs(array($this->entityType, $this->configFactory, $this->uuidService, $this->languageManager))
- ->setMethods(array('getQuery'))
- ->getMock();
- $this->entityStorage->expects($this->any())
- ->method('getQuery')
- ->will($this->returnValue($this->entityQuery));
- $this->entityStorage->setModuleHandler($this->moduleHandler);
+ $this->entityQuery = $this->prophesize(QueryInterface::class);
+ $entity_query_factory = $this->prophesize(QueryFactoryInterface::class);
+ $entity_query_factory->get($entity_type, 'AND')->willReturn($this->entityQuery->reveal());
- $this->entityManager = $this->getMock('\Drupal\Core\Entity\EntityManagerInterface');
- $this->entityManager->expects($this->any())
- ->method('getDefinition')
- ->with('test_entity_type')
- ->will($this->returnValue($this->entityType));
+ $this->entityStorage = new ConfigEntityStorage($entity_type, $this->configFactory->reveal(), $this->uuidService->reveal(), $this->languageManager->reveal());
+ $this->entityStorage->setModuleHandler($this->moduleHandler->reveal());
- $this->cacheTagsInvalidator = $this->getMock('Drupal\Core\Cache\CacheTagsInvalidatorInterface');
+ $entity_manager = $this->prophesize(EntityManagerInterface::class);
+ $entity_manager->getDefinition('test_entity_type')->willReturn($entity_type);
- $this->typedConfigManager = $this->getMock('Drupal\Core\Config\TypedConfigManagerInterface');
- $this->typedConfigManager->expects($this->any())
- ->method('getDefinition')
- ->will($this->returnValue(array('mapping' => array('id' => '', 'uuid' => '', 'dependencies' => ''))));
+ $this->cacheTagsInvalidator = $this->prophesize(CacheTagsInvalidatorInterface::class);
- $this->configManager = $this->getMock('Drupal\Core\Config\ConfigManagerInterface');
+ $typed_config_manager = $this->prophesize(TypedConfigManagerInterface::class);
+ $typed_config_manager
+ ->getDefinition(Argument::containingString('the_provider.the_config_prefix.'))
+ ->willReturn(['mapping' => ['id' => '', 'uuid' => '', 'dependencies' => '']]);
- $this->cacheContextsManager = $this->getMockBuilder('Drupal\Core\Cache\Context\CacheContextsManager')
- ->disableOriginalConstructor()
- ->getMock();
+ $this->configManager = $this->prophesize(ConfigManagerInterface::class);
$container = new ContainerBuilder();
- $container->set('entity.manager', $this->entityManager);
- $container->set('config.typed', $this->typedConfigManager);
- $container->set('cache_tags.invalidator', $this->cacheTagsInvalidator);
- $container->set('config.manager', $this->configManager);
- $container->set('language_manager', $this->languageManager);
- $container->set('cache_contexts_manager', $this->cacheContextsManager);
+ $container->set('entity.manager', $entity_manager->reveal());
+ $container->set('entity.query.config', $entity_query_factory->reveal());
+ $container->set('config.typed', $typed_config_manager->reveal());
+ $container->set('cache_tags.invalidator', $this->cacheTagsInvalidator->reveal());
+ $container->set('config.manager', $this->configManager->reveal());
+ $container->set('language_manager', $this->languageManager->reveal());
\Drupal::setContainer($container);
}
@@ -193,20 +161,24 @@ class ConfigEntityStorageTest extends UnitTestCase {
* @covers ::doCreate
*/
public function testCreateWithPredefinedUuid() {
- $this->cacheTagsInvalidator->expects($this->never())
- ->method('invalidateTags');
+ $this->cacheTagsInvalidator->invalidateTags(Argument::cetera())->shouldNotBeCalled();
- $this->moduleHandler->expects($this->at(0))
- ->method('invokeAll')
- ->with('test_entity_type_create');
- $this->moduleHandler->expects($this->at(1))
- ->method('invokeAll')
- ->with('entity_create');
- $this->uuidService->expects($this->never())
- ->method('generate');
+ $entity = $this->getMockEntity();
+ $entity->set('id', 'foo');
+ $entity->set('langcode', 'hu');
+ $entity->set('uuid', 'baz');
+ $entity->setOriginalId('foo');
+ $entity->enforceIsNew();
+
+ $this->moduleHandler->invokeAll('test_entity_type_create', [$entity])
+ ->shouldBeCalled();
+ $this->moduleHandler->invokeAll('entity_create', [$entity, 'test_entity_type'])
+ ->shouldBeCalled();
+
+ $this->uuidService->generate()->shouldNotBeCalled();
$entity = $this->entityStorage->create(array('id' => 'foo', 'uuid' => 'baz'));
- $this->assertInstanceOf('Drupal\Core\Entity\EntityInterface', $entity);
+ $this->assertInstanceOf(EntityInterface::class, $entity);
$this->assertSame('foo', $entity->id());
$this->assertSame('baz', $entity->uuid());
}
@@ -218,21 +190,24 @@ class ConfigEntityStorageTest extends UnitTestCase {
* @return \Drupal\Core\Entity\EntityInterface
*/
public function testCreate() {
- $this->cacheTagsInvalidator->expects($this->never())
- ->method('invalidateTags');
+ $this->cacheTagsInvalidator->invalidateTags(Argument::cetera())->shouldNotBeCalled();
- $this->moduleHandler->expects($this->at(0))
- ->method('invokeAll')
- ->with('test_entity_type_create');
- $this->moduleHandler->expects($this->at(1))
- ->method('invokeAll')
- ->with('entity_create');
- $this->uuidService->expects($this->once())
- ->method('generate')
- ->will($this->returnValue('bar'));
+ $entity = $this->getMockEntity();
+ $entity->set('id', 'foo');
+ $entity->set('langcode', 'hu');
+ $entity->set('uuid', 'bar');
+ $entity->setOriginalId('foo');
+ $entity->enforceIsNew();
+
+ $this->moduleHandler->invokeAll('test_entity_type_create', [$entity])
+ ->shouldBeCalled();
+ $this->moduleHandler->invokeAll('entity_create', [$entity, 'test_entity_type'])
+ ->shouldBeCalled();
+
+ $this->uuidService->generate()->willReturn('bar');
$entity = $this->entityStorage->create(array('id' => 'foo'));
- $this->assertInstanceOf('Drupal\Core\Entity\EntityInterface', $entity);
+ $this->assertInstanceOf(EntityInterface::class, $entity);
$this->assertSame('foo', $entity->id());
$this->assertSame('bar', $entity->uuid());
return $entity;
@@ -243,10 +218,7 @@ class ConfigEntityStorageTest extends UnitTestCase {
* @covers ::doCreate
*/
public function testCreateWithCurrentLanguage() {
- $this->languageManager->expects($this->any())
- ->method('getLanguage')
- ->with('hu')
- ->willReturn(new Language(array('id' => 'hu')));
+ $this->languageManager->getLanguage('hu')->willReturn(new Language(['id' => 'hu']));
$entity = $this->entityStorage->create(array('id' => 'foo'));
$this->assertSame('hu', $entity->language()->getId());
@@ -257,10 +229,7 @@ class ConfigEntityStorageTest extends UnitTestCase {
* @covers ::doCreate
*/
public function testCreateWithExplicitLanguage() {
- $this->languageManager->expects($this->any())
- ->method('getLanguage')
- ->with('en')
- ->willReturn(new Language(array('id' => 'en')));
+ $this->languageManager->getLanguage('en')->willReturn(new Language(['id' => 'en']));
$entity = $this->entityStorage->create(array('id' => 'foo', 'langcode' => 'en'));
$this->assertSame('en', $entity->language()->getId());
@@ -277,56 +246,34 @@ class ConfigEntityStorageTest extends UnitTestCase {
* @depends testCreate
*/
public function testSaveInsert(EntityInterface $entity) {
- $config_object = $this->getMockBuilder('Drupal\Core\Config\Config')
- ->disableOriginalConstructor()
- ->getMock();
- $config_object->expects($this->atLeastOnce())
- ->method('isNew')
- ->will($this->returnValue(TRUE));
- $config_object->expects($this->exactly(1))
- ->method('setData');
- $config_object->expects($this->once())
- ->method('save');
- $config_object->expects($this->atLeastOnce())
- ->method('get')
- ->willReturn([]);
+ $immutable_config_object = $this->prophesize(ImmutableConfig::class);
+ $immutable_config_object->isNew()->willReturn(TRUE);
- $this->cacheTagsInvalidator->expects($this->once())
- ->method('invalidateTags')
- ->with(array(
- $this->entityTypeId . '_list', // List cache tag.
- ));
+ $config_object = $this->prophesize(Config::class);
+ $config_object->setData(['id' => 'foo', 'uuid' => 'bar', 'dependencies' => []])
+ ->shouldBeCalled();
+ $config_object->save(FALSE)->shouldBeCalled();
+ $config_object->get()->willReturn([]);
- $this->configFactory->expects($this->exactly(1))
- ->method('get')
- ->with('the_config_prefix.foo')
- ->will($this->returnValue($config_object));
+ $this->cacheTagsInvalidator->invalidateTags([$this->entityTypeId . '_list'])
+ ->shouldBeCalled();
- $this->configFactory->expects($this->exactly(1))
- ->method('getEditable')
- ->with('the_config_prefix.foo')
- ->will($this->returnValue($config_object));
+ $this->configFactory->get('the_provider.the_config_prefix.foo')
+ ->willReturn($immutable_config_object->reveal());
+ $this->configFactory->getEditable('the_provider.the_config_prefix.foo')
+ ->willReturn($config_object->reveal());
- $this->moduleHandler->expects($this->at(0))
- ->method('invokeAll')
- ->with('test_entity_type_presave');
- $this->moduleHandler->expects($this->at(1))
- ->method('invokeAll')
- ->with('entity_presave');
- $this->moduleHandler->expects($this->at(2))
- ->method('invokeAll')
- ->with('test_entity_type_insert');
- $this->moduleHandler->expects($this->at(3))
- ->method('invokeAll')
- ->with('entity_insert');
+ $this->moduleHandler->invokeAll('test_entity_type_presave', [$entity])
+ ->shouldBeCalled();
+ $this->moduleHandler->invokeAll('entity_presave', [$entity, 'test_entity_type'])
+ ->shouldBeCalled();
+ $this->moduleHandler->invokeAll('test_entity_type_insert', [$entity])
+ ->shouldBeCalled();
+ $this->moduleHandler->invokeAll('entity_insert', [$entity, 'test_entity_type'])
+ ->shouldBeCalled();
- $this->entityQuery->expects($this->once())
- ->method('condition')
- ->with('uuid', 'bar')
- ->will($this->returnSelf());
- $this->entityQuery->expects($this->once())
- ->method('execute')
- ->will($this->returnValue(array()));
+ $this->entityQuery->condition('uuid', 'bar')->willReturn($this->entityQuery);
+ $this->entityQuery->execute()->willReturn([]);
$return = $this->entityStorage->save($entity);
$this->assertSame(SAVED_NEW, $return);
@@ -344,61 +291,41 @@ class ConfigEntityStorageTest extends UnitTestCase {
* @depends testSaveInsert
*/
public function testSaveUpdate(EntityInterface $entity) {
- $config_object = $this->getMockBuilder('Drupal\Core\Config\Config')
- ->disableOriginalConstructor()
- ->getMock();
- $config_object->expects($this->atLeastOnce())
- ->method('isNew')
- ->will($this->returnValue(FALSE));
- $config_object->expects($this->exactly(1))
- ->method('setData');
- $config_object->expects($this->once())
- ->method('save');
- $config_object->expects($this->atLeastOnce())
- ->method('get')
- ->willReturn([]);
+ $immutable_config_object = $this->prophesize(ImmutableConfig::class);
+ $immutable_config_object->isNew()->willReturn(FALSE);
- $this->cacheTagsInvalidator->expects($this->once())
- ->method('invalidateTags')
- ->with(array(
- // List cache tag only; the own cache tag is invalidated by the config
- // system.
- $this->entityTypeId . '_list',
- ));
+ $config_object = $this->prophesize(Config::class);
+ $config_object->setData(['id' => 'foo', 'uuid' => 'bar', 'dependencies' => []])
+ ->shouldBeCalled();
+ $config_object->save(FALSE)->shouldBeCalled();
+ $config_object->get()->willReturn([]);
- $this->configFactory->expects($this->exactly(2))
- ->method('loadMultiple')
- ->with(array('the_config_prefix.foo'))
- ->will($this->returnValue(array()));
- $this->configFactory->expects($this->exactly(1))
- ->method('get')
- ->with('the_config_prefix.foo')
- ->will($this->returnValue($config_object));
- $this->configFactory->expects($this->exactly(1))
- ->method('getEditable')
- ->with('the_config_prefix.foo')
- ->will($this->returnValue($config_object));
+ $this->cacheTagsInvalidator->invalidateTags([$this->entityTypeId . '_list'])
+ ->shouldBeCalled();
- $this->moduleHandler->expects($this->at(0))
- ->method('invokeAll')
- ->with('test_entity_type_presave');
- $this->moduleHandler->expects($this->at(1))
- ->method('invokeAll')
- ->with('entity_presave');
- $this->moduleHandler->expects($this->at(2))
- ->method('invokeAll')
- ->with('test_entity_type_update');
- $this->moduleHandler->expects($this->at(3))
- ->method('invokeAll')
- ->with('entity_update');
+ $this->configFactory->loadMultiple(['the_provider.the_config_prefix.foo'])
+ ->willReturn([])
+ ->shouldBeCalledTimes(2);
+ $this->configFactory
+ ->get('the_provider.the_config_prefix.foo')
+ ->willReturn($immutable_config_object->reveal())
+ ->shouldBeCalledTimes(1);
+ $this->configFactory
+ ->getEditable('the_provider.the_config_prefix.foo')
+ ->willReturn($config_object->reveal())
+ ->shouldBeCalledTimes(1);
- $this->entityQuery->expects($this->once())
- ->method('condition')
- ->with('uuid', 'bar')
- ->will($this->returnSelf());
- $this->entityQuery->expects($this->once())
- ->method('execute')
- ->will($this->returnValue(array($entity->id())));
+ $this->moduleHandler->invokeAll('test_entity_type_presave', [$entity])
+ ->shouldBeCalled();
+ $this->moduleHandler->invokeAll('entity_presave', [$entity, 'test_entity_type'])
+ ->shouldBeCalled();
+ $this->moduleHandler->invokeAll('test_entity_type_update', [$entity])
+ ->shouldBeCalled();
+ $this->moduleHandler->invokeAll('entity_update', [$entity, 'test_entity_type'])
+ ->shouldBeCalled();
+
+ $this->entityQuery->condition('uuid', 'bar')->willReturn($this->entityQuery);
+ $this->entityQuery->execute()->willReturn([$entity->id()]);
$return = $this->entityStorage->save($entity);
$this->assertSame(SAVED_UPDATED, $return);
@@ -412,56 +339,35 @@ class ConfigEntityStorageTest extends UnitTestCase {
* @depends testSaveInsert
*/
public function testSaveRename(ConfigEntityInterface $entity) {
- $config_object = $this->getMockBuilder('Drupal\Core\Config\Config')
- ->disableOriginalConstructor()
- ->getMock();
- $config_object->expects($this->atLeastOnce())
- ->method('isNew')
- ->will($this->returnValue(FALSE));
- $config_object->expects($this->exactly(1))
- ->method('setData');
- $config_object->expects($this->once())
- ->method('save');
- $config_object->expects($this->atLeastOnce())
- ->method('get')
+ $immutable_config_object = $this->prophesize(ImmutableConfig::class);
+ $immutable_config_object->isNew()->willReturn(FALSE);
+
+ $config_object = $this->prophesize(Config::class);
+ $config_object->setData(['id' => 'bar', 'uuid' => 'bar', 'dependencies' => []])
+ ->shouldBeCalled();
+ $config_object->save(FALSE)
+ ->shouldBeCalled();
+ $config_object->get()->willReturn([]);
+
+ $this->cacheTagsInvalidator->invalidateTags([$this->entityTypeId . '_list'])
+ ->shouldBeCalled();
+
+ $this->configFactory->get('the_provider.the_config_prefix.foo')
+ ->willReturn($immutable_config_object->reveal());
+ $this->configFactory->loadMultiple(['the_provider.the_config_prefix.foo'])
->willReturn([]);
-
- $this->cacheTagsInvalidator->expects($this->once())
- ->method('invalidateTags')
- ->with(array(
- // List cache tag only; the own cache tag is invalidated by the config
- // system.
- $this->entityTypeId . '_list',
- ));
-
- $this->configFactory->expects($this->once())
- ->method('rename')
- ->willReturn($this->configFactory);
- $this->configFactory->expects($this->exactly(1))
- ->method('getEditable')
- ->with('the_config_prefix.bar')
- ->will($this->returnValue($config_object));
- $this->configFactory->expects($this->exactly(2))
- ->method('loadMultiple')
- ->with(array('the_config_prefix.foo'))
- ->will($this->returnValue(array()));
- $this->configFactory->expects($this->once())
- ->method('get')
- ->with('the_config_prefix.foo')
- ->will($this->returnValue($config_object));
+ $this->configFactory->rename('the_provider.the_config_prefix.foo', 'the_provider.the_config_prefix.bar')
+ ->shouldBeCalled();
+ $this->configFactory->getEditable('the_provider.the_config_prefix.bar')
+ ->willReturn($config_object->reveal());
// Performing a rename does not change the original ID until saving.
$this->assertSame('foo', $entity->getOriginalId());
$entity->set('id', 'bar');
$this->assertSame('foo', $entity->getOriginalId());
- $this->entityQuery->expects($this->once())
- ->method('condition')
- ->with('uuid', 'bar')
- ->will($this->returnSelf());
- $this->entityQuery->expects($this->once())
- ->method('execute')
- ->will($this->returnValue(array($entity->id())));
+ $this->entityQuery->condition('uuid', 'bar')->willReturn($this->entityQuery);
+ $this->entityQuery->execute()->willReturn([$entity->id()]);
$return = $this->entityStorage->save($entity);
$this->assertSame(SAVED_UPDATED, $return);
@@ -475,8 +381,8 @@ class ConfigEntityStorageTest extends UnitTestCase {
* @expectedExceptionMessage The entity does not have an ID.
*/
public function testSaveInvalid() {
- $this->cacheTagsInvalidator->expects($this->never())
- ->method('invalidateTags');
+ $this->cacheTagsInvalidator->invalidateTags(Argument::cetera())
+ ->shouldNotBeCalled();
$entity = $this->getMockEntity();
$this->entityStorage->save($entity);
@@ -489,24 +395,14 @@ class ConfigEntityStorageTest extends UnitTestCase {
* @expectedException \Drupal\Core\Entity\EntityStorageException
*/
public function testSaveDuplicate() {
- $config_object = $this->getMockBuilder('Drupal\Core\Config\Config')
- ->disableOriginalConstructor()
- ->getMock();
- $config_object->expects($this->atLeastOnce())
- ->method('isNew')
- ->will($this->returnValue(FALSE));
- $config_object->expects($this->never())
- ->method('set');
- $config_object->expects($this->never())
- ->method('save');
+ $config_object = $this->prophesize(ImmutableConfig::class);
+ $config_object->isNew()->willReturn(FALSE);
- $this->cacheTagsInvalidator->expects($this->never())
- ->method('invalidateTags');
+ $this->cacheTagsInvalidator->invalidateTags(Argument::cetera())
+ ->shouldNotBeCalled();
- $this->configFactory->expects($this->once())
- ->method('get')
- ->with('the_config_prefix.foo')
- ->will($this->returnValue($config_object));
+ $this->configFactory->get('the_provider.the_config_prefix.foo')
+ ->willReturn($config_object->reveal());
$entity = $this->getMockEntity(array('id' => 'foo'));
$entity->enforceIsNew();
@@ -522,29 +418,17 @@ class ConfigEntityStorageTest extends UnitTestCase {
* @expectedExceptionMessage when this UUID is already used for
*/
public function testSaveMismatch() {
- $config_object = $this->getMockBuilder('Drupal\Core\Config\Config')
- ->disableOriginalConstructor()
- ->getMock();
- $config_object->expects($this->atLeastOnce())
- ->method('isNew')
- ->will($this->returnValue(TRUE));
- $config_object->expects($this->never())
- ->method('save');
+ $config_object = $this->prophesize(ImmutableConfig::class);
+ $config_object->isNew()->willReturn(TRUE);
- $this->cacheTagsInvalidator->expects($this->never())
- ->method('invalidateTags');
+ $this->cacheTagsInvalidator->invalidateTags(Argument::cetera())
+ ->shouldNotBeCalled();
- $this->configFactory->expects($this->once())
- ->method('get')
- ->with('the_config_prefix.foo')
- ->will($this->returnValue($config_object));
+ $this->configFactory->get('the_provider.the_config_prefix.foo')
+ ->willReturn($config_object->reveal());
- $this->entityQuery->expects($this->once())
- ->method('condition')
- ->will($this->returnSelf());
- $this->entityQuery->expects($this->once())
- ->method('execute')
- ->will($this->returnValue(array('baz')));
+ $this->entityQuery->condition('uuid', NULL)->willReturn($this->entityQuery);
+ $this->entityQuery->execute()->willReturn(['baz']);
$entity = $this->getMockEntity(array('id' => 'foo'));
$this->entityStorage->save($entity);
@@ -555,41 +439,29 @@ class ConfigEntityStorageTest extends UnitTestCase {
* @covers ::doSave
*/
public function testSaveNoMismatch() {
- $config_object = $this->getMockBuilder('Drupal\Core\Config\Config')
- ->disableOriginalConstructor()
- ->getMock();
- $config_object->expects($this->atLeastOnce())
- ->method('isNew')
- ->will($this->returnValue(TRUE));
- $config_object->expects($this->once())
- ->method('save');
- $config_object->expects($this->atLeastOnce())
- ->method('get')
- ->willReturn([]);
+ $immutable_config_object = $this->prophesize(ImmutableConfig::class);
+ $immutable_config_object->isNew()->willReturn(TRUE);
- $this->cacheTagsInvalidator->expects($this->once())
- ->method('invalidateTags')
- ->with(array(
- $this->entityTypeId . '_list', // List cache tag.
- ));
+ $config_object = $this->prophesize(Config::class);
+ $config_object->get()->willReturn([]);
+ $config_object->setData(['id' => 'foo', 'uuid' => NULL, 'dependencies' => []])
+ ->shouldBeCalled();
+ $config_object->save(FALSE)->shouldBeCalled();
- $this->configFactory->expects($this->once())
- ->method('get')
- ->with('the_config_prefix.baz')
- ->will($this->returnValue($config_object));
- $this->configFactory->expects($this->once())
- ->method('rename')
- ->willReturn($this->configFactory);
- $this->configFactory->expects($this->exactly(1))
- ->method('getEditable')
- ->with('the_config_prefix.foo')
- ->will($this->returnValue($config_object));
- $this->entityQuery->expects($this->once())
- ->method('condition')
- ->will($this->returnSelf());
- $this->entityQuery->expects($this->once())
- ->method('execute')
- ->will($this->returnValue(array('baz')));
+ $this->cacheTagsInvalidator->invalidateTags([$this->entityTypeId . '_list'])
+ ->shouldBeCalled();
+
+ $this->configFactory->get('the_provider.the_config_prefix.baz')
+ ->willReturn($immutable_config_object->reveal())
+ ->shouldBeCalled();
+ $this->configFactory->rename('the_provider.the_config_prefix.baz', 'the_provider.the_config_prefix.foo')
+ ->shouldBeCalled();
+ $this->configFactory->getEditable('the_provider.the_config_prefix.foo')
+ ->willReturn($config_object->reveal())
+ ->shouldBeCalled();
+
+ $this->entityQuery->condition('uuid', NULL)->willReturn($this->entityQuery);
+ $this->entityQuery->execute()->willReturn(['baz']);
$entity = $this->getMockEntity(array('id' => 'foo'));
$entity->setOriginalId('baz');
@@ -605,62 +477,29 @@ class ConfigEntityStorageTest extends UnitTestCase {
* @expectedExceptionMessage when this entity already exists with UUID
*/
public function testSaveChangedUuid() {
- $config_object = $this->getMockBuilder('Drupal\Core\Config\Config')
- ->disableOriginalConstructor()
- ->getMock();
- $config_object->expects($this->atLeastOnce())
- ->method('isNew')
- ->will($this->returnValue(FALSE));
- $config_object->expects($this->never())
- ->method('save');
- $config_object->expects($this->exactly(2))
- ->method('get')
- ->will($this->returnValueMap(array(
- array('', array('id' => 'foo')),
- array('id', 'foo'),
- )));
- $config_object->expects($this->exactly(1))
- ->method('getCacheContexts')
- ->willReturn([]);
- $config_object->expects($this->exactly(1))
- ->method('getCacheTags')
- ->willReturn(['config:foo']);
- $config_object->expects($this->exactly(1))
- ->method('getCacheMaxAge')
- ->willReturn(Cache::PERMANENT);
- $config_object->expects($this->exactly(1))
- ->method('getName')
- ->willReturn('foo');
+ $config_object = $this->prophesize(ImmutableConfig::class);
+ $config_object->get()->willReturn(['id' => 'foo']);
+ $config_object->get('id')->willReturn('foo');
+ $config_object->isNew()->willReturn(FALSE);
+ $config_object->getName()->willReturn('foo');
+ $config_object->getCacheContexts()->willReturn([]);
+ $config_object->getCacheTags()->willReturn(['config:foo']);
+ $config_object->getCacheMaxAge()->willReturn(Cache::PERMANENT);
- $this->cacheTagsInvalidator->expects($this->never())
- ->method('invalidateTags');
+ $this->cacheTagsInvalidator->invalidateTags(Argument::cetera())
+ ->shouldNotBeCalled();
- $this->configFactory->expects($this->at(1))
- ->method('loadMultiple')
- ->with(array('the_config_prefix.foo'))
- ->will($this->returnValue(array()));
- $this->configFactory->expects($this->at(2))
- ->method('loadMultiple')
- ->with(array('the_config_prefix.foo'))
- ->will($this->returnValue(array($config_object)));
- $this->configFactory->expects($this->once())
- ->method('get')
- ->with('the_config_prefix.foo')
- ->will($this->returnValue($config_object));
- $this->configFactory->expects($this->never())
- ->method('rename')
- ->will($this->returnValue($config_object));
+ $this->configFactory->loadMultiple(['the_provider.the_config_prefix.foo'])
+ ->willReturn([$config_object->reveal()]);
+ $this->configFactory->get('the_provider.the_config_prefix.foo')
+ ->willReturn($config_object->reveal());
+ $this->configFactory->rename(Argument::cetera())->shouldNotBeCalled();
- $this->moduleHandler->expects($this->exactly(2))
- ->method('getImplementations')
- ->will($this->returnValue(array()));
+ $this->moduleHandler->getImplementations('entity_load')->willReturn([]);
+ $this->moduleHandler->getImplementations('test_entity_type_load')->willReturn([]);
- $this->entityQuery->expects($this->once())
- ->method('condition')
- ->will($this->returnSelf());
- $this->entityQuery->expects($this->once())
- ->method('execute')
- ->will($this->returnValue(array('foo')));
+ $this->entityQuery->condition('uuid', 'baz')->willReturn($this->entityQuery);
+ $this->entityQuery->execute()->willReturn(['foo']);
$entity = $this->getMockEntity(array('id' => 'foo'));
@@ -675,38 +514,22 @@ class ConfigEntityStorageTest extends UnitTestCase {
* @covers ::doLoadMultiple
*/
public function testLoad() {
- $config_object = $this->getMockBuilder('Drupal\Core\Config\Config')
- ->disableOriginalConstructor()
- ->getMock();
- $config_object->expects($this->exactly(2))
- ->method('get')
- ->will($this->returnValueMap(array(
- array('', array('id' => 'foo')),
- array('id', 'foo'),
- )));
- $config_object->expects($this->exactly(1))
- ->method('getCacheContexts')
- ->willReturn([]);
- $config_object->expects($this->exactly(1))
- ->method('getCacheTags')
- ->willReturn(['config:foo']);
- $config_object->expects($this->exactly(1))
- ->method('getCacheMaxAge')
- ->willReturn(Cache::PERMANENT);
- $config_object->expects($this->exactly(1))
- ->method('getName')
- ->willReturn('foo');
+ $config_object = $this->prophesize(ImmutableConfig::class);
+ $config_object->get()->willReturn(['id' => 'foo']);
+ $config_object->get('id')->willReturn('foo');
+ $config_object->getCacheContexts()->willReturn([]);
+ $config_object->getCacheTags()->willReturn(['config:foo']);
+ $config_object->getCacheMaxAge()->willReturn(Cache::PERMANENT);
+ $config_object->getName()->willReturn('foo');
- $this->configFactory->expects($this->once())
- ->method('loadMultiple')
- ->with(array('the_config_prefix.foo'))
- ->will($this->returnValue(array($config_object)));
- $this->moduleHandler->expects($this->exactly(2))
- ->method('getImplementations')
- ->will($this->returnValue(array()));
+ $this->configFactory->loadMultiple(['the_provider.the_config_prefix.foo'])
+ ->willReturn([$config_object->reveal()]);
+
+ $this->moduleHandler->getImplementations('entity_load')->willReturn([]);
+ $this->moduleHandler->getImplementations('test_entity_type_load')->willReturn([]);
$entity = $this->entityStorage->load('foo');
- $this->assertInstanceOf('Drupal\Core\Entity\EntityInterface', $entity);
+ $this->assertInstanceOf(EntityInterface::class, $entity);
$this->assertSame('foo', $entity->id());
}
@@ -717,67 +540,35 @@ class ConfigEntityStorageTest extends UnitTestCase {
* @covers ::doLoadMultiple
*/
public function testLoadMultipleAll() {
- $foo_config_object = $this->getMockBuilder('Drupal\Core\Config\Config')
- ->disableOriginalConstructor()
- ->getMock();
- $foo_config_object->expects($this->exactly(2))
- ->method('get')
- ->will($this->returnValueMap(array(
- array('', array('id' => 'foo')),
- array('id', 'foo'),
- )));
- $foo_config_object->expects($this->exactly(1))
- ->method('getCacheContexts')
- ->willReturn([]);
- $foo_config_object->expects($this->exactly(1))
- ->method('getCacheTags')
- ->willReturn(['config:foo']);
- $foo_config_object->expects($this->exactly(1))
- ->method('getCacheMaxAge')
- ->willReturn(Cache::PERMANENT);
- $foo_config_object->expects($this->exactly(1))
- ->method('getName')
- ->willReturn('foo');
+ $foo_config_object = $this->prophesize(ImmutableConfig::class);
+ $foo_config_object->get()->willReturn(['id' => 'foo']);
+ $foo_config_object->get('id')->willReturn('foo');
+ $foo_config_object->getCacheContexts()->willReturn([]);
+ $foo_config_object->getCacheTags()->willReturn(['config:foo']);
+ $foo_config_object->getCacheMaxAge()->willReturn(Cache::PERMANENT);
+ $foo_config_object->getName()->willReturn('foo');
- $bar_config_object = $this->getMockBuilder('Drupal\Core\Config\Config')
- ->disableOriginalConstructor()
- ->getMock();
- $bar_config_object->expects($this->exactly(2))
- ->method('get')
- ->will($this->returnValueMap(array(
- array('', array('id' => 'bar')),
- array('id', 'bar'),
- )));
- $bar_config_object->expects($this->exactly(1))
- ->method('getCacheContexts')
- ->willReturn([]);
- $bar_config_object->expects($this->exactly(1))
- ->method('getCacheTags')
- ->willReturn(['config:bar']);
- $bar_config_object->expects($this->exactly(1))
- ->method('getCacheMaxAge')
- ->willReturn(Cache::PERMANENT);
- $bar_config_object->expects($this->exactly(1))
- ->method('getName')
- ->willReturn('foo');
+ $bar_config_object = $this->prophesize(ImmutableConfig::class);
+ $bar_config_object->get()->willReturn(['id' => 'bar']);
+ $bar_config_object->get('id')->willReturn('bar');
+ $bar_config_object->getCacheContexts()->willReturn([]);
+ $bar_config_object->getCacheTags()->willReturn(['config:bar']);
+ $bar_config_object->getCacheMaxAge()->willReturn(Cache::PERMANENT);
+ $bar_config_object->getName()->willReturn('foo');
- $this->configFactory->expects($this->once())
- ->method('listAll')
- ->with('the_config_prefix.')
- ->will($this->returnValue(array('the_config_prefix.foo' , 'the_config_prefix.bar')));
- $this->configFactory->expects($this->once())
- ->method('loadMultiple')
- ->with(array('the_config_prefix.foo' , 'the_config_prefix.bar'))
- ->will($this->returnValue(array($foo_config_object, $bar_config_object)));
- $this->moduleHandler->expects($this->exactly(2))
- ->method('getImplementations')
- ->will($this->returnValue(array()));
+ $this->configFactory->listAll('the_provider.the_config_prefix.')
+ ->willReturn(['the_provider.the_config_prefix.foo' , 'the_provider.the_config_prefix.bar']);
+ $this->configFactory->loadMultiple(['the_provider.the_config_prefix.foo', 'the_provider.the_config_prefix.bar'])
+ ->willReturn([$foo_config_object->reveal(), $bar_config_object->reveal()]);
+
+ $this->moduleHandler->getImplementations('entity_load')->willReturn([]);
+ $this->moduleHandler->getImplementations('test_entity_type_load')->willReturn([]);
$entities = $this->entityStorage->loadMultiple();
$expected['foo'] = 'foo';
$expected['bar'] = 'bar';
+ $this->assertContainsOnlyInstancesOf(EntityInterface::class, $entities);
foreach ($entities as $id => $entity) {
- $this->assertInstanceOf('Drupal\Core\Entity\EntityInterface', $entity);
$this->assertSame($id, $entity->id());
$this->assertSame($expected[$id], $entity->id());
}
@@ -790,39 +581,23 @@ class ConfigEntityStorageTest extends UnitTestCase {
* @covers ::doLoadMultiple
*/
public function testLoadMultipleIds() {
- $config_object = $this->getMockBuilder('Drupal\Core\Config\Config')
- ->disableOriginalConstructor()
- ->getMock();
- $config_object->expects($this->exactly(2))
- ->method('get')
- ->will($this->returnValueMap(array(
- array('', array('id' => 'foo')),
- array('id', 'foo'),
- )));
- $config_object->expects($this->exactly(1))
- ->method('getCacheContexts')
- ->willReturn([]);
- $config_object->expects($this->exactly(1))
- ->method('getCacheTags')
- ->willReturn(['config:foo']);
- $config_object->expects($this->exactly(1))
- ->method('getCacheMaxAge')
- ->willReturn(Cache::PERMANENT);
- $config_object->expects($this->exactly(1))
- ->method('getName')
- ->willReturn('foo');
+ $config_object = $this->prophesize(ImmutableConfig::class);
+ $config_object->get()->willReturn(['id' => 'foo']);
+ $config_object->get('id')->willReturn('foo');
+ $config_object->getCacheContexts()->willReturn([]);
+ $config_object->getCacheTags()->willReturn(['config:foo']);
+ $config_object->getCacheMaxAge()->willReturn(Cache::PERMANENT);
+ $config_object->getName()->willReturn('foo');
- $this->configFactory->expects($this->once())
- ->method('loadMultiple')
- ->with(array('the_config_prefix.foo'))
- ->will($this->returnValue(array($config_object)));
- $this->moduleHandler->expects($this->exactly(2))
- ->method('getImplementations')
- ->will($this->returnValue(array()));
+ $this->configFactory->loadMultiple(['the_provider.the_config_prefix.foo'])
+ ->willReturn([$config_object->reveal()]);
+
+ $this->moduleHandler->getImplementations('entity_load')->willReturn([]);
+ $this->moduleHandler->getImplementations('test_entity_type_load')->willReturn([]);
$entities = $this->entityStorage->loadMultiple(array('foo'));
+ $this->assertContainsOnlyInstancesOf(EntityInterface::class, $entities);
foreach ($entities as $id => $entity) {
- $this->assertInstanceOf('Drupal\Core\Entity\EntityInterface', $entity);
$this->assertSame($id, $entity->id());
}
}
@@ -838,8 +613,8 @@ class ConfigEntityStorageTest extends UnitTestCase {
* @covers ::deleteRevision
*/
public function testDeleteRevision() {
- $this->cacheTagsInvalidator->expects($this->never())
- ->method('invalidateTags');
+ $this->cacheTagsInvalidator->invalidateTags(Argument::cetera())
+ ->shouldNotBeCalled();
$this->assertSame(NULL, $this->entityStorage->deleteRevision(1));
}
@@ -851,60 +626,37 @@ class ConfigEntityStorageTest extends UnitTestCase {
public function testDelete() {
// Dependencies are tested in
// \Drupal\Tests\config\Kernel\ConfigDependencyTest.
- $this->configManager->expects($this->any())
- ->method('getConfigEntitiesToChangeOnDependencyRemoval')
+ $this->configManager
+ ->getConfigEntitiesToChangeOnDependencyRemoval('config', ['the_provider.the_config_prefix.foo'], FALSE)
->willReturn(['update' => [], 'delete' => [], 'unchanged' => []]);
+ $this->configManager
+ ->getConfigEntitiesToChangeOnDependencyRemoval('config', ['the_provider.the_config_prefix.bar'], FALSE)
+ ->willReturn(['update' => [], 'delete' => [], 'unchanged' => []]);
+
$entities = array();
- $configs = array();
- $config_map = array();
foreach (array('foo', 'bar') as $id) {
$entity = $this->getMockEntity(array('id' => $id));
$entities[] = $entity;
- $config_object = $this->getMockBuilder('Drupal\Core\Config\Config')
- ->disableOriginalConstructor()
- ->getMock();
- $config_object->expects($this->once())
- ->method('delete');
- $configs[] = $config_object;
- $config_map[] = array("the_config_prefix.$id", $config_object);
+
+ $config_object = $this->prophesize(Config::class);
+ $config_object->delete()->shouldBeCalled();
+
+ $this->configFactory->getEditable("the_provider.the_config_prefix.$id")
+ ->willReturn($config_object->reveal());
+
+ $this->moduleHandler->invokeAll('test_entity_type_predelete', [$entity])
+ ->shouldBeCalled();
+ $this->moduleHandler->invokeAll('entity_predelete', [$entity, 'test_entity_type'])
+ ->shouldBeCalled();
+
+ $this->moduleHandler->invokeAll('test_entity_type_delete', [$entity])
+ ->shouldBeCalled();
+ $this->moduleHandler->invokeAll('entity_delete', [$entity, 'test_entity_type'])
+ ->shouldBeCalled();
}
- $this->cacheTagsInvalidator->expects($this->once())
- ->method('invalidateTags')
- ->with(array(
- // List cache tag only; the own cache tag is invalidated by the config
- // system.
- $this->entityTypeId . '_list',
- ));
-
- $this->configFactory->expects($this->exactly(2))
- ->method('getEditable')
- ->will($this->returnValueMap($config_map));
-
- $this->moduleHandler->expects($this->at(0))
- ->method('invokeAll')
- ->with('test_entity_type_predelete');
- $this->moduleHandler->expects($this->at(1))
- ->method('invokeAll')
- ->with('entity_predelete');
- $this->moduleHandler->expects($this->at(2))
- ->method('invokeAll')
- ->with('test_entity_type_predelete');
- $this->moduleHandler->expects($this->at(3))
- ->method('invokeAll')
- ->with('entity_predelete');
- $this->moduleHandler->expects($this->at(4))
- ->method('invokeAll')
- ->with('test_entity_type_delete');
- $this->moduleHandler->expects($this->at(5))
- ->method('invokeAll')
- ->with('entity_delete');
- $this->moduleHandler->expects($this->at(6))
- ->method('invokeAll')
- ->with('test_entity_type_delete');
- $this->moduleHandler->expects($this->at(7))
- ->method('invokeAll')
- ->with('entity_delete');
+ $this->cacheTagsInvalidator->invalidateTags([$this->entityTypeId . '_list'])
+ ->shouldBeCalled();
$this->entityStorage->delete($entities);
}
@@ -914,13 +666,13 @@ class ConfigEntityStorageTest extends UnitTestCase {
* @covers ::doDelete
*/
public function testDeleteNothing() {
- $this->moduleHandler->expects($this->never())
- ->method($this->anything());
- $this->configFactory->expects($this->never())
- ->method('get');
+ $this->moduleHandler->getImplementations(Argument::cetera())->shouldNotBeCalled();
+ $this->moduleHandler->invokeAll(Argument::cetera())->shouldNotBeCalled();
- $this->cacheTagsInvalidator->expects($this->never())
- ->method('invalidateTags');
+ $this->configFactory->get(Argument::cetera())->shouldNotBeCalled();
+ $this->configFactory->getEditable(Argument::cetera())->shouldNotBeCalled();
+
+ $this->cacheTagsInvalidator->invalidateTags(Argument::cetera())->shouldNotBeCalled();
$this->entityStorage->delete(array());
}
@@ -936,7 +688,7 @@ class ConfigEntityStorageTest extends UnitTestCase {
* @return \Drupal\Core\Entity\EntityInterface|\PHPUnit_Framework_MockObject_MockObject
*/
public function getMockEntity(array $values = array(), $methods = array()) {
- return $this->getMockForAbstractClass('Drupal\Core\Config\Entity\ConfigEntityBase', array($values, 'test_entity_type'), '', TRUE, TRUE, TRUE, $methods);
+ return $this->getMockForAbstractClass(ConfigEntityBase::class, [$values, 'test_entity_type'], '', TRUE, TRUE, TRUE, $methods);
}
}
diff --git a/core/themes/seven/css/theme/ckeditor-dialog.css b/core/themes/seven/css/theme/ckeditor-dialog.css
index f3d2d86a7..b7d8dbbcc 100644
--- a/core/themes/seven/css/theme/ckeditor-dialog.css
+++ b/core/themes/seven/css/theme/ckeditor-dialog.css
@@ -139,7 +139,7 @@
[dir="rtl"] .cke_reset_all .cke_dialog .cke_dialog_footer {
text-align: right;
}
-.cke_reset_all .cke_resizer {
+.cke_reset_all .cke_dialog .cke_resizer {
display: none;
}
.cke_reset_all .cke_dialog_footer_buttons {
diff --git a/sites/default/default.settings.php b/sites/default/default.settings.php
index f31046651..03ee279d4 100644
--- a/sites/default/default.settings.php
+++ b/sites/default/default.settings.php
@@ -667,7 +667,7 @@ if ($settings['hash_salt']) {
/**
* Load services definition file.
*/
-$settings['container_yamls'][] = __DIR__ . '/services.yml';
+$settings['container_yamls'][] = $app_root . '/' . $site_path . '/services.yml';
/**
* Override the default service container class.
@@ -762,6 +762,13 @@ if (file_exists(__DIR__ . '/settings.pantheon.php')) {
*
* Keep this code block at the end of this file to take full effect.
*/
+<<<<<<< HEAD
if (file_exists(__DIR__ . '/settings.local.php')) {
include __DIR__ . '/settings.local.php';
}
+=======
+#
+# if (file_exists($app_root . '/' . $site_path . '/settings.local.php')) {
+# include $app_root . '/' . $site_path . '/settings.local.php';
+# }
+>>>>>>> b96f629ea4b63fb16b11b89c0a88fb8524e82359
diff --git a/sites/development.services.yml b/sites/development.services.yml
index 73cc99825..d2857c66f 100644
--- a/sites/development.services.yml
+++ b/sites/development.services.yml
@@ -2,6 +2,8 @@
#
# To activate this feature, follow the instructions at the top of the
# 'example.settings.local.php' file, which sits next to this file.
+parameters:
+ http.response.debug_cacheability_headers: true
services:
cache.backend.null:
class: Drupal\Core\Cache\NullBackendFactory