diff --git a/resources/app-info-shipped.xsd b/resources/app-info-shipped.xsd index db51ec15c78..4046ff44bc5 100644 --- a/resources/app-info-shipped.xsd +++ b/resources/app-info-shipped.xsd @@ -67,6 +67,8 @@ maxOccurs="1"/> + - + - - + @@ -529,6 +531,18 @@ + + + + + + + + + + + + diff --git a/resources/app-info.xsd b/resources/app-info.xsd index cee16b0cedc..52d55d095d2 100644 --- a/resources/app-info.xsd +++ b/resources/app-info.xsd @@ -65,6 +65,8 @@ maxOccurs="1"/> + - - + - - + @@ -525,6 +527,18 @@ + + + + + + + + + + + + diff --git a/tests/data/app/expected-info.json b/tests/data/app/expected-info.json index 9c5ce230cad..3154644e472 100644 --- a/tests/data/app/expected-info.json +++ b/tests/data/app/expected-info.json @@ -91,5 +91,11 @@ "admin-section": [], "personal": [], "personal-section": [] + }, + "openmetrics": { + "exporter": [ + "OC\\OpenMetrics\\Exporters\\ActiveSessions", + "OC\\OpenMetrics\\Exporters\\ActiveUsers" + ] } } diff --git a/tests/data/app/valid-info.xml b/tests/data/app/valid-info.xml index 811fa634264..00d895b275a 100644 --- a/tests/data/app/valid-info.xml +++ b/tests/data/app/valid-info.xml @@ -35,4 +35,9 @@ caldav + + + OC\OpenMetrics\Exporters\ActiveSessions + OC\OpenMetrics\Exporters\ActiveUsers + diff --git a/tests/data/app/various-single-item.json b/tests/data/app/various-single-item.json index ae5e751ab49..ff395f5199d 100644 --- a/tests/data/app/various-single-item.json +++ b/tests/data/app/various-single-item.json @@ -46,5 +46,10 @@ "personal-section": [] }, "two-factor-providers": [], - "types": [] + "types": [], + "openmetrics": { + "exporter": [ + "OC\\OpenMetrics\\Exporters\\ActiveUsers" + ] + } } diff --git a/tests/data/app/various-single-item.xml b/tests/data/app/various-single-item.xml index cb9595516e1..38647c8de20 100644 --- a/tests/data/app/various-single-item.xml +++ b/tests/data/app/various-single-item.xml @@ -19,4 +19,8 @@ + + + OC\OpenMetrics\Exporters\ActiveUsers + diff --git a/tests/lib/App/InfoParserTest.php b/tests/lib/App/InfoParserTest.php index 57a1a02781e..1465896a8ee 100644 --- a/tests/lib/App/InfoParserTest.php +++ b/tests/lib/App/InfoParserTest.php @@ -45,8 +45,6 @@ class InfoParserTest extends TestCase { public static function providesInfoXml(): array { return [ - ['expected-info.json', 'valid-info.xml'], - [null, 'invalid-info.xml'], ['expected-info.json', 'valid-info.xml'], [null, 'invalid-info.xml'], ['navigation-one-item.json', 'navigation-one-item.xml'],