From 78196200133b22a251b2a3ffce617036cdf47857 Mon Sep 17 00:00:00 2001
From: Eric Espie <eric.espie@combodo.com>
Date: Fri, 17 Apr 2026 15:32:12 +0200
Subject: [PATCH] :white_check_mark: Fix CI

---
 setup/sequencers/DataAuditSequencer.php       |  4 +++-
 .../sequencers/DataAuditSequencerTest.php     | 23 +++++++++----------
 2 files changed, 14 insertions(+), 13 deletions(-)

diff --git a/setup/sequencers/DataAuditSequencer.php b/setup/sequencers/DataAuditSequencer.php
index 62862207fd..857e5a81a4 100644
--- a/setup/sequencers/DataAuditSequencer.php
+++ b/setup/sequencers/DataAuditSequencer.php
@@ -72,7 +72,9 @@ class DataAuditSequencer extends StepSequencer
 					return $this->GetNextStep('complete', 'Check Completed', 100);
 
 				case 'setup-audit':
-					$this->oRunTimeEnvironment->DataToCleanupAudit();
+					if ($this->IsDataAuditRequired()) {
+						$this->oRunTimeEnvironment->DataToCleanupAudit();
+					}
 					return $this->GetNextStep('complete', 'Check Completed', 100);
 
 				case 'complete':
diff --git a/tests/php-unit-tests/unitary-tests/setup/sequencers/DataAuditSequencerTest.php b/tests/php-unit-tests/unitary-tests/setup/sequencers/DataAuditSequencerTest.php
index 4cb2b988d5..ae6e8e2347 100644
--- a/tests/php-unit-tests/unitary-tests/setup/sequencers/DataAuditSequencerTest.php
+++ b/tests/php-unit-tests/unitary-tests/setup/sequencers/DataAuditSequencerTest.php
@@ -5,7 +5,6 @@ namespace Combodo\iTop\Test\UnitTest\Setup\Sequencers;
 use Combodo\iTop\Test\UnitTest\ItopTestCase;
 use DataAuditSequencer;
 use PHPParameters;
-use PHPUnit\Framework\TestCase;
 
 class DataAuditSequencerTest extends ItopTestCase
 {
@@ -106,8 +105,8 @@ class DataAuditSequencerTest extends ItopTestCase
 		$aExpected = [
 			'status' => 1,
 			'message' => '',
-			'next-step' => '',
-			'next-step-label' => 'Completed',
+			'next-step' => 'complete',
+			'next-step-label' => 'Check Completed',
 			'percentage-completed' => 100,
 		];
 		$this->assertEquals($aExpected, $aRes);
@@ -129,8 +128,8 @@ class DataAuditSequencerTest extends ItopTestCase
 		$aExpected = [
 			'status' => 1,
 			'message' => '',
-			'next-step' => '',
-			'next-step-label' => 'Completed',
+			'next-step' => 'complete',
+			'next-step-label' => 'Check Completed',
 			'percentage-completed' => 100,
 		];
 		$this->assertEquals($aExpected, $aRes);
@@ -159,7 +158,7 @@ class DataAuditSequencerTest extends ItopTestCase
 	{
 		$oRunTimeEnvironment = $this->createMock(\RunTimeEnvironment::class);
 		$oRunTimeEnvironment->expects($this->once())->method('DataToCleanupAudit');
-		$oRunTimeEnvironment->expects($this->once())->method('GetFinalEnv')
+		$oRunTimeEnvironment->expects($this->any())->method('GetFinalEnv')
 			->willReturn('production');
 
 		$aAdditionalParams = [
@@ -171,8 +170,8 @@ class DataAuditSequencerTest extends ItopTestCase
 		$aExpected = [
 			'status' => 1,
 			'message' => '',
-			'next-step' => '',
-			'next-step-label' => 'Completed',
+			'next-step' => 'complete',
+			'next-step-label' => 'Check Completed',
 			'percentage-completed' => 100,
 		];
 		$this->assertEquals($aExpected, $aRes);
@@ -193,8 +192,8 @@ class DataAuditSequencerTest extends ItopTestCase
 		$aExpected = [
 			'status' => 1,
 			'message' => '',
-			'next-step' => '',
-			'next-step-label' => 'Completed',
+			'next-step' => 'complete',
+			'next-step-label' => 'Check Completed',
 			'percentage-completed' => 100,
 		];
 		$this->assertEquals($aExpected, $aRes);
@@ -213,8 +212,8 @@ class DataAuditSequencerTest extends ItopTestCase
 		$aExpected = [
 			'status' => 1,
 			'message' => '',
-			'next-step' => '',
-			'next-step-label' => 'Completed',
+			'next-step' => 'complete',
+			'next-step-label' => 'Check Completed',
 			'percentage-completed' => 100,
 		];
 		$this->assertEquals($aExpected, $aRes);