Merge pull request #40 from firegento/develop

Version 1.3.1
firegento · Jun 15, 2020 · b89ea0a · b89ea0a
2 parents 231fde2 + 1c37382
commit b89ea0a
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 5 deletions.
diff --git a/src/app/code/community/FireGento/AdminMonitoring/Model/History/Data.php b/src/app/code/community/FireGento/AdminMonitoring/Model/History/Data.php
@@ -61,8 +61,8 @@ public function getSerializedContent()
     public function getContent()
     {
         // have to re-load the model as based on database datatypes the format of values changes
-        $className = get_class($this->_savedModel);
-        $model = new $className;
+        $model = clone $this->_savedModel;
+        $model->setData(array());
 
         // Add store id if given
         if ($storeId = $this->_savedModel->getStoreId()) {

diff --git a/src/app/code/community/FireGento/AdminMonitoring/Test/Block/Adminhtml/History.php b/src/app/code/community/FireGento/AdminMonitoring/Test/Block/Adminhtml/History.php
@@ -24,7 +24,7 @@
  *
  * @group FireGento_AdminMonitoring
  */
-class FireGento_AdminMonitoring_Test_Block_Adminhtml_History extends EcomDev_PHPUnit_Test_Case
+class FireGento_AdminMonitoring_Test_Block_Adminhtml_History extends EcomDev_PHPUnit_Test_Case_Controller
 {
     /**
      * @var FireGento_AdminMonitoring_Block_Adminhtml_History

diff --git a/src/app/code/community/FireGento/AdminMonitoring/Test/Config/Config.php b/src/app/code/community/FireGento/AdminMonitoring/Test/Config/Config.php
@@ -32,12 +32,10 @@ class FireGento_AdminMonitoring_Test_Config_Config extends EcomDev_PHPUnit_Test_
      */
     public function globalConfig()
     {
-        $this->assertModuleVersion($this->expected('module')->getVersion());
         $this->assertModuleCodePool($this->expected('module')->getCodePool());
 
         $this->assertSetupResourceDefined();
         $this->assertSetupResourceExists();
-        $this->assertSetupScriptVersions();
 
         $this->assertTableAlias('firegento_adminmonitoring/history', 'firegento_adminmonitoring_history');
     }