Skip to content

Commit b89ea0a

Browse files
authored
Merge pull request #40 from firegento/develop
Version 1.3.1
2 parents 231fde2 + 1c37382 commit b89ea0a

File tree

3 files changed

+3
-5
lines changed

3 files changed

+3
-5
lines changed

src/app/code/community/FireGento/AdminMonitoring/Model/History/Data.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -61,8 +61,8 @@ public function getSerializedContent()
6161
public function getContent()
6262
{
6363
// have to re-load the model as based on database datatypes the format of values changes
64-
$className = get_class($this->_savedModel);
65-
$model = new $className;
64+
$model = clone $this->_savedModel;
65+
$model->setData(array());
6666

6767
// Add store id if given
6868
if ($storeId = $this->_savedModel->getStoreId()) {

src/app/code/community/FireGento/AdminMonitoring/Test/Block/Adminhtml/History.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@
2424
*
2525
* @group FireGento_AdminMonitoring
2626
*/
27-
class FireGento_AdminMonitoring_Test_Block_Adminhtml_History extends EcomDev_PHPUnit_Test_Case
27+
class FireGento_AdminMonitoring_Test_Block_Adminhtml_History extends EcomDev_PHPUnit_Test_Case_Controller
2828
{
2929
/**
3030
* @var FireGento_AdminMonitoring_Block_Adminhtml_History

src/app/code/community/FireGento/AdminMonitoring/Test/Config/Config.php

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -32,12 +32,10 @@ class FireGento_AdminMonitoring_Test_Config_Config extends EcomDev_PHPUnit_Test_
3232
*/
3333
public function globalConfig()
3434
{
35-
$this->assertModuleVersion($this->expected('module')->getVersion());
3635
$this->assertModuleCodePool($this->expected('module')->getCodePool());
3736

3837
$this->assertSetupResourceDefined();
3938
$this->assertSetupResourceExists();
40-
$this->assertSetupScriptVersions();
4139

4240
$this->assertTableAlias('firegento_adminmonitoring/history', 'firegento_adminmonitoring_history');
4341
}

0 commit comments

Comments
 (0)