From 4338a741f256a96c53aae30e495e6c5587587865 Mon Sep 17 00:00:00 2001
From: Sergio Bertolin <sbertolin@solidgear.es>
Date: Fri, 4 Dec 2015 14:08:16 +0000
Subject: [PATCH 1/7] Added functionality for changing server configuration

---
 .../capabilities.feature                      | 19 +++++++++++++++++++
 .../bootstrap/CapabilitiesContext.php         | 19 +++++++++++++++++++
 2 files changed, 38 insertions(+)

diff --git a/build/integration/capabilities_features/capabilities.feature b/build/integration/capabilities_features/capabilities.feature
index 6c1e727e7b..59fb5302ac 100644
--- a/build/integration/capabilities_features/capabilities.feature
+++ b/build/integration/capabilities_features/capabilities.feature
@@ -20,6 +20,25 @@ Feature: capabilities
 			| files | undelete | 1 | |
 			| files | versioning | 1 | |
 
+	Scenario: Changing api_enabled
+		Given As an "admin"
+		And parameter "shareapi_allow_public_upload" is set to "0"
+		When sending "GET" to "/cloud/capabilities"
+		Then the HTTP status code should be "200"
+		And fields of capabilities match with
+			| capability | feature | value_or_subfeature | value |
+			| core | pollinterval | 60 | |
+			| core | webdav-root | remote.php/webdav | |
+			| files_sharing | api_enabled | 1 | |
+			| files_sharing | public | enabled | 1 |
+			| files_sharing | public | upload | 0 |
+			| files_sharing | resharing | 1 | |
+			| files_sharing | federation | outgoing | 1 |
+			| files_sharing | federation | incoming | 1 |
+			| files | bigfilechunking | 1 | |
+			| files | undelete | 1 | |
+			| files | versioning | 1 | |
+
 
 
 
