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

allow changing existing scopes

app/code/community/EcomDev/PHPUnit/Model/Fixture.php

@@ -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;
     }