Commit 673e1e58 authored by webchick's avatar webchick

Issue #2279071 by andypost: Fixed Fragile form_id generation for bundlable entity forms.

parent 37709d66
......@@ -73,11 +73,9 @@ public function getBaseFormID() {
* {@inheritdoc}
*/
public function getFormId() {
$entity_type = $this->entity->getEntityTypeId();
$bundle = $this->entity->bundle();
$form_id = $entity_type;
if ($bundle != $entity_type) {
$form_id = $bundle . '_' . $form_id;
$form_id = $this->entity->getEntityTypeId();
if ($this->entity->getEntityType()->hasKey('bundle')) {
$form_id = $this->entity->bundle() . '_' . $form_id;
}
if ($this->operation != 'default') {
$form_id = $form_id . '_' . $this->operation;
......
<?php
/**
* @file
* Contains \Drupal\Tests\Core\Entity\EntityFormTest.
*/
namespace Drupal\Tests\Core\Entity;
use Drupal\Core\Entity\EntityForm;
use Drupal\Tests\UnitTestCase;
/**
* @coversDefaultClass \Drupal\Core\Entity\EntityForm
* @group Entity
*/
class EntityFormTest extends UnitTestCase {
/**
* The mocked entity form.
*
* @var \Drupal\Core\Entity\EntityFormInterface|\PHPUnit_Framework_MockObject_MockObject
*/
protected $entityForm;
/**
* {@inheritdoc}
*/
protected function setUp() {
parent::setUp();
$this->entityForm = new EntityForm();
}
/**
* Tests the form ID generation.
*
* @covers ::getFormId()
*
* @dataProvider providerTestFormIds
*/
public function testFormId($expected, $definition) {
$entity_type = $this->getMock('Drupal\Core\Entity\EntityTypeInterface');
$entity_type->expects($this->any())
->method('hasKey')
->with('bundle')
->will($this->returnValue($definition['bundle']));
$entity = $this->getMockForAbstractClass('Drupal\Core\Entity\Entity', array(array(), $definition['entity_type']), '', TRUE, TRUE, TRUE, array('getEntityType', 'bundle'));
$entity->expects($this->any())
->method('getEntityType')
->will($this->returnValue($entity_type));
$entity->expects($this->any())
->method('bundle')
->will($this->returnValue($definition['bundle']));
$this->entityForm->setEntity($entity);
$this->entityForm->setOperation($definition['operation']);
$this->assertSame($expected, $this->entityForm->getFormId());
}
/**
* Provides test data for testFormId().
*/
public function providerTestFormIds() {
return array(
array('article_node_form', array(
'bundle' => 'article',
'entity_type' => 'node',
'operation' => 'default',
)),
array('article_node_delete_form', array(
'bundle' => 'article',
'entity_type' => 'node',
'operation' => 'delete',
)),
array('user_user_form', array(
'bundle' => 'user',
'entity_type' => 'user',
'operation' => 'default',
)),
array('user_form', array(
'bundle' => '',
'entity_type' => 'user',
'operation' => 'default',
)),
array('user_delete_form', array(
'bundle' => '',
'entity_type' => 'user',
'operation' => 'delete',
)),
);
}
}
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment