Commit a2e81d5f authored by Ivan Chepurnyi's avatar Ivan Chepurnyi

Merge pull request #47 from fooman/allow-updating-existing-scopes

allow changing existing scopes
parents 5b0db121 ac9eb457
......@@ -801,9 +801,9 @@ class EcomDev_PHPUnit_Model_Fixture
return false;
}
$scopeModel = Mage::getModel(self::$_scopeModelByType[$type]);
$scopeModel->setData($row);
$scopeModel = Mage::getModel(self::$_scopeModelByType[$type])->load($row[$type . '_id']);
$isNew = !$scopeModel->getId();
if ($isNew) {
// Change property for saving new objects with specified ids
EcomDev_Utils_Reflection::setRestrictedPropertyValues(
$scopeModel->getResource(),
......@@ -811,9 +811,11 @@ class EcomDev_PHPUnit_Model_Fixture
'_isPkAutoIncrement' => false
)
);
$scopeModel->isObjectNew(true);
}
$scopeModel->setData($row);
$scopeModel->save();
if ($isNew) {
// Revert changed property
EcomDev_Utils_Reflection::setRestrictedPropertyValues(
$scopeModel->getResource(),
......@@ -821,6 +823,7 @@ class EcomDev_PHPUnit_Model_Fixture
'_isPkAutoIncrement' => true
)
);
}
return $scopeModel;
}
......
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