From d39c8ebd29800d056cf0b1aada22047f6c164d8a Mon Sep 17 00:00:00 2001
From: Ingo Schommer <ingo@silverstripe.com>
Date: Thu, 22 Oct 2015 13:27:09 +1300
Subject: [PATCH] Fix nested folder fixture creation

Fixes regression caused by 8d49da260988b1cee1eac420f37bfe80d4c0eb6b
prepareAsset('Folder','some/folder') would create some/folder/folder due to wrong ParentID relations.
Also set the 'ID' of folders to avoid creating them again.
---
 src/SilverStripe/BehatExtension/Context/FixtureContext.php | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/src/SilverStripe/BehatExtension/Context/FixtureContext.php b/src/SilverStripe/BehatExtension/Context/FixtureContext.php
index b7a54ac..e365e8b 100644
--- a/src/SilverStripe/BehatExtension/Context/FixtureContext.php
+++ b/src/SilverStripe/BehatExtension/Context/FixtureContext.php
@@ -550,6 +550,7 @@ class FixtureContext extends BehatContext
 		if($class == 'Folder' || is_subclass_of($class, 'Folder')) {
 			$parent = \Folder::find_or_make($relativeTargetPath);
 			$targetPath = $this->joinPaths(ASSETS_PATH, $relativeTargetPath);
+			$data['ID'] = $parent->ID;
 		} else {
 			$parent = \Folder::find_or_make(dirname($relativeTargetPath));
 			if(!file_exists($sourcePath)) {
@@ -559,6 +560,8 @@ class FixtureContext extends BehatContext
 					$sourcePath
 				));
 			}
+			$data['ParentID'] = $parent->ID;
+			
 			// Load file into APL and retrieve tuple
 			$asset = $this->getAssetStore()->setFromLocalFile(
 				$sourcePath,
@@ -575,13 +578,9 @@ class FixtureContext extends BehatContext
 			$url = $this->getAssetStore()->getAsURL($asset['Filename'], $asset['Hash'], $asset['Variant']);
 			$targetPath = $this->joinPaths(BASE_PATH, substr($url, strlen(\Director::baseURL())));
 		}
-		unset($data['Filename']);
 		if(!isset($data['Name'])) {
 			$data['Name'] = basename($relativeTargetPath);
 		}
-		if($parent) {
-			$data['ParentID'] = $parent->ID;
-		}
 
 		$this->createdFilesPaths[] = $targetPath;