Only return enabled features

2 files changed, 13 insertions, 6 deletions

diff --git a/tests/api/GetConfigCest.php b/tests/api/GetConfigCest.php
index 329386f9..716e6c46 100644
--- a/tests/api/GetConfigCest.php
+++ b/tests/api/GetConfigCest.php
@@ -23,10 +23,14 @@ class GetConfigCest {
 	private $params = [
 		'extramediatypes' => false
 	];
-	private $features = [
+	/**
+	 * Has to match what is in the dataSetup configuration
+	 *
+	 * @var array
+	 */
+	private $parsedFeatures = [
 		'features' => [
 			'external_shares' => 'yes',
-			'native_svg'      => 'no',
 		]
 	];
 	private $mediaTypes = [
@@ -71,7 +75,7 @@ class GetConfigCest {
 		 * Warning: Needs to match what is in the test config
 		 * If we automate the detection, we're dependant on the results created by a 3rd party lib
 		 */
-		$I->seeResponseContainsJson($this->features);
+		$I->seeResponseContainsJson($this->parsedFeatures);
 		/**
 		 * TODO Replace with JSONPath once the library is fixed
 		 */
@@ -145,7 +149,7 @@ class GetConfigCest {
 		$I->expectTo('see the same config as in getConfig()');
 
 		$this->tryToGetAValidConfig($I);
-		$I->seeResponseContainsJson($this->features);
+		$I->seeResponseContainsJson($this->parsedFeatures);
 		$I->seeResponseContainsJson($this->mediaTypes);
 
 		$I->fixMyConfigFile();
diff --git a/tests/unit/config/ConfigParserTest.php b/tests/unit/config/ConfigParserTest.php
index db3a5619..e3714b5b 100644
--- a/tests/unit/config/ConfigParserTest.php
+++ b/tests/unit/config/ConfigParserTest.php
@@ -51,6 +51,9 @@ class ConfigParserTest extends \Test\GalleryUnitTest {
 			'external_shares' => "no",
 			'native_svg'      => "yes",
 		];
+		$parsedFeatureList = [
+			'native_svg'      => "yes",
+		];
 		$features = [
 			'features' => $featureList
 		];
@@ -60,8 +63,8 @@ class ConfigParserTest extends \Test\GalleryUnitTest {
 			[$noFeatures, false, []],
 			[$emptyFeatures, false, []],
 			[$emptyFeatures, true, []],
-			[$features, false, $featureList],
-			[$features, true, $featureList],
+			[$features, false, $parsedFeatureList],
+			[$features, true, $parsedFeatureList],
 		];
 	}