Merge pull request #32190 from owncloud/acceptancetestsResetSettingsFix

fix restoring settings to original state after testrun
owncloud · Jul 31, 2018 · 936e58a · 936e58a
2 parents d3ebca2 + 7dbd2b3
commit 936e58a
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 10 deletions.
diff --git a/tests/TestHelpers/AppConfigHelper.php b/tests/TestHelpers/AppConfigHelper.php
@@ -171,7 +171,9 @@ public static function getParameterValueFromXml(
 		$pathToElement = \explode('@@@', $capabilitiesPath);
 		$answeredValue = $xml->{$capabilitiesApp};
 		for ($i = 0; $i < \count($pathToElement); $i++) {
-			$answeredValue = $answeredValue->{$pathToElement[$i]};
+			if (\gettype($answeredValue) === "object") {
+				$answeredValue = $answeredValue->{$pathToElement[$i]};
+			}
 		}
 		return (string)$answeredValue;
 	}

diff --git a/tests/acceptance/features/apiFederation/federated.feature b/tests/acceptance/features/apiFederation/federated.feature
@@ -2,11 +2,7 @@
 Feature: federated
 	Background:
 		Given using OCS API version "1"
-		And parameter "shareapi_enabled" of app "core" has been set to "yes"
-		And parameter "shareapi_allow_resharing" of app "core" has been set to "yes"
-		And parameter "outgoing_server2server_share_enabled" of app "files_sharing" has been set to "yes"
-		And parameter "incoming_server2server_share_enabled" of app "files_sharing" has been set to "yes"
-
+
 	Scenario: Federate share a file with another server
 		Given using server "REMOTE"
 		And user "user1" has been created

diff --git a/tests/acceptance/features/bootstrap/Sharing.php b/tests/acceptance/features/bootstrap/Sharing.php
@@ -1540,15 +1540,15 @@ protected function getCommonSharingConfigs() {
 				'testingState' => false
 			],
 			[
-				'capabilitiesApp' => 'federation',
-				'capabilitiesParameter' => 'outgoing',
+				'capabilitiesApp' => 'files_sharing',
+				'capabilitiesParameter' => 'federation@@@outgoing',
 				'testingApp' => 'files_sharing',
 				'testingParameter' => 'outgoing_server2server_share_enabled',
 				'testingState' => true
 			],
 			[
-				'capabilitiesApp' => 'federation',
-				'capabilitiesParameter' => 'incoming',
+				'capabilitiesApp' => 'files_sharing',
+				'capabilitiesParameter' => 'federation@@@incoming',
 				'testingApp' => 'files_sharing',
 				'testingParameter' => 'incoming_server2server_share_enabled',
 				'testingState' => true