Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Unique option not working with templates (issue #291) #359

Closed
wants to merge 12 commits into from
Closed

Unique option not working with templates (issue #291) #359

Show file tree
Hide file tree
Changes from 4 commits
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
5e0cc05
set unique flag to property name if set within template
reinfi May 16, 2016
4375527
add test for unique within template
reinfi May 16, 2016
b06e68c
remove empty rows
reinfi May 16, 2016
963ba50
fix typo
reinfi May 16, 2016
bf46b79
reset template vars by raw name
reinfi May 17, 2016
990f667
fix finding of template properties
reinfi May 17, 2016
b821e0a
add more tests
reinfi May 17, 2016
2cd6555
set seed to generate new unique values
reinfi May 18, 2016
f0b960b
return extensions in reversed order
reinfi May 18, 2016
eb1a469
fix tests for changing extension order
reinfi May 18, 2016
2f3258b
switch arguments in assertion
reinfi May 18, 2016
8cb5f17
remove array_reverse, no clue whatfor it was
reinfi Jun 29, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 6 additions & 1 deletion src/Nelmio/Alice/Fixtures/Fixture.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -108,7 +108,12 @@ public function extendTemplate(Fixture $template)

foreach ($template->properties as $property) {
if (!isset($this->spec[$property->getName()])) {
$this->addProperty($property->getName(), $property->getValue());
$name = $property->getName();
if ($property->requiresUnique()) {
$name .= ' (unique)';
}

$this->addProperty($name, $property->getValue());
}
}
}
Expand Down
25 changes: 25 additions & 0 deletions tests/Nelmio/Alice/FixturesTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,31 @@ class FixturesTest extends \PHPUnit_Framework_TestCase
const GROUP = 'Nelmio\Alice\support\models\Group';
const CONTACT = 'Nelmio\Alice\support\models\Contact';

public function testLoadUniqueFromTemplateFixtures()
{
$objectManagerMock = $this->getMock('Doctrine\Common\Persistence\ObjectManager');
$metadataFactory = $this->getMock('Doctrine\Common\Persistence\Mapping\ClassMetadataFactory');
$metadata = $this->getMock('Doctrine\Common\Persistence\Mapping\ClassMetadata');

$objectManagerMock->expects($this->any())
->method('getMetadataFactory')
->will($this->returnValue($metadataFactory));

$metadataFactory->expects($this->any())
->method('getAllMetadata')
->will($this->returnValue([$metadata, $metadata, $metadata]));

$objects = Fixtures::load(__DIR__.'/support/fixtures/unique_with_template.yml', $objectManagerMock, ['providers' => [$this]]);

$this->assertCount(26, $objects);

$names = [];
foreach($objects as $object) {
$this->assertFalse(in_array($object->username, $names), sprintf('duplicate value %s', $object->username));
$names[] = $object->username;
}
}

public function testLoadLoadsYamlFilesAndDoctrinePersister()
{
$om = $this->getDoctrineManagerMock(14);
Expand Down
6 changes: 6 additions & 0 deletions tests/Nelmio/Alice/support/fixtures/unique_with_template.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
\Nelmio\Alice\support\models\User:
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think we need a more complete test for that one, e.g. add another non unique field to the template. It would be also good to have another example with two level deep, i.e.

  • template1: 2 fields with unique, 1 without
  • template2: extends template 1, override 1 unique field to make it not unique, add another unique field
  • 3: extends template 1

Don't hesitate to create dedicated entities for it if needed

user_template (template):
username (unique): <regexify('[A-Z]{1}')>

user_{1..26} (extends user_template):
email: <email()>