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

Merge remote-tracking branch 'origin/0.1'

This commit is contained in:
Ingo Schommer 2013-07-11 16:02:15 +02:00
parent 3928919964 0e0c601a4a
commit d734586346
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -130,7 +130,7 @@ class FixtureContext extends BehatContext
public function stepCreateRecord($type, $id)
{
$class = $this->convertTypeToClass($type);
if(is_a($class, 'File', true)) {
if($class == 'File' || is_subclass_of($class, 'File')) {
$fields = $this->prepareAsset($class, $id);
} else {
$fields = array();
@ -155,7 +155,7 @@ class FixtureContext extends BehatContext
$class,
array_combine($matches['key'], $matches['value'])
);
if(is_a($class, 'File', true)) {
if($class == 'File' || is_subclass_of($class, 'File')) {
$fields = $this->prepareAsset($class, $id, $fields);
}
$this->fixtureFactory->createObject($class, $id, $fields);
@ -174,7 +174,7 @@ class FixtureContext extends BehatContext
$class = $this->convertTypeToClass($type);
// TODO Support more than one record
$fields = $this->convertFields($class, $fieldsTable->getRowsHash());
if(is_a($class, 'File', true)) {
if($class == 'File' || is_subclass_of($class, 'File')) {
$fields = $this->prepareAsset($class, $id, $fields);
}
$this->fixtureFactory->createObject($class, $id, $fields);
@ -374,7 +374,7 @@ class FixtureContext extends BehatContext
$sourcePath = $this->joinPaths($this->getFilesPath(), basename($relativeTargetPath));
// Create file or folder on filesystem
if(is_a($class, 'Folder', true)) {
if($class == 'Folder' || is_subclass_of($class, 'Folder')) {
$parent = \Folder::find_or_make($relativeTargetPath);
} else {
if(!file_exists($sourcePath)) {
@ -410,7 +410,7 @@ class FixtureContext extends BehatContext
// Try direct mapping
$class = str_replace(' ', '', ucfirst($type));
if(class_exists($class) || !is_a($class, 'DataObject', true)) {
if(class_exists($class) || !($class == 'DataObject' || is_subclass_of($class, 'DataObject'))) {
return $class;
}