Merge remote-tracking branch 'origin/support/2.7' into support/3.0

# Conflicts:
#	test/integration/iTopModulesPhpVersionChecklistTest.php
This commit is contained in:
Pierre Goiffon
2022-08-24 14:44:05 +02:00
2 changed files with 12 additions and 6 deletions

View File

@@ -21,8 +21,6 @@ use iTopDesignFormat;
/**
* @group itop-community
*
* @covers iTopDesignFormat
*
* @package Combodo\iTop\Test\UnitTest\Setup
@@ -38,12 +36,17 @@ class iTopModulesXmlVersionIntegrationTest extends ItopTestCase
/**
* Verify if the datamodel.*.xml files refer to the latest version of the design
* Verify if the `datamodels/2.x/datamodel.*.xml` files refer to the latest version of the design
* This is an integration test
*
* As ess and pro targets are copying modules into datamodels/2.x this test can only be run on a community target !
*
* @group itop-community
* @group skipPostBuild
*
* @dataProvider DatamodelItopXmlVersionProvider
*
* @since 3.0.3 3.1.0 move itop-community group in this method
*/
public function testDatamodelItopXmlVersion($sXmlFile)
{