mirror of
https://github.com/Combodo/iTop.git
synced 2026-08-17 19:28:22 +02:00
Compare commits
2 Commits
develop
...
feature/99
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
7ac368770d | ||
|
|
eae54df7dc |
@@ -118,7 +118,11 @@ class DataAuditSequencer extends StepSequencer
|
||||
}
|
||||
|
||||
$sFinalEnvDir = APPROOT.'env-'.$this->oRunTimeEnvironment->GetFinalEnv();
|
||||
return is_dir($sFinalEnvDir);
|
||||
if (! is_dir($sFinalEnvDir)) {
|
||||
return false;
|
||||
}
|
||||
|
||||
return count(glob($sFinalEnvDir."/**")) > 0;
|
||||
}
|
||||
|
||||
public function GetStepNames(): array
|
||||
|
||||
@@ -376,6 +376,27 @@ class DataAuditSequencerTest extends ItopTestCase
|
||||
self::assertFalse($this->InvokeNonPublicMethod(DataAuditSequencer::class, "IsDataAuditRequired", $oSequencer));
|
||||
}
|
||||
|
||||
public function testIsDataAuditRequired_NoAuditWhenEnvProductionFolderIsEmpty()
|
||||
{
|
||||
$oRunTimeEnvironment = $this->createMock(\RunTimeEnvironment::class);
|
||||
$oRunTimeEnvironment->expects($this->once())->method('GetApplicationVersion')
|
||||
->willReturn(['product_version' => ITOP_VERSION_FULL]);
|
||||
$oRunTimeEnvironment->expects($this->once())->method("GetFinalEnv")->willReturn("production-gabuzomeu");
|
||||
|
||||
$sFolder = APPROOT.'env-production-gabuzomeu';
|
||||
if (! is_dir($sFolder)) {
|
||||
mkdir($sFolder);
|
||||
$this->aFileToClean [] = $sFolder;
|
||||
}
|
||||
|
||||
$aAdditionalParams = [
|
||||
'mode' => 'upgrade',
|
||||
'optional_steps' => ['setup-audit' => true ],
|
||||
];
|
||||
$oSequencer = new DataAuditSequencer($this->GivenParams($aAdditionalParams), $oRunTimeEnvironment);
|
||||
self::assertFalse($this->InvokeNonPublicMethod(DataAuditSequencer::class, "IsDataAuditRequired", $oSequencer));
|
||||
}
|
||||
|
||||
public function testIsDataAuditRequired_NoAuditTriggeredBecauseDisabled()
|
||||
{
|
||||
$oRunTimeEnvironment = $this->createMock(\RunTimeEnvironment::class);
|
||||
|
||||
Reference in New Issue
Block a user