tonyair
/
silverstripe-behat-extension
mirror of https://github.com/silverstripe/silverstripe-behat-extension
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge pull request #19 from madmatt/pulls/fix-fixture-parentid 

Fix FixtureContext::prepareAsset() assuming Parent exists
This commit is contained in:
Ingo Schommer 2014-01-30 15:06:39 -08:00
parent 95f832d263 d9d0b4fa93
commit db5dfa0e01
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/SilverStripe/BehatExtension/Context/FixtureContext.php
View File

@ -455,7 +455,7 @@ class FixtureContext extends BehatContext
}
$data['Filename'] = $this->joinPaths(ASSETS_DIR, $relativeTargetPath);
if(!isset($data['Name'])) $data['Name'] = basename($relativeTargetPath);
$data['ParentID'] = $parent->ID;
if($parent) $data['ParentID'] = $parent->ID;
$this->createdFilesPaths[] = $targetPath;