tonyair/silverstripe-behat-extension
1
0
Fork 0
mirror of https://github.com/silverstripe/silverstripe-behat-extension synced 2024-10-22 17:05:32 +02:00
Code Issues Projects Releases Wiki Activity

BUG Compatibility with 4.0 AssetStore API

Browse Source 
- Don't delete Folders (managed by backend)
- Fix deletion to match correct columns
- New assertion for matching files by filename and hash
- Skip createdFilesPath - Managed by backend not by behat anymore
This commit is contained in:
Damian Mooyman 2016-02-24 14:27:46 +13:00
parent 1f5f93ddba
commit 58b1d87c36
1 changed files with 18 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -107,7 +107,7 @@ class FixtureContext extends BehatContext
$store = $this->getAssetStore(); $store = $this->getAssetStore();
if (is_array($this->createdAssets)) { if (is_array($this->createdAssets)) {
foreach ($this->createdAssets as $asset) { foreach ($this->createdAssets as $asset) {
$store->delete($asset['Filename'], $asset['Hash']); $store->delete($asset['FileFilename'], $asset['FileHash']);
} }
} }
} }
@ -474,6 +474,18 @@ class FixtureContext extends BehatContext
assertFileExists($this->joinPaths(BASE_PATH, $path)); assertFileExists($this->joinPaths(BASE_PATH, $path));
} }
/**
* Checks that a file exists in the asset store with a given filename and hash
*
* Example: there should be a filename "Uploads/test.jpg" with hash "59de0c841f"
*
* @Then /^there should be a filename "(?<filename>[^"]*)" with hash "(?<hash>[a-fA-Z0-9]+)"/
*/
public function stepThereShouldBeAFileWithTuple($filename, $hash) {
$exists = $this->getAssetStore()->exists($filename, $hash);
assertTrue((bool)$exists, "A file exists with filename $filename and hash $hash");
}
/** /**
* Replaces fixture references in values with their respective database IDs, * Replaces fixture references in values with their respective database IDs,
* with the notation "=><class>.<identifier>". Example: "=>Page.My Page". * with the notation "=><class>.<identifier>". Example: "=>Page.My Page".
@ -547,19 +559,15 @@ class FixtureContext extends BehatContext
$sourcePath = $this->joinPaths($this->getFilesPath(), basename($relativeTargetPath)); $sourcePath = $this->joinPaths($this->getFilesPath(), basename($relativeTargetPath));
// Create file or folder on filesystem // Create file or folder on filesystem
$parent = null;
if($class == 'Folder' || is_subclass_of($class, 'Folder')) { if($class == 'Folder' || is_subclass_of($class, 'Folder')) {
$parent = \Folder::find_or_make($relativeTargetPath); $parent = \Folder::find_or_make($relativeTargetPath);
$targetPath = $this->joinPaths(ASSETS_PATH, $relativeTargetPath);
$data['ID'] = $parent->ID; $data['ID'] = $parent->ID;
$this->createdAssets[] = $parent->File->getValue();
} else { } else {
$parent = \Folder::find_or_make(dirname($relativeTargetPath)); $parent = \Folder::find_or_make(dirname($relativeTargetPath));
$this->createdAssets[] = $parent->File->getValue();
if(!file_exists($sourcePath)) { if(!file_exists($sourcePath)) {
throw new \InvalidArgumentException(sprintf( throw new \InvalidArgumentException(sprintf(
'Source file for "%s" cannot be found in "%s"', 'Source file for "%s" cannot be found in "%s"',
$targetPath, $relativeTargetPath,
$sourcePath $sourcePath
)); ));
} }
@ -579,17 +587,15 @@ class FixtureContext extends BehatContext
$data['FileFilename'] = $asset['Filename']; $data['FileFilename'] = $asset['Filename'];
$data['FileHash'] = $asset['Hash']; $data['FileHash'] = $asset['Hash'];
$data['FileVariant'] = $asset['Variant']; $data['FileVariant'] = $asset['Variant'];
// Strip base from url to get dir relative to base
$url = $this->getAssetStore()->getAsURL($asset['Filename'], $asset['Hash'], $asset['Variant']);
$targetPath = $this->joinPaths(BASE_PATH, substr($url, strlen(\Director::baseURL())));
} }
if(!isset($data['Name'])) { if(!isset($data['Name'])) {
$data['Name'] = basename($relativeTargetPath); $data['Name'] = basename($relativeTargetPath);
} }
$this->createdFilesPaths[] = $targetPath; // Save assets
if(isset($data['FileFilename'])) {
$this->createdAssets[] = $data; $this->createdAssets[] = $data;
}
return $data; return $data;
} }