Added integration tests directly in the code PR

4 files changed, 259 insertions, 3 deletions

diff --git a/build/integration/features/bootstrap/Provisioning.php b/build/integration/features/bootstrap/Provisioning.php
index ff090f5abb8..6cf57514483 100644
--- a/build/integration/features/bootstrap/Provisioning.php
+++ b/build/integration/features/bootstrap/Provisioning.php
@@ -230,9 +230,9 @@ trait Provisioning {
 	}
 
 	/**
-	 * @When /^user "([^"]*)" is disabled$/
+	 * @When /^assure user "([^"]*)" is disabled$/
 	 */
-	public function userIsDisabled($user) {
+	public function assureUserIsDisabled($user) {
 		$fullUrl = $this->baseUrl . "v{$this->apiVersion}.php/cloud/users/$user/disable";
 		$client = new Client();
 		$options = [];
@@ -377,6 +377,25 @@ trait Provisioning {
 	}
 
 	/**
+	 * @Given /^Assure user "([^"]*)" is subadmin of group "([^"]*)"$/
+	 * @param string $user
+	 * @param string $group
+	 */
+	public function assureUserIsSubadminOfGroup($user, $group) {
+		$fullUrl = $this->baseUrl . "v{$this->apiVersion}.php/cloud/users/$user/subadmins";
+		$client = new Client();
+		$options = [];
+		if ($this->currentUser === 'admin') {
+			$options['auth'] = $this->adminUser;
+		}
+		$options['body'] = [
+							'groupid' => $group
+							];
+		$this->response = $client->send($client->createRequest("POST", $fullUrl, $options));
+		PHPUnit_Framework_Assert::assertEquals(200, $this->response->getStatusCode());
+	}
+
+	/**
 	 * @Given /^user "([^"]*)" is not a subadmin of group "([^"]*)"$/
 	 * @param string $user
 	 * @param string $group
@@ -542,6 +561,38 @@ trait Provisioning {
 	}
 
 	/**
+	 * @Then /^user "([^"]*)" is disabled$/
+	 * @param string $user
+	 */
+	public function userIsDisabled($user) {
+		$fullUrl = $this->baseUrl . "v{$this->apiVersion}.php/cloud/users/$user";
+		$client = new Client();
+		$options = [];
+		if ($this->currentUser === 'admin') {
+			$options['auth'] = $this->adminUser;
+		}
+
+		$this->response = $client->get($fullUrl, $options);
+		PHPUnit_Framework_Assert::assertEquals("false", $this->response->xml()->data[0]->enabled);
+	}
+
+	/**
+	 * @Then /^user "([^"]*)" is enabled$/
+	 * @param string $user
+	 */
+	public function userIsEnabled($user) {
+		$fullUrl = $this->baseUrl . "v{$this->apiVersion}.php/cloud/users/$user";
+		$client = new Client();
+		$options = [];
+		if ($this->currentUser === 'admin') {
+			$options['auth'] = $this->adminUser;
+		}
+
+		$this->response = $client->get($fullUrl, $options);
+		PHPUnit_Framework_Assert::assertEquals("true", $this->response->xml()->data[0]->enabled);
+	}
+
+	/**
 	 * @Given user :user has a quota of :quota
 	 * @param string $user
 	 * @param string $quota
diff --git a/build/integration/features/provisioning-v1.feature b/build/integration/features/provisioning-v1.feature
index 8c32c04523c..5041f18b1b0 100644
--- a/build/integration/features/provisioning-v1.feature
+++ b/build/integration/features/provisioning-v1.feature
@@ -315,3 +315,196 @@ Feature: provisioning
 		Then the OCS status code should be "100"
 		And the HTTP status code should be "200"
 		And app "files_external" is disabled
+
+	Scenario: disable an user
+		Given As an "admin"
+		And user "user1" exists
+		When sending "PUT" to "/cloud/users/user1/disable"
+		Then the OCS status code should be "100"
+		And the HTTP status code should be "200"
+		And user "user1" is disabled
+
+	Scenario: enable an user
+		Given As an "admin"
+		And user "user1" exists
+		And assure user "user1" is disabled
+		When sending "PUT" to "/cloud/users/user1/enable"
+		Then the OCS status code should be "100"
+		And the HTTP status code should be "200"
+		And user "user1" is enabled
+
+	Scenario: Subadmin should be able to enable or disable an user in their group
+		Given As an "admin"
+		And user "subadmin" exists
+		And user "user1" exists
+		And group "new-group" exists
+		And user "subadmin" belongs to group "new-group"
+		And user "user1" belongs to group "new-group"
+		And Assure user "subadmin" is subadmin of group "new-group"
+		And As an "subadmin"
+		When sending "PUT" to "/cloud/users/user1/disable"
+		Then the OCS status code should be "100"
+		Then the HTTP status code should be "200"
+		And As an "admin"
+		And user "user1" is disabled
+
+	Scenario: Subadmin should not be able to enable or disable an user not in their group
+		Given As an "admin"
+		And user "subadmin" exists
+		And user "user1" exists
+		And group "new-group" exists
+		And group "another-group" exists
+		And user "subadmin" belongs to group "new-group"
+		And user "user1" belongs to group "another-group"
+		And Assure user "subadmin" is subadmin of group "new-group"
+		And As an "subadmin"
+		When sending "PUT" to "/cloud/users/user1/disable"
+		Then the OCS status code should be "997"
+		Then the HTTP status code should be "401"
+		And As an "admin"
+		And user "user1" is enabled
+
+	Scenario: Subadmins should not be able to disable users that have admin permissions in their group
+		Given As an "admin"
+		And user "another-admin" exists
+		And user "subadmin" exists
+		And group "new-group" exists
+		And user "another-admin" belongs to group "admin"
+		And user "subadmin" belongs to group "new-group"
+		And user "another-admin" belongs to group "new-group"
+		And Assure user "subadmin" is subadmin of group "new-group"
+		And As an "subadmin"
+		When sending "PUT" to "/cloud/users/another-admin/disable"
+		Then the OCS status code should be "997"
+		Then the HTTP status code should be "401"
+		And As an "admin"
+		And user "another-admin" is enabled
+
+	Scenario: Admin can disable another admin user
+		Given As an "admin"
+		And user "another-admin" exists
+		And user "another-admin" belongs to group "admin"
+		When sending "PUT" to "/cloud/users/another-admin/disable"
+		Then the OCS status code should be "100"
+		Then the HTTP status code should be "200"
+		And user "another-admin" is disabled
+
+	Scenario: Admin can enable another admin user
+		Given As an "admin"
+		And user "another-admin" exists
+		And user "another-admin" belongs to group "admin"
+		And assure user "another-admin" is disabled
+		When sending "PUT" to "/cloud/users/another-admin/enable"
+		Then the OCS status code should be "100"
+		Then the HTTP status code should be "200"
+		And user "another-admin" is enabled
+
+	Scenario: Admin can disable subadmins in the same group
+		Given As an "admin"
+		And user "subadmin" exists
+		And group "new-group" exists
+		And user "subadmin" belongs to group "new-group"
+		And user "admin" belongs to group "new-group"
+		And Assure user "subadmin" is subadmin of group "new-group"
+		When sending "PUT" to "/cloud/users/subadmin/disable"
+		Then the OCS status code should be "100"
+		Then the HTTP status code should be "200"
+		And user "subadmin" is disabled
+
+	Scenario: Admin can enable subadmins in the same group
+		Given As an "admin"
+		And user "subadmin" exists
+		And group "new-group" exists
+		And user "subadmin" belongs to group "new-group"
+		And user "admin" belongs to group "new-group"
+		And Assure user "subadmin" is subadmin of group "new-group"
+		And assure user "another-admin" is disabled
+		When sending "PUT" to "/cloud/users/subadmin/disable"
+		Then the OCS status code should be "100"
+		Then the HTTP status code should be "200"
+		And user "subadmin" is disabled
+
+	Scenario: Admin user cannot disable himself
+		Given As an "admin"
+		And user "another-admin" exists
+		And user "another-admin" belongs to group "admin"
+		And As an "another-admin"
+		When sending "PUT" to "/cloud/users/another-admin/disable"
+		Then the OCS status code should be "101"
+		And the HTTP status code should be "200"
+		And As an "admin"
+		And user "another-admin" is enabled
+
+	Scenario:Admin user cannot enable himself
+		Given As an "admin"
+		And user "another-admin" exists
+		And user "another-admin" belongs to group "admin"
+		And assure user "another-admin" is disabled
+		And As an "another-admin"
+		When sending "PUT" to "/cloud/users/another-admin/enable"
+		And As an "admin"
+		Then user "another-admin" is disabled
+
+	Scenario: disable an user with a regular user
+		Given As an "admin"
+		And user "user1" exists
+		And user "user2" exists
+		And As an "user1"
+		When sending "PUT" to "/cloud/users/user2/disable"
+		Then the OCS status code should be "997"
+		And the HTTP status code should be "401"
+		And As an "admin"
+		And user "user2" is enabled
+
+	Scenario: enable an user with a regular user
+		Given As an "admin"
+		And user "user1" exists
+		And user "user2" exists
+		And assure user "user2" is disabled
+		And As an "user1"
+		When sending "PUT" to "/cloud/users/user2/enable"
+		Then the OCS status code should be "997"
+		And the HTTP status code should be "401"
+		And As an "admin"
+		And user "user2" is disabled
+
+	Scenario: Subadmin should not be able to disable himself
+		Given As an "admin"
+		And user "subadmin" exists
+		And group "new-group" exists
+		And user "subadmin" belongs to group "new-group"
+		And Assure user "subadmin" is subadmin of group "new-group"
+		And As an "subadmin"
+		When sending "PUT" to "/cloud/users/subadmin/disable"
+		Then the OCS status code should be "101"
+		Then the HTTP status code should be "200"
+		And As an "admin"
+		And user "subadmin" is enabled
+
+	Scenario: Subadmin should not be able to enable himself
+		Given As an "admin"
+		And user "subadmin" exists
+		And group "new-group" exists
+		And user "subadmin" belongs to group "new-group"
+		And Assure user "subadmin" is subadmin of group "new-group"
+		And assure user "subadmin" is disabled
+		And As an "subadmin"
+		When sending "PUT" to "/cloud/users/subadmin/enabled"
+		And As an "admin"
+		And user "subadmin" is disabled
+
+	Scenario: Making a web request with an enabled user
+	    Given As an "admin"
+		And user "user0" exists
+		And As an "user0"
+		When sending "GET" to "/index.php/apps/files"
+		Then the HTTP status code should be "200"
+
+	Scenario: Making a web request with a disabled user
+	    Given As an "admin"
+		And user "user0" exists
+		And assure user "user0" is disabled
+		And As an "user0"
+		When sending "GET" to "/index.php/apps/files"
+		Then the HTTP status code should be "503"
+
diff --git a/build/integration/features/sharing-v1.feature b/build/integration/features/sharing-v1.feature
index d67afede953..a602ea40a9c 100644
--- a/build/integration/features/sharing-v1.feature
+++ b/build/integration/features/sharing-v1.feature
@@ -696,3 +696,15 @@ Feature: sharing
     Then user "user2" should see following elements
       | /foo/       |
       | /foo%20(2)/ |
+
+  Scenario: Creating a new share with a disabled user
+    Given As an "admin"
+    And user "user0" exists
+    And user "user1" exists
+    And assure user "user0" is disabled
+    And As an "user0"
+    When sending "POST" to "/apps/files_sharing/api/v1/shares" with
+      | path | welcome.txt |
+      | shareWith | user1 |
+      | shareType | 0 |
+    Then the HTTP status code should be "503"
diff --git a/build/integration/features/webdav-related.feature b/build/integration/features/webdav-related.feature
index f2343b6254f..f4d40615fa7 100644
--- a/build/integration/features/webdav-related.feature
+++ b/build/integration/features/webdav-related.feature
@@ -290,7 +290,7 @@ Feature: webdav-related
 	Scenario: A disabled user cannot use webdav
 		Given user "userToBeDisabled" exists
 		And As an "admin"
-		And user "userToBeDisabled" is disabled
+		And assure user "userToBeDisabled" is disabled
 		When Downloading file "/welcome.txt" as "userToBeDisabled"
 		Then the HTTP status code should be "503"