diff --git a/core/lib/Drupal/Core/Config/Entity/ConfigDependencyManager.php b/core/lib/Drupal/Core/Config/Entity/ConfigDependencyManager.php index ba6d204..342c055 100644 --- a/core/lib/Drupal/Core/Config/Entity/ConfigDependencyManager.php +++ b/core/lib/Drupal/Core/Config/Entity/ConfigDependencyManager.php @@ -22,7 +22,7 @@ * The configuration dependency value is structured like so: * * array( - * 'config => array( + * 'entity => array( * // An array of configuration entity object names. * ), * 'module' => array( @@ -33,7 +33,7 @@ * ), * 'fixed' => array( * // An array of fixed configuration dependencies. - * 'config' => array(), + * 'entity' => array(), * 'module' => array(), * 'theme' => array(), * ), diff --git a/core/modules/comment/src/Tests/CommentFieldsTest.php b/core/modules/comment/src/Tests/CommentFieldsTest.php index 017f3fb..bec1f5a 100644 --- a/core/modules/comment/src/Tests/CommentFieldsTest.php +++ b/core/modules/comment/src/Tests/CommentFieldsTest.php @@ -79,10 +79,17 @@ public function testCommentFieldDelete() { 'type' => 'test_node_type', )); + $this->drupalLogin($this->web_user); + + $this->drupalGet('node/' . $node->nid->value); + $elements = $this->cssSelect('.field-type-comment'); + $this->assertEqual(2, count($elements), 'There are two comment fields on the node.'); + // Delete the first comment field. FieldStorageConfig::loadByName('node', 'comment')->delete(); $this->drupalGet('node/' . $node->nid->value); - $this->assertResponse(200); + $elements = $this->cssSelect('.field-type-comment'); + $this->assertEqual(1, count($elements), 'There is one comment field on the node.'); } /** diff --git a/core/modules/config/tests/config_test/src/Entity/ConfigTest.php b/core/modules/config/tests/config_test/src/Entity/ConfigTest.php index a661788..e61e672 100644 --- a/core/modules/config/tests/config_test/src/Entity/ConfigTest.php +++ b/core/modules/config/tests/config_test/src/Entity/ConfigTest.php @@ -137,6 +137,16 @@ public function onDependencyRemoval(array $dependencies) { } } + /** + * Sets the fixed dependencies. + * + * @param array $dependencies + * A config dependency array. + * + * @return $this + * + * @see \Drupal\Core\Config\Entity\ConfigDependencyManager + */ public function setFixedDependencies(array $dependencies) { $this->dependencies['fixed'] = $dependencies; return $this;