Skip to content

E
EcomDev_PHPUnit
Commit 35c08fbf authored by Ivan Chepurnyi's avatar Ivan Chepurnyi Committed by GitHub
Browse files
Options

Merge pull request #283 from colinmollenhour/dev 

Fix default value for 'attribute_set_id'.
parents 7ecc5276 df54041a
Hide whitespace changes
Inline Side-by-side
Showing with 2 additions and 2 deletions
app/code/community/EcomDev/PHPUnit/Model/Fixture/Processor/Tables.php
View file @ 35c08fbf
...@@ -107,7 +107,7 @@ class EcomDev_PHPUnit_Model_Fixture_Processor_Tables ...@@ -107,7 +107,7 @@ class EcomDev_PHPUnit_Model_Fixture_Processor_Tables
$this->getResource()->cleanTable($tableEntity); $this->getResource()->cleanTable($tableEntity);
} }
foreach (array_keys($data) as $tableEntity) { foreach (array_keys($data) as $tableEntity) {
if (isset($restoreTableData[$tableEntity])) { if ( ! empty($restoreTableData[$tableEntity])) {
$this->getResource()->loadTableData($tableEntity, $restoreTableData[$tableEntity]); $this->getResource()->loadTableData($tableEntity, $restoreTableData[$tableEntity]);
} }
} }
......
app/code/community/EcomDev/PHPUnit/Model/Mysql4/Fixture/AbstractEav.php
View file @ 35c08fbf
...@@ -255,7 +255,7 @@ abstract class EcomDev_PHPUnit_Model_Mysql4_Fixture_AbstractEav ...@@ -255,7 +255,7 @@ abstract class EcomDev_PHPUnit_Model_Mysql4_Fixture_AbstractEav
$defaultAttributeSet = 0; $defaultAttributeSet = 0;
} }
$values[$index]['attribute_set_id'] = $defaultAttributeSet; $row['attribute_set_id'] = $defaultAttributeSet;
} }
// Preparing entity table record // Preparing entity table record
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment