Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/nextcloud/server.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
path: root/build
diff options
context:
space:
mode:
authorArthur Schiwon <blizzz@arthur-schiwon.de>2021-06-25 23:07:33 +0300
committerbackportbot[bot] <backportbot[bot]@users.noreply.github.com>2021-06-30 08:15:50 +0300
commit4565f5d3b4e2713b6959344ceb85d85f63649fc0 (patch)
tree8db61a133fb47f198eaa90505c4f8805666e2669 /build
parent9d6c11f7daa0c6cdb8523b3cf454aa070c1c55a7 (diff)
fix provisioning test check
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
Diffstat (limited to 'build')
-rw-r--r--build/integration/features/bootstrap/Provisioning.php17
1 files changed, 9 insertions, 8 deletions
diff --git a/build/integration/features/bootstrap/Provisioning.php b/build/integration/features/bootstrap/Provisioning.php
index 3cc1366c52c..ad22925eddf 100644
--- a/build/integration/features/bootstrap/Provisioning.php
+++ b/build/integration/features/bootstrap/Provisioning.php
@@ -168,15 +168,16 @@ trait Provisioning {
$response = $client->get($fullUrl, $options);
foreach ($settings->getRows() as $setting) {
$value = json_decode(json_encode(simplexml_load_string($response->getBody())->data->{$setting[0]}), 1);
- if (isset($value[0])) {
- if (in_array($setting[0], ['additional_mail', 'additional_mailScope'], true)) {
- $expectedValues = explode(';', $setting[1]);
- foreach ($expectedValues as $expected) {
- Assert::assertTrue(in_array($expected, $value, true));
- }
- } else {
- Assert::assertEquals($setting[1], $value[0], "", 0.0, 10, true);
+ if (in_array($setting[0], ['additional_mail', 'additional_mailScope'], true)) {
+ var_dump($value);
+ }
+ if (isset($value['element']) && in_array($setting[0], ['additional_mail', 'additional_mailScope'], true)) {
+ $expectedValues = explode(';', $setting[1]);
+ foreach ($expectedValues as $expected) {
+ Assert::assertTrue(in_array($expected, $value['element'], true));
}
+ } elseif (isset($value[0])) {
+ Assert::assertEquals($setting[1], $value[0], "", 0.0, 10, true);
} else {
Assert::assertEquals('', $setting[1]);
}