diff --git a/build/integration/features/bootstrap/CapabilitiesContext.php b/build/integration/features/bootstrap/CapabilitiesContext.php
index 1b0015dce7..0e5d990f9a 100644
--- a/build/integration/features/bootstrap/CapabilitiesContext.php
+++ b/build/integration/features/bootstrap/CapabilitiesContext.php
@@ -14,6 +14,25 @@ class CapabilitiesContext implements Context, SnippetAcceptingContext {
 	use Provisioning;
 	use Sharing;
 
+	private $apacheUser = '';
+
+	/**
+	 * @Given /^parameter "([^"]*)" is set to "([^"]*)"$/
+	 */
+	public function modifyServerConfig($parameter, $value){
+		$this->apacheUser = exec('ps axho user,comm|grep -E "httpd|apache"|uniq|grep -v "root"|awk \'END {if ($1) print $1}\'');
+		$comando = 'sudo -u ' . $this->apacheUser . ' ../../occ config:app:set ' . $parameter . ' ' . $value;
+		echo "COMANDO: $comando\n";
+		$expectedAnswer = "Config value $value for app $parameter set to";
+		$output = exec($comando);
+		PHPUnit_Framework_Assert::assertEquals(
+					$output, 
+					$expectedAnswer, 
+					"Failed setting $parameter to $value"
+		);
+
+	}
+
 	/**
 	 * @Then /^fields of capabilities match with$/
 	 * @param \Behat\Gherkin\Node\TableNode|null $formData

From 0449dc387b7ca8de56ccf76084b542ca8455c885 Mon Sep 17 00:00:00 2001
From: Sergio Bertolin <sbertolin@solidgear.es>
Date: Wed, 9 Dec 2015 10:27:30 +0000
Subject: [PATCH 2/7] Added functionality to change server configuration

---
 .../capabilities.feature                      |  4 +-
 .../bootstrap/CapabilitiesContext.php         | 55 ++++++++++++++-----
 2 files changed, 42 insertions(+), 17 deletions(-)

diff --git a/build/integration/capabilities_features/capabilities.feature b/build/integration/capabilities_features/capabilities.feature
index 59fb5302ac..e473d5d7bd 100644
--- a/build/integration/capabilities_features/capabilities.feature
+++ b/build/integration/capabilities_features/capabilities.feature
@@ -22,7 +22,7 @@ Feature: capabilities
 
 	Scenario: Changing api_enabled
 		Given As an "admin"
-		And parameter "shareapi_allow_public_upload" is set to "0"
+		And parameter "shareapi_allow_public_upload" of app "core" is set to "no"
 		When sending "GET" to "/cloud/capabilities"
 		Then the HTTP status code should be "200"
 		And fields of capabilities match with
@@ -31,7 +31,7 @@ Feature: capabilities
 			| core | webdav-root | remote.php/webdav | |
 			| files_sharing | api_enabled | 1 | |
 			| files_sharing | public | enabled | 1 |
-			| files_sharing | public | upload | 0 |
+			| files_sharing | public | upload | EMPTY |
 			| files_sharing | resharing | 1 | |
 			| files_sharing | federation | outgoing | 1 |
 			| files_sharing | federation | incoming | 1 |
diff --git a/build/integration/features/bootstrap/CapabilitiesContext.php b/build/integration/features/bootstrap/CapabilitiesContext.php
index 0e5d990f9a..9cdd98cc05 100644
--- a/build/integration/features/bootstrap/CapabilitiesContext.php
+++ b/build/integration/features/bootstrap/CapabilitiesContext.php
@@ -14,23 +14,16 @@ class CapabilitiesContext implements Context, SnippetAcceptingContext {
 	use Provisioning;
 	use Sharing;
 
-	private $apacheUser = '';
+	private $apacheUser = NULL;
 
 	/**
-	 * @Given /^parameter "([^"]*)" is set to "([^"]*)"$/
+	 * @Given /^parameter "([^"]*)" of app "([^"]*)" is set to "([^"]*)"$/
 	 */
-	public function modifyServerConfig($parameter, $value){
-		$this->apacheUser = exec('ps axho user,comm|grep -E "httpd|apache"|uniq|grep -v "root"|awk \'END {if ($1) print $1}\'');
-		$comando = 'sudo -u ' . $this->apacheUser . ' ../../occ config:app:set ' . $parameter . ' ' . $value;
-		echo "COMANDO: $comando\n";
-		$expectedAnswer = "Config value $value for app $parameter set to";
-		$output = exec($comando);
-		PHPUnit_Framework_Assert::assertEquals(
-					$output, 
-					$expectedAnswer, 
-					"Failed setting $parameter to $value"
-		);
-
+	public function serverParameterIsSetTo($parameter, $app, $value){
+		if (!isset($this->apacheUser)){
+			$this->apacheUser = $this->getOSApacheUser();
+		}
+		$this->modifyServerConfig($this->apacheUser, $parameter, $app, $value);
 	}
 
 	/**
@@ -56,11 +49,43 @@ class CapabilitiesContext implements Context, SnippetAcceptingContext {
 				$answeredValue = (string)$capabilitiesXML->$row['capability']->$row['feature']->$row['value_or_subfeature'];
 				PHPUnit_Framework_Assert::assertEquals(	
 					$answeredValue, 
-					$row['value'], 
+					$row['value']==="EMPTY" ? '' : $row['value'], 
 					"Failed field: " . $row['capability'] . " " . $row['feature'] . " " . $row['value_or_subfeature']
 				);
 			}
 		}
 	}
 
+	public static function modifyServerConfig($apacheUser, $parameter, $app, $value){
+		$comando = 'sudo -u ' . $apacheUser . ' ../../occ config:app:set ' . $app . " " . $parameter . ' --value=' . $value;
+		$expectedAnswer = "Config value $parameter for app $app set to $value";
+		$output = exec($comando);
+		PHPUnit_Framework_Assert::assertEquals(
+					$output, 
+					$expectedAnswer, 
+					"Failed setting $parameter to $value"
+		);
+
+	}
+
+	public static function getOSApacheUser(){
+		return exec('ps axho user,comm|grep -E "httpd|apache"|uniq|grep -v "root"|awk \'END {if ($1) print $1}\'');
+	}
+
+	/**
+	 * @BeforeSuite
+	 */
+	public static function prepareParameters(){
+		$apacheUser = self::getOSApacheUser();
+		self::modifyServerConfig($apacheUser, "shareapi_allow_public_upload", "core", "yes");
+	}
+
+	/**
+	 * @AfterSuite
+	 */
+	public static function undoChangingParameters(){
+		$apacheUser = self::getOSApacheUser();
+		self::modifyServerConfig($apacheUser, "shareapi_allow_public_upload", "core", "yes");
+	}
+
 }

From 7d3e40c0658a4195a38458a5512894c91147ea2d Mon Sep 17 00:00:00 2001
From: Joas Schilling <nickvergessen@owncloud.com>
Date: Wed, 9 Dec 2015 16:08:14 +0100
Subject: [PATCH 3/7] Add an OCS app for testing instead of using sudo and exec

---
 apps/testing/appinfo/info.xml                 | 12 +++
 apps/testing/appinfo/routes.php               | 46 +++++++++++
 apps/testing/config.php                       | 70 ++++++++++++++++
 .../bootstrap/CapabilitiesContext.php         | 80 ++++++++++---------
 .../features/provisioning-v1.feature          |  5 --
 5 files changed, 172 insertions(+), 41 deletions(-)
 create mode 100644 apps/testing/appinfo/info.xml
 create mode 100644 apps/testing/appinfo/routes.php
 create mode 100644 apps/testing/config.php

diff --git a/apps/testing/appinfo/info.xml b/apps/testing/appinfo/info.xml
new file mode 100644
index 0000000000..b11ec2f88e
--- /dev/null
+++ b/apps/testing/appinfo/info.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0"?> 
+<info>
+	<id>testing</id>
+	<name>QA Testing</name>
+	<description>This app is only for testing! It is dangerous to have it enabled in a live instance</description>
+	<licence>AGPL</licence>
+	<author>Joas Schilling</author>
+	<version>0.1.0</version>
+	<dependencies>
+		<owncloud min-version="9.0" />
+	</dependencies>
+</info>
diff --git a/apps/testing/appinfo/routes.php b/apps/testing/appinfo/routes.php
new file mode 100644
index 0000000000..b6f20d04ef
--- /dev/null
+++ b/apps/testing/appinfo/routes.php
@@ -0,0 +1,46 @@
+<?php
+/**
+ * @author Joas Schilling <nickvergessen@owncloud.com>
+ *
+ * @copyright Copyright (c) 2015, ownCloud, Inc.
+ * @license AGPL-3.0
+ *
+ * This code is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License, version 3,
+ * as published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License, version 3,
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>
+ *
+ */
+
+namespace OCA\Testing\AppInfo;
+
+use OCA\Testing\Config;
+use OCP\API;
+
+$config = new Config(
+	\OC::$server->getConfig(),
+	\OC::$server->getRequest()
+);
+
+API::register(
+	'post',
+	'/apps/testing/api/v1/app/{appid}/{configkey}',
+	[$config, 'setAppValue'],
+	'testing',
+	API::ADMIN_AUTH
+);
+
+API::register(
+	'delete',
+	'/apps/testing/api/v1/app/{appid}/{configkey}',
+	[$config, 'deleteAppValue'],
+	'testing',
+	API::ADMIN_AUTH
+);
diff --git a/apps/testing/config.php b/apps/testing/config.php
new file mode 100644
index 0000000000..068cb28e04
--- /dev/null
+++ b/apps/testing/config.php
@@ -0,0 +1,70 @@
+<?php
+/**
+ * @author Joas Schilling <nickvergessen@owncloud.com>
+ *
+ * @copyright Copyright (c) 2015, ownCloud, Inc.
+ * @license AGPL-3.0
+ *
+ * This code is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License, version 3,
+ * as published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License, version 3,
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>
+ *
+ */
+
+namespace OCA\Testing;
+
+use OCP\IConfig;
+use OCP\IRequest;
+
+class Config {
+
+	/** @var IConfig */
+	private $config;
+
+	/** @var IRequest */
+	private $request;
+
+	/**
+	 * @param IConfig $config
+	 * @param IRequest $request
+	 */
+	public function __construct(IConfig $config, IRequest $request) {
+		$this->config = $config;
+		$this->request = $request;
+	}
+
+	/**
+	 * @param array $parameters
+	 * @return \OC_OCS_Result
+	 */
+	public function setAppValue($parameters) {
+		$app = $parameters['appid'];
+		$configKey = $parameters['configkey'];
+
+		$value = $this->request->getParam('value');
+		$this->config->setAppValue($app, $configKey, $value);
+
+		return new \OC_OCS_Result();
+	}
+
+	/**
+	 * @param array $parameters
+	 * @return \OC_OCS_Result
+	 */
+	public function deleteAppValue($parameters) {
+		$app = $parameters['appid'];
+		$configKey = $parameters['configkey'];
+
+		$this->config->deleteAppValue($app, $configKey);
+
+		return new \OC_OCS_Result();
+	}
+}
diff --git a/build/integration/features/bootstrap/CapabilitiesContext.php b/build/integration/features/bootstrap/CapabilitiesContext.php
index 9cdd98cc05..ee13db4bcb 100644
--- a/build/integration/features/bootstrap/CapabilitiesContext.php
+++ b/build/integration/features/bootstrap/CapabilitiesContext.php
@@ -14,30 +14,21 @@ class CapabilitiesContext implements Context, SnippetAcceptingContext {
 	use Provisioning;
 	use Sharing;
 
-	private $apacheUser = NULL;
-
 	/**
 	 * @Given /^parameter "([^"]*)" of app "([^"]*)" is set to "([^"]*)"$/
 	 */
 	public function serverParameterIsSetTo($parameter, $app, $value){
-		if (!isset($this->apacheUser)){
-			$this->apacheUser = $this->getOSApacheUser();
-		}
-		$this->modifyServerConfig($this->apacheUser, $parameter, $app, $value);
+		$this->modifyServerConfig($app, $parameter, $value);
 	}
 
 	/**
 	 * @Then /^fields of capabilities match with$/
 	 * @param \Behat\Gherkin\Node\TableNode|null $formData
 	 */
-	public function checkCapabilitiesResponse($formData){
-		if ($formData instanceof \Behat\Gherkin\Node\TableNode) {
-			$fd = $formData->getHash();
-		}
-		
+	public function checkCapabilitiesResponse(\Behat\Gherkin\Node\TableNode $formData){
 		$capabilitiesXML = $this->response->xml()->data->capabilities;
-		
-		foreach ($fd as $row) {
+
+		foreach ($formData->getHash() as $row) {
 			if ($row['value'] === ''){
 				$answeredValue = (string)$capabilitiesXML->$row['capability']->$row['feature'];
 				PHPUnit_Framework_Assert::assertEquals(
@@ -47,7 +38,7 @@ class CapabilitiesContext implements Context, SnippetAcceptingContext {
 				);
 			} else{
 				$answeredValue = (string)$capabilitiesXML->$row['capability']->$row['feature']->$row['value_or_subfeature'];
-				PHPUnit_Framework_Assert::assertEquals(	
+				PHPUnit_Framework_Assert::assertEquals(
 					$answeredValue, 
 					$row['value']==="EMPTY" ? '' : $row['value'], 
 					"Failed field: " . $row['capability'] . " " . $row['feature'] . " " . $row['value_or_subfeature']
@@ -56,36 +47,53 @@ class CapabilitiesContext implements Context, SnippetAcceptingContext {
 		}
 	}
 
-	public static function modifyServerConfig($apacheUser, $parameter, $app, $value){
-		$comando = 'sudo -u ' . $apacheUser . ' ../../occ config:app:set ' . $app . " " . $parameter . ' --value=' . $value;
-		$expectedAnswer = "Config value $parameter for app $app set to $value";
-		$output = exec($comando);
-		PHPUnit_Framework_Assert::assertEquals(
-					$output, 
-					$expectedAnswer, 
-					"Failed setting $parameter to $value"
-		);
-
-	}
-
-	public static function getOSApacheUser(){
-		return exec('ps axho user,comm|grep -E "httpd|apache"|uniq|grep -v "root"|awk \'END {if ($1) print $1}\'');
+	/**
+	 * @BeforeScenario
+	 */
+	public function prepareParameters(){
+		$this->modifyServerConfig('core', 'shareapi_allow_public_upload', 'yes');
 	}
 
 	/**
-	 * @BeforeSuite
+	 * @AfterScenario
 	 */
-	public static function prepareParameters(){
-		$apacheUser = self::getOSApacheUser();
-		self::modifyServerConfig($apacheUser, "shareapi_allow_public_upload", "core", "yes");
+	public function undoChangingParameters(){
+		$this->modifyServerConfig('core', 'shareapi_allow_public_upload', 'yes');
 	}
 
 	/**
-	 * @AfterSuite
+	 * @param string $app
+	 * @param string $parameter
+	 * @param string $value
 	 */
-	public static function undoChangingParameters(){
-		$apacheUser = self::getOSApacheUser();
-		self::modifyServerConfig($apacheUser, "shareapi_allow_public_upload", "core", "yes");
+	protected function modifyServerConfig($app, $parameter, $value) {
+		$user = $this->currentUser;
+
+		$this->currentUser = 'admin';
+
+		$this->setStatusTestingApp(true);
+
+		$body = new \Behat\Gherkin\Node\TableNode([['value', $value]]);
+		$this->sendingToWith('post', "/apps/testing/api/v1/app/{$app}/{$parameter}", $body);
+		$this->theHTTPStatusCodeShouldBe('200');
+		$this->theOCSStatusCodeShouldBe('100');
+
+		$this->setStatusTestingApp(false);
+
+		$this->currentUser = $user;
 	}
 
+	protected function setStatusTestingApp($enabled) {
+		$this->sendingTo(($enabled ? 'post' : 'delete'), '/cloud/apps/testing');
+		$this->theHTTPStatusCodeShouldBe('200');
+		$this->theOCSStatusCodeShouldBe('100');
+
+		$this->sendingTo('get', '/cloud/apps?filter=enabled');
+		$this->theHTTPStatusCodeShouldBe('200');
+		if ($enabled) {
+			PHPUnit_Framework_Assert::assertContains('testing', $this->response->getBody()->getContents());
+		} else {
+			PHPUnit_Framework_Assert::assertNotContains('testing', $this->response->getBody()->getContents());
+		}
+	}
 }
diff --git a/build/integration/features/provisioning-v1.feature b/build/integration/features/provisioning-v1.feature
index 2a3e8e07fc..467ac448e9 100644
--- a/build/integration/features/provisioning-v1.feature
+++ b/build/integration/features/provisioning-v1.feature
@@ -291,8 +291,3 @@ Feature: provisioning
 		Then the OCS status code should be "100"
 		And the HTTP status code should be "200"
 		And app "files_external" is disabled
-
-	
-
-
-

From 5b895335df94475d74ef53be5909388ce92f3f0c Mon Sep 17 00:00:00 2001
From: Sergio Bertolin <sbertolin@solidgear.es>
Date: Fri, 11 Dec 2015 11:18:06 +0000
Subject: [PATCH 4/7] Added tests disabling options using testing app

---
 .../capabilities.feature                      | 97 ++++++++++++++++++-
 .../bootstrap/CapabilitiesContext.php         | 18 +++-
 2 files changed, 109 insertions(+), 6 deletions(-)

diff --git a/build/integration/capabilities_features/capabilities.feature b/build/integration/capabilities_features/capabilities.feature
index e473d5d7bd..e4c53269ca 100644
--- a/build/integration/capabilities_features/capabilities.feature
+++ b/build/integration/capabilities_features/capabilities.feature
@@ -20,7 +20,7 @@ Feature: capabilities
 			| files | undelete | 1 | |
 			| files | versioning | 1 | |
 
-	Scenario: Changing api_enabled
+	Scenario: Changing public upload
 		Given As an "admin"
 		And parameter "shareapi_allow_public_upload" of app "core" is set to "no"
 		When sending "GET" to "/cloud/capabilities"
@@ -39,7 +39,100 @@ Feature: capabilities
 			| files | undelete | 1 | |
 			| files | versioning | 1 | |
 
-
+	Scenario: Disabling share api
+		Given As an "admin"
+		And parameter "shareapi_enabled" of app "core" is set to "no"
+		When sending "GET" to "/cloud/capabilities"
+		Then the HTTP status code should be "200"
+		And fields of capabilities match with
+			| capability | feature | value_or_subfeature | value |
+			| core | pollinterval | 60 | |
+			| core | webdav-root | remote.php/webdav | |
+			| files_sharing | api_enabled | EMPTY | |
+			| files_sharing | public | enabled | EMPTY |
+			| files_sharing | public | upload | EMPTY |
+			| files_sharing | resharing | EMPTY | |
+			| files_sharing | federation | outgoing | 1 |
+			| files_sharing | federation | incoming | 1 |
+			| files | bigfilechunking | 1 | |
+			| files | undelete | 1 | |
+			| files | versioning | 1 | |
+
+	Scenario: Disabling public links
+		Given As an "admin"
+		And parameter "shareapi_allow_links" of app "core" is set to "no"
+		When sending "GET" to "/cloud/capabilities"
+		Then the HTTP status code should be "200"
+		And fields of capabilities match with
+			| capability | feature | value_or_subfeature | value |
+			| core | pollinterval | 60 | |
+			| core | webdav-root | remote.php/webdav | |
+			| files_sharing | api_enabled | 1 | |
+			| files_sharing | public | enabled | EMPTY |
+			| files_sharing | public | upload | EMPTY |
+			| files_sharing | resharing | 1 | |
+			| files_sharing | federation | outgoing | 1 |
+			| files_sharing | federation | incoming | 1 |
+			| files | bigfilechunking | 1 | |
+			| files | undelete | 1 | |
+			| files | versioning | 1 | |
+
+	Scenario: Changing resharing
+		Given As an "admin"
+		And parameter "shareapi_allow_resharing" of app "core" is set to "no"
+		When sending "GET" to "/cloud/capabilities"
+		Then the HTTP status code should be "200"
+		And fields of capabilities match with
+			| capability | feature | value_or_subfeature | value |
+			| core | pollinterval | 60 | |
+			| core | webdav-root | remote.php/webdav | |
+			| files_sharing | api_enabled | 1 | |
+			| files_sharing | public | enabled | 1 |
+			| files_sharing | public | upload | 1 |
+			| files_sharing | resharing | EMPTY | |
+			| files_sharing | federation | outgoing | 1 |
+			| files_sharing | federation | incoming | 1 |
+			| files | bigfilechunking | 1 | |
+			| files | undelete | 1 | |
+			| files | versioning | 1 | |
+
+	Scenario: Changing federation outgoing
+		Given As an "admin"
+		And parameter "outgoing_server2server_share_enabled" of app "files_sharing" is set to "no"
+		When sending "GET" to "/cloud/capabilities"
+		Then the HTTP status code should be "200"
+		And fields of capabilities match with
+			| capability | feature | value_or_subfeature | value |
+			| core | pollinterval | 60 | |
+			| core | webdav-root | remote.php/webdav | |
+			| files_sharing | api_enabled | 1 | |
+			| files_sharing | public | enabled | 1 |
+			| files_sharing | public | upload | 1 |
+			| files_sharing | resharing | 1 | |
+			| files_sharing | federation | outgoing | EMPTY |
+			| files_sharing | federation | incoming | 1 |
+			| files | bigfilechunking | 1 | |
+			| files | undelete | 1 | |
+			| files | versioning | 1 | |
+
+	Scenario: Changing federation incoming
+		Given As an "admin"
+		And parameter "incoming_server2server_share_enabled" of app "files_sharing" is set to "no"
+		When sending "GET" to "/cloud/capabilities"
+		Then the HTTP status code should be "200"
+		And fields of capabilities match with
+			| capability | feature | value_or_subfeature | value |
+			| core | pollinterval | 60 | |
+			| core | webdav-root | remote.php/webdav | |
+			| files_sharing | api_enabled | 1 | |
+			| files_sharing | public | enabled | 1 |
+			| files_sharing | public | upload | 1 |
+			| files_sharing | resharing | 1 | |
+			| files_sharing | federation | outgoing | 1 |
+			| files_sharing | federation | incoming | EMPTY |
+			| files | bigfilechunking | 1 | |
+			| files | undelete | 1 | |
+			| files | versioning | 1 | |
 
 
 
diff --git a/build/integration/features/bootstrap/CapabilitiesContext.php b/build/integration/features/bootstrap/CapabilitiesContext.php
index ee13db4bcb..e423be7f9f 100644
--- a/build/integration/features/bootstrap/CapabilitiesContext.php
+++ b/build/integration/features/bootstrap/CapabilitiesContext.php
@@ -32,15 +32,15 @@ class CapabilitiesContext implements Context, SnippetAcceptingContext {
 			if ($row['value'] === ''){
 				$answeredValue = (string)$capabilitiesXML->$row['capability']->$row['feature'];
 				PHPUnit_Framework_Assert::assertEquals(
-					$answeredValue, 
-					$row['value_or_subfeature'], 
+					$row['value_or_subfeature']==="EMPTY" ? '' : $row['value_or_subfeature'],
+					$answeredValue,
 					"Failed field " . $row['capability'] . " " . $row['feature']
 				);
 			} else{
 				$answeredValue = (string)$capabilitiesXML->$row['capability']->$row['feature']->$row['value_or_subfeature'];
 				PHPUnit_Framework_Assert::assertEquals(
-					$answeredValue, 
-					$row['value']==="EMPTY" ? '' : $row['value'], 
+					$row['value']==="EMPTY" ? '' : $row['value'],
+					$answeredValue,
 					"Failed field: " . $row['capability'] . " " . $row['feature'] . " " . $row['value_or_subfeature']
 				);
 			}
@@ -51,14 +51,24 @@ class CapabilitiesContext implements Context, SnippetAcceptingContext {
 	 * @BeforeScenario
 	 */
 	public function prepareParameters(){
+		$this->modifyServerConfig('core', 'shareapi_enabled', 'yes');
+		$this->modifyServerConfig('core', 'shareapi_allow_links', 'yes');
 		$this->modifyServerConfig('core', 'shareapi_allow_public_upload', 'yes');
+		$this->modifyServerConfig('core', 'shareapi_allow_resharing', 'yes');
+		$this->modifyServerConfig('files_sharing', 'outgoing_server2server_share_enabled', 'yes');
+		$this->modifyServerConfig('files_sharing', 'incoming_server2server_share_enabled', 'yes');
 	}
 
 	/**
 	 * @AfterScenario
 	 */
 	public function undoChangingParameters(){
+		$this->modifyServerConfig('core', 'shareapi_enabled', 'yes');
+		$this->modifyServerConfig('core', 'shareapi_allow_links', 'yes');
 		$this->modifyServerConfig('core', 'shareapi_allow_public_upload', 'yes');
+		$this->modifyServerConfig('core', 'shareapi_allow_resharing', 'yes');
+		$this->modifyServerConfig('files_sharing', 'outgoing_server2server_share_enabled', 'yes');
+		$this->modifyServerConfig('files_sharing', 'incoming_server2server_share_enabled', 'yes');
 	}
 
 	/**

From 17fcd84ee383d0450976fe63226139abb841f2fd Mon Sep 17 00:00:00 2001
From: Sergio Bertolin <sbertolin@solidgear.es>
Date: Fri, 11 Dec 2015 12:39:04 +0000
Subject: [PATCH 5/7] Prepare logic to handle nested elements and add pending
 test cases

---
 .../capabilities.feature                      | 259 ++++++++++++------
 .../bootstrap/CapabilitiesContext.php         |  33 ++-
 2 files changed, 188 insertions(+), 104 deletions(-)

diff --git a/build/integration/capabilities_features/capabilities.feature b/build/integration/capabilities_features/capabilities.feature
index e4c53269ca..f219ece56c 100644
--- a/build/integration/capabilities_features/capabilities.feature
+++ b/build/integration/capabilities_features/capabilities.feature
@@ -7,18 +7,18 @@ Feature: capabilities
 		When sending "GET" to "/cloud/capabilities"
 		Then the HTTP status code should be "200"
 		And fields of capabilities match with
-			| capability | feature | value_or_subfeature | value |
-			| core | pollinterval | 60 | |
-			| core | webdav-root | remote.php/webdav | |
-			| files_sharing | api_enabled | 1 | |
-			| files_sharing | public | enabled | 1 |
-			| files_sharing | public | upload | 1 |
-			| files_sharing | resharing | 1 | |
-			| files_sharing | federation | outgoing | 1 |
-			| files_sharing | federation | incoming | 1 |
-			| files | bigfilechunking | 1 | |
-			| files | undelete | 1 | |
-			| files | versioning | 1 | |
+			| capability | path_to_element | value |
+			| core | pollinterval | 60 |
+			| core | webdav-root | remote.php/webdav |
+			| files_sharing | api_enabled | 1 |
+			| files_sharing | public@@@enabled | 1 |
+			| files_sharing | public@@@upload | 1 |
+			| files_sharing | resharing | 1 |
+			| files_sharing | federation@@@outgoing | 1 |
+			| files_sharing | federation@@@incoming | 1 |
+			| files | bigfilechunking | 1 |
+			| files | undelete | 1 |
+			| files | versioning | 1 |
 
 	Scenario: Changing public upload
 		Given As an "admin"
@@ -26,18 +26,18 @@ Feature: capabilities
 		When sending "GET" to "/cloud/capabilities"
 		Then the HTTP status code should be "200"
 		And fields of capabilities match with
-			| capability | feature | value_or_subfeature | value |
-			| core | pollinterval | 60 | |
-			| core | webdav-root | remote.php/webdav | |
-			| files_sharing | api_enabled | 1 | |
-			| files_sharing | public | enabled | 1 |
-			| files_sharing | public | upload | EMPTY |
-			| files_sharing | resharing | 1 | |
-			| files_sharing | federation | outgoing | 1 |
-			| files_sharing | federation | incoming | 1 |
-			| files | bigfilechunking | 1 | |
-			| files | undelete | 1 | |
-			| files | versioning | 1 | |
+			| capability | path_to_element | value |
+			| core | pollinterval | 60 |
+			| core | webdav-root | remote.php/webdav |
+			| files_sharing | api_enabled | 1 |
+			| files_sharing | public@@@enabled | 1 |
+			| files_sharing | public@@@upload | EMPTY |
+			| files_sharing | resharing | 1 |
+			| files_sharing | federation@@@outgoing | 1 |
+			| files_sharing | federation@@@incoming | 1 |
+			| files | bigfilechunking | 1 |
+			| files | undelete | 1 |
+			| files | versioning | 1 |
 
 	Scenario: Disabling share api
 		Given As an "admin"
@@ -45,18 +45,18 @@ Feature: capabilities
 		When sending "GET" to "/cloud/capabilities"
 		Then the HTTP status code should be "200"
 		And fields of capabilities match with
-			| capability | feature | value_or_subfeature | value |
-			| core | pollinterval | 60 | |
-			| core | webdav-root | remote.php/webdav | |
-			| files_sharing | api_enabled | EMPTY | |
-			| files_sharing | public | enabled | EMPTY |
-			| files_sharing | public | upload | EMPTY |
-			| files_sharing | resharing | EMPTY | |
-			| files_sharing | federation | outgoing | 1 |
-			| files_sharing | federation | incoming | 1 |
-			| files | bigfilechunking | 1 | |
-			| files | undelete | 1 | |
-			| files | versioning | 1 | |
+			| capability | path_to_element | value |
+			| core | pollinterval | 60 |
+			| core | webdav-root | remote.php/webdav |
+			| files_sharing | api_enabled | EMPTY |
+			| files_sharing | public@@@enabled | EMPTY |
+			| files_sharing | public@@@upload | EMPTY |
+			| files_sharing | resharing | EMPTY |
+			| files_sharing | federation@@@outgoing | 1 |
+			| files_sharing | federation@@@incoming | 1 |
+			| files | bigfilechunking | 1 |
+			| files | undelete | 1 |
+			| files | versioning | 1 |
 
 	Scenario: Disabling public links
 		Given As an "admin"
@@ -64,18 +64,18 @@ Feature: capabilities
 		When sending "GET" to "/cloud/capabilities"
 		Then the HTTP status code should be "200"
 		And fields of capabilities match with
-			| capability | feature | value_or_subfeature | value |
-			| core | pollinterval | 60 | |
-			| core | webdav-root | remote.php/webdav | |
-			| files_sharing | api_enabled | 1 | |
-			| files_sharing | public | enabled | EMPTY |
-			| files_sharing | public | upload | EMPTY |
-			| files_sharing | resharing | 1 | |
-			| files_sharing | federation | outgoing | 1 |
-			| files_sharing | federation | incoming | 1 |
-			| files | bigfilechunking | 1 | |
-			| files | undelete | 1 | |
-			| files | versioning | 1 | |
+			| capability | path_to_element | value |
+			| core | pollinterval | 60 |
+			| core | webdav-root | remote.php/webdav |
+			| files_sharing | api_enabled | 1 |
+			| files_sharing | public@@@enabled | EMPTY |
+			| files_sharing | public@@@upload | EMPTY |
+			| files_sharing | resharing | 1 |
+			| files_sharing | federation@@@outgoing | 1 |
+			| files_sharing | federation@@@incoming | 1 |
+			| files | bigfilechunking | 1 |
+			| files | undelete | 1 |
+			| files | versioning | 1 |
 
 	Scenario: Changing resharing
 		Given As an "admin"
@@ -83,18 +83,18 @@ Feature: capabilities
 		When sending "GET" to "/cloud/capabilities"
 		Then the HTTP status code should be "200"
 		And fields of capabilities match with
-			| capability | feature | value_or_subfeature | value |
-			| core | pollinterval | 60 | |
-			| core | webdav-root | remote.php/webdav | |
-			| files_sharing | api_enabled | 1 | |
-			| files_sharing | public | enabled | 1 |
-			| files_sharing | public | upload | 1 |
-			| files_sharing | resharing | EMPTY | |
-			| files_sharing | federation | outgoing | 1 |
-			| files_sharing | federation | incoming | 1 |
-			| files | bigfilechunking | 1 | |
-			| files | undelete | 1 | |
-			| files | versioning | 1 | |
+			| capability | path_to_element | value |
+			| core | pollinterval | 60 |
+			| core | webdav-root | remote.php/webdav |
+			| files_sharing | api_enabled | 1 |
+			| files_sharing | public@@@enabled | 1 |
+			| files_sharing | public@@@upload | 1 |
+			| files_sharing | resharing | EMPTY |
+			| files_sharing | federation@@@outgoing | 1 |
+			| files_sharing | federation@@@incoming | 1 |
+			| files | bigfilechunking | 1 |
+			| files | undelete | 1 |
+			| files | versioning | 1 |
 
 	Scenario: Changing federation outgoing
 		Given As an "admin"
@@ -102,18 +102,18 @@ Feature: capabilities
 		When sending "GET" to "/cloud/capabilities"
 		Then the HTTP status code should be "200"
 		And fields of capabilities match with
-			| capability | feature | value_or_subfeature | value |
-			| core | pollinterval | 60 | |
-			| core | webdav-root | remote.php/webdav | |
-			| files_sharing | api_enabled | 1 | |
-			| files_sharing | public | enabled | 1 |
-			| files_sharing | public | upload | 1 |
-			| files_sharing | resharing | 1 | |
-			| files_sharing | federation | outgoing | EMPTY |
-			| files_sharing | federation | incoming | 1 |
-			| files | bigfilechunking | 1 | |
-			| files | undelete | 1 | |
-			| files | versioning | 1 | |
+			| capability | path_to_element | value |
+			| core | pollinterval | 60 |
+			| core | webdav-root | remote.php/webdav |
+			| files_sharing | api_enabled | 1 |
+			| files_sharing | public@@@enabled | 1 |
+			| files_sharing | public@@@upload | 1 |
+			| files_sharing | resharing | 1 |
+			| files_sharing | federation@@@outgoing | EMPTY |
+			| files_sharing | federation@@@incoming | 1 |
+			| files | bigfilechunking | 1 |
+			| files | undelete | 1 |
+			| files | versioning | 1 |
 
 	Scenario: Changing federation incoming
 		Given As an "admin"
@@ -121,23 +121,102 @@ Feature: capabilities
 		When sending "GET" to "/cloud/capabilities"
 		Then the HTTP status code should be "200"
 		And fields of capabilities match with
-			| capability | feature | value_or_subfeature | value |
-			| core | pollinterval | 60 | |
-			| core | webdav-root | remote.php/webdav | |
-			| files_sharing | api_enabled | 1 | |
-			| files_sharing | public | enabled | 1 |
-			| files_sharing | public | upload | 1 |
-			| files_sharing | resharing | 1 | |
-			| files_sharing | federation | outgoing | 1 |
-			| files_sharing | federation | incoming | EMPTY |
-			| files | bigfilechunking | 1 | |
-			| files | undelete | 1 | |
-			| files | versioning | 1 | |
-
-
-
-
-
-
+			| capability | path_to_element | value |
+			| core | pollinterval | 60 |
+			| core | webdav-root | remote.php/webdav |
+			| files_sharing | api_enabled | 1 |
+			| files_sharing | public@@@enabled | 1 |
+			| files_sharing | public@@@upload | 1 |
+			| files_sharing | resharing | 1 |
+			| files_sharing | federation@@@outgoing | 1 |
+			| files_sharing | federation@@@incoming | EMPTY |
+			| files | bigfilechunking | 1 |
+			| files | undelete | 1 |
+			| files | versioning | 1 |
+
+	Scenario: Changing password enforce
+		Given As an "admin"
+		And parameter "shareapi_enforce_links_password" of app "core" is set to "yes"
+		When sending "GET" to "/cloud/capabilities"
+		Then the HTTP status code should be "200"
+		And fields of capabilities match with
+			| capability | path_to_element | value |
+			| core | pollinterval | 60 |
+			| core | webdav-root | remote.php/webdav |
+			| files_sharing | api_enabled | 1 |
+			| files_sharing | public@@@enabled | 1 |
+			| files_sharing | public@@@upload | 1 |
+			| files_sharing | public@@@password@@@enforced | 1 |
+			| files_sharing | resharing | 1 |
+			| files_sharing | federation@@@outgoing | 1 |
+			| files_sharing | federation@@@incoming | 1 |
+			| files | bigfilechunking | 1 |
+			| files | undelete | 1 |
+			| files | versioning | 1 |
+
+	Scenario: Changing public notifications
+		Given As an "admin"
+		And parameter "shareapi_allow_public_notification" of app "core" is set to "yes"
+		When sending "GET" to "/cloud/capabilities"
+		Then the HTTP status code should be "200"
+		And fields of capabilities match with
+			| capability | path_to_element | value |
+			| core | pollinterval | 60 |
+			| core | webdav-root | remote.php/webdav |
+			| files_sharing | api_enabled | 1 |
+			| files_sharing | public@@@enabled | 1 |
+			| files_sharing | public@@@upload | 1 |
+			| files_sharing | public@@@send_mail | 1 |
+			| files_sharing | resharing | 1 |
+			| files_sharing | federation@@@outgoing | 1 |
+			| files_sharing | federation@@@incoming | 1 |
+			| files | bigfilechunking | 1 |
+			| files | undelete | 1 |
+			| files | versioning | 1 |
+
+	Scenario: Changing expire date
+		Given As an "admin"
+		And parameter "shareapi_default_expire_date" of app "core" is set to "yes"
+		When sending "GET" to "/cloud/capabilities"
+		Then the HTTP status code should be "200"
+		And fields of capabilities match with
+			| capability | path_to_element | value |
+			| core | pollinterval | 60 |
+			| core | webdav-root | remote.php/webdav |
+			| files_sharing | api_enabled | 1 |
+			| files_sharing | public@@@enabled | 1 |
+			| files_sharing | public@@@upload | 1 |
+			| files_sharing | public@@@expire_date@@@enabled | 1 |
+			| files_sharing | resharing | 1 |
+			| files_sharing | federation@@@outgoing | 1 |
+			| files_sharing | federation@@@incoming | 1 |
+			| files | bigfilechunking | 1 |
+			| files | undelete | 1 |
+			| files | versioning | 1 |
+
+	Scenario: Changing expire date enforcing
+		Given As an "admin"
+		And parameter "shareapi_default_expire_date" of app "core" is set to "yes"
+		And parameter "shareapi_enforce_expire_date" of app "core" is set to "yes"
+		When sending "GET" to "/cloud/capabilities"
+		Then the HTTP status code should be "200"
+		And fields of capabilities match with
+			| capability | path_to_element | value |
+			| core | pollinterval | 60 |
+			| core | webdav-root | remote.php/webdav |
+			| files_sharing | api_enabled | 1 |
+			| files_sharing | public@@@enabled | 1 |
+			| files_sharing | public@@@upload | 1 |
+			| files_sharing | public@@@expire_date@@@enabled | 1 |
+			| files_sharing | public@@@expire_date@@@enforced | 1 |
+			| files_sharing | resharing | 1 |
+			| files_sharing | federation@@@outgoing | 1 |
+			| files_sharing | federation@@@incoming | 1 |
+			| files | bigfilechunking | 1 |
+			| files | undelete | 1 |
+			| files | versioning | 1 |
+		
+
+			
 
 
diff --git a/build/integration/features/bootstrap/CapabilitiesContext.php b/build/integration/features/bootstrap/CapabilitiesContext.php
index e423be7f9f..a39150d037 100644
--- a/build/integration/features/bootstrap/CapabilitiesContext.php
+++ b/build/integration/features/bootstrap/CapabilitiesContext.php
@@ -29,21 +29,18 @@ class CapabilitiesContext implements Context, SnippetAcceptingContext {
 		$capabilitiesXML = $this->response->xml()->data->capabilities;
 
 		foreach ($formData->getHash() as $row) {
-			if ($row['value'] === ''){
-				$answeredValue = (string)$capabilitiesXML->$row['capability']->$row['feature'];
-				PHPUnit_Framework_Assert::assertEquals(
-					$row['value_or_subfeature']==="EMPTY" ? '' : $row['value_or_subfeature'],
-					$answeredValue,
-					"Failed field " . $row['capability'] . " " . $row['feature']
-				);
-			} else{
-				$answeredValue = (string)$capabilitiesXML->$row['capability']->$row['feature']->$row['value_or_subfeature'];
-				PHPUnit_Framework_Assert::assertEquals(
-					$row['value']==="EMPTY" ? '' : $row['value'],
-					$answeredValue,
-					"Failed field: " . $row['capability'] . " " . $row['feature'] . " " . $row['value_or_subfeature']
-				);
+			$path_to_element = explode('@@@', $row['path_to_element']);
+			$answeredValue = $capabilitiesXML->$row['capability'];
+			for ($i = 0; $i < count($path_to_element); $i++){
+				$answeredValue = $answeredValue->$path_to_element[$i];
 			}
+			$answeredValue = (string)$answeredValue;
+			PHPUnit_Framework_Assert::assertEquals(
+				$row['value']==="EMPTY" ? '' : $row['value'],
+				$answeredValue,
+				"Failed field " . $row['capability'] . " " . $row['path_to_element']
+			);
+
 		}
 	}
 
@@ -57,6 +54,10 @@ class CapabilitiesContext implements Context, SnippetAcceptingContext {
 		$this->modifyServerConfig('core', 'shareapi_allow_resharing', 'yes');
 		$this->modifyServerConfig('files_sharing', 'outgoing_server2server_share_enabled', 'yes');
 		$this->modifyServerConfig('files_sharing', 'incoming_server2server_share_enabled', 'yes');
+		$this->modifyServerConfig('core', 'shareapi_enforce_links_password', 'no');
+		$this->modifyServerConfig('core', 'shareapi_allow_public_notification', 'no');
+		$this->modifyServerConfig('core', 'shareapi_default_expire_date', 'no');
+		$this->modifyServerConfig('core', 'shareapi_enforce_expire_date', 'no');
 	}
 
 	/**
@@ -69,6 +70,10 @@ class CapabilitiesContext implements Context, SnippetAcceptingContext {
 		$this->modifyServerConfig('core', 'shareapi_allow_resharing', 'yes');
 		$this->modifyServerConfig('files_sharing', 'outgoing_server2server_share_enabled', 'yes');
 		$this->modifyServerConfig('files_sharing', 'incoming_server2server_share_enabled', 'yes');
+		$this->modifyServerConfig('core', 'shareapi_enforce_links_password', 'no');
+		$this->modifyServerConfig('core', 'shareapi_allow_public_notification', 'no');
+		$this->modifyServerConfig('core', 'shareapi_default_expire_date', 'no');
+		$this->modifyServerConfig('core', 'shareapi_enforce_expire_date', 'no');
 	}
 
 	/**

From 1959171d5dadde8b5eb7e199d2b9dd1db1a48aac Mon Sep 17 00:00:00 2001
From: Joas Schilling <nickvergessen@owncloud.com>
Date: Fri, 11 Dec 2015 15:23:22 +0100
Subject: [PATCH 6/7] Speed up the tests by reseting the configs and app only
 when needed

---
 .../capabilities.feature                      |  5 --
 .../bootstrap/CapabilitiesContext.php         | 69 +++++++++++++------
 2 files changed, 47 insertions(+), 27 deletions(-)

diff --git a/build/integration/capabilities_features/capabilities.feature b/build/integration/capabilities_features/capabilities.feature
index f219ece56c..3c1eb025ec 100644
--- a/build/integration/capabilities_features/capabilities.feature
+++ b/build/integration/capabilities_features/capabilities.feature
@@ -215,8 +215,3 @@ Feature: capabilities
 			| files | bigfilechunking | 1 |
 			| files | undelete | 1 |
 			| files | versioning | 1 |
-		
-
-			
-
-
diff --git a/build/integration/features/bootstrap/CapabilitiesContext.php b/build/integration/features/bootstrap/CapabilitiesContext.php
index a39150d037..14fbf1ebc0 100644
--- a/build/integration/features/bootstrap/CapabilitiesContext.php
+++ b/build/integration/features/bootstrap/CapabilitiesContext.php
@@ -2,6 +2,10 @@
 
 use Behat\Behat\Context\Context;
 use Behat\Behat\Context\SnippetAcceptingContext;
+use Behat\Behat\Hook\Scope\AfterScenarioScope;
+use Behat\Behat\Hook\Scope\BeforeScenarioScope;
+use GuzzleHttp\Client;
+use GuzzleHttp\Message\ResponseInterface;
 
 require __DIR__ . '/../../vendor/autoload.php';
 
@@ -18,7 +22,12 @@ class CapabilitiesContext implements Context, SnippetAcceptingContext {
 	 * @Given /^parameter "([^"]*)" of app "([^"]*)" is set to "([^"]*)"$/
 	 */
 	public function serverParameterIsSetTo($parameter, $app, $value){
+		$user = $this->currentUser;
+		$this->currentUser = 'admin';
+
 		$this->modifyServerConfig($app, $parameter, $value);
+
+		$this->currentUser = $user;
 	}
 
 	/**
@@ -46,8 +55,20 @@ class CapabilitiesContext implements Context, SnippetAcceptingContext {
 
 	/**
 	 * @BeforeScenario
+	 *
+	 * Enable the testing app before the first scenario of the feature and
+	 * reset the configs before each scenario
+	 * @param BeforeScenarioScope $event
 	 */
-	public function prepareParameters(){
+	public function prepareParameters(BeforeScenarioScope $event){
+		$user = $this->currentUser;
+		$this->currentUser = 'admin';
+
+		$scenarios = $event->getFeature()->getScenarios();
+		if ($event->getScenario() === reset($scenarios)) {
+			$this->setStatusTestingApp(true);
+		}
+
 		$this->modifyServerConfig('core', 'shareapi_enabled', 'yes');
 		$this->modifyServerConfig('core', 'shareapi_allow_links', 'yes');
 		$this->modifyServerConfig('core', 'shareapi_allow_public_upload', 'yes');
@@ -58,22 +79,36 @@ class CapabilitiesContext implements Context, SnippetAcceptingContext {
 		$this->modifyServerConfig('core', 'shareapi_allow_public_notification', 'no');
 		$this->modifyServerConfig('core', 'shareapi_default_expire_date', 'no');
 		$this->modifyServerConfig('core', 'shareapi_enforce_expire_date', 'no');
+
+		$this->currentUser = $user;
 	}
 
 	/**
 	 * @AfterScenario
+	 *
+	 * Reset the values after the last scenario of the feature and disable the testing app
+	 * @param AfterScenarioScope $event
 	 */
-	public function undoChangingParameters(){
-		$this->modifyServerConfig('core', 'shareapi_enabled', 'yes');
-		$this->modifyServerConfig('core', 'shareapi_allow_links', 'yes');
-		$this->modifyServerConfig('core', 'shareapi_allow_public_upload', 'yes');
-		$this->modifyServerConfig('core', 'shareapi_allow_resharing', 'yes');
-		$this->modifyServerConfig('files_sharing', 'outgoing_server2server_share_enabled', 'yes');
-		$this->modifyServerConfig('files_sharing', 'incoming_server2server_share_enabled', 'yes');
-		$this->modifyServerConfig('core', 'shareapi_enforce_links_password', 'no');
-		$this->modifyServerConfig('core', 'shareapi_allow_public_notification', 'no');
-		$this->modifyServerConfig('core', 'shareapi_default_expire_date', 'no');
-		$this->modifyServerConfig('core', 'shareapi_enforce_expire_date', 'no');
+	public function undoChangingParameters(AfterScenarioScope $event) {
+		$scenarios = $event->getFeature()->getScenarios();
+		if ($event->getScenario() === end($scenarios)) {
+			$user = $this->currentUser;
+			$this->currentUser = 'admin';
+
+			$this->modifyServerConfig('core', 'shareapi_enabled', 'yes');
+			$this->modifyServerConfig('core', 'shareapi_allow_links', 'yes');
+			$this->modifyServerConfig('core', 'shareapi_allow_public_upload', 'yes');
+			$this->modifyServerConfig('core', 'shareapi_allow_resharing', 'yes');
+			$this->modifyServerConfig('files_sharing', 'outgoing_server2server_share_enabled', 'yes');
+			$this->modifyServerConfig('files_sharing', 'incoming_server2server_share_enabled', 'yes');
+			$this->modifyServerConfig('core', 'shareapi_enforce_links_password', 'no');
+			$this->modifyServerConfig('core', 'shareapi_allow_public_notification', 'no');
+			$this->modifyServerConfig('core', 'shareapi_default_expire_date', 'no');
+			$this->modifyServerConfig('core', 'shareapi_enforce_expire_date', 'no');
+
+			$this->setStatusTestingApp(false);
+			$this->currentUser = $user;
+		}
 	}
 
 	/**
@@ -82,20 +117,10 @@ class CapabilitiesContext implements Context, SnippetAcceptingContext {
 	 * @param string $value
 	 */
 	protected function modifyServerConfig($app, $parameter, $value) {
-		$user = $this->currentUser;
-
-		$this->currentUser = 'admin';
-
-		$this->setStatusTestingApp(true);
-
 		$body = new \Behat\Gherkin\Node\TableNode([['value', $value]]);
 		$this->sendingToWith('post', "/apps/testing/api/v1/app/{$app}/{$parameter}", $body);
 		$this->theHTTPStatusCodeShouldBe('200');
 		$this->theOCSStatusCodeShouldBe('100');
-
-		$this->setStatusTestingApp(false);
-
-		$this->currentUser = $user;
 	}
 
 	protected function setStatusTestingApp($enabled) {

From 671b06a86b8c7ffae0e29e20913c44e22be027fb Mon Sep 17 00:00:00 2001
From: Joas Schilling <nickvergessen@owncloud.com>
Date: Fri, 11 Dec 2015 15:28:21 +0100
Subject: [PATCH 7/7] Deduplicate the array

---
 .../bootstrap/CapabilitiesContext.php         | 35 ++++++++-----------
 1 file changed, 15 insertions(+), 20 deletions(-)

diff --git a/build/integration/features/bootstrap/CapabilitiesContext.php b/build/integration/features/bootstrap/CapabilitiesContext.php
index 14fbf1ebc0..d30984f0db 100644
--- a/build/integration/features/bootstrap/CapabilitiesContext.php
+++ b/build/integration/features/bootstrap/CapabilitiesContext.php
@@ -53,6 +53,19 @@ class CapabilitiesContext implements Context, SnippetAcceptingContext {
 		}
 	}
 
+	protected function resetAppConfigs() {
+		$this->modifyServerConfig('core', 'shareapi_enabled', 'yes');
+		$this->modifyServerConfig('core', 'shareapi_allow_links', 'yes');
+		$this->modifyServerConfig('core', 'shareapi_allow_public_upload', 'yes');
+		$this->modifyServerConfig('core', 'shareapi_allow_resharing', 'yes');
+		$this->modifyServerConfig('files_sharing', 'outgoing_server2server_share_enabled', 'yes');
+		$this->modifyServerConfig('files_sharing', 'incoming_server2server_share_enabled', 'yes');
+		$this->modifyServerConfig('core', 'shareapi_enforce_links_password', 'no');
+		$this->modifyServerConfig('core', 'shareapi_allow_public_notification', 'no');
+		$this->modifyServerConfig('core', 'shareapi_default_expire_date', 'no');
+		$this->modifyServerConfig('core', 'shareapi_enforce_expire_date', 'no');
+	}
+
 	/**
 	 * @BeforeScenario
 	 *
@@ -69,16 +82,7 @@ class CapabilitiesContext implements Context, SnippetAcceptingContext {
 			$this->setStatusTestingApp(true);
 		}
 
-		$this->modifyServerConfig('core', 'shareapi_enabled', 'yes');
-		$this->modifyServerConfig('core', 'shareapi_allow_links', 'yes');
-		$this->modifyServerConfig('core', 'shareapi_allow_public_upload', 'yes');
-		$this->modifyServerConfig('core', 'shareapi_allow_resharing', 'yes');
-		$this->modifyServerConfig('files_sharing', 'outgoing_server2server_share_enabled', 'yes');
-		$this->modifyServerConfig('files_sharing', 'incoming_server2server_share_enabled', 'yes');
-		$this->modifyServerConfig('core', 'shareapi_enforce_links_password', 'no');
-		$this->modifyServerConfig('core', 'shareapi_allow_public_notification', 'no');
-		$this->modifyServerConfig('core', 'shareapi_default_expire_date', 'no');
-		$this->modifyServerConfig('core', 'shareapi_enforce_expire_date', 'no');
+		$this->resetAppConfigs();
 
 		$this->currentUser = $user;
 	}
@@ -95,16 +99,7 @@ class CapabilitiesContext implements Context, SnippetAcceptingContext {
 			$user = $this->currentUser;
 			$this->currentUser = 'admin';
 
-			$this->modifyServerConfig('core', 'shareapi_enabled', 'yes');
-			$this->modifyServerConfig('core', 'shareapi_allow_links', 'yes');
-			$this->modifyServerConfig('core', 'shareapi_allow_public_upload', 'yes');
-			$this->modifyServerConfig('core', 'shareapi_allow_resharing', 'yes');
-			$this->modifyServerConfig('files_sharing', 'outgoing_server2server_share_enabled', 'yes');
-			$this->modifyServerConfig('files_sharing', 'incoming_server2server_share_enabled', 'yes');
-			$this->modifyServerConfig('core', 'shareapi_enforce_links_password', 'no');
-			$this->modifyServerConfig('core', 'shareapi_allow_public_notification', 'no');
-			$this->modifyServerConfig('core', 'shareapi_default_expire_date', 'no');
-			$this->modifyServerConfig('core', 'shareapi_enforce_expire_date', 'no');
+			$this->resetAppConfigs();
 
 			$this->setStatusTestingApp(false);
 			$this->currentUser = $user;