[stable10] Acceptance test refactoring and bug fixes

tests/acceptance/features/apiMain/carddav.feature

@@ -6,28 +6,28 @@ Feature: carddav
 
   @carddav
   Scenario: Accessing a not existing addressbook of another user
-    When user "admin" requests addressbook "user0/MyAddressbook" using the API
+    When user "admin" requests address book "user0/MyAddressbook" using the API
     Then the CardDAV HTTP status code should be "404"
     And the CardDAV exception should be "Sabre\DAV\Exception\NotFound"
     And the CardDAV error message should be "Addressbook with name 'MyAddressbook' could not be found"
 
   @carddav
   Scenario: Accessing a not shared addressbook of another user
-    And user "admin" has successfully created an addressbook named "MyAddressbook"
-    When user "user0" requests addressbook "admin/MyAddressbook" using the API
+    And user "admin" has successfully created an address book named "MyAddressbook"
+    When user "user0" requests address book "admin/MyAddressbook" using the API
     Then the CardDAV HTTP status code should be "404"
     And the CardDAV exception should be "Sabre\DAV\Exception\NotFound"
     And the CardDAV error message should be "Addressbook with name 'MyAddressbook' could not be found"
 
   @carddav
   Scenario: Accessing a not existing addressbook of myself
-    When user "user0" requests addressbook "admin/MyAddressbook" using the API
+    When user "user0" requests address book "admin/MyAddressbook" using the API
     Then the CardDAV HTTP status code should be "404"
     And the CardDAV exception should be "Sabre\DAV\Exception\NotFound"
     And the CardDAV error message should be "Addressbook with name 'MyAddressbook' could not be found"
 
   @carddav
   Scenario: Creating a new addressbook
-    Given user "user0" has successfully created an addressbook named "MyAddressbook"
-    When user "user0" requests addressbook "user0/MyAddressbook" using the API
+    Given user "user0" has successfully created an address book named "MyAddressbook"
+    When user "user0" requests address book "user0/MyAddressbook" using the API
     Then the CardDAV HTTP status code should be "200"

tests/acceptance/features/apiMain/tags.feature

@@ -185,10 +185,10 @@ Feature: tags
     When user "user0" adds the tag "MyFirstTag" to "/myFileToTag.txt" owned by "user0" using the API
     And user "another_admin" adds the tag "MySecondTag" to "/myFileToTag.txt" shared by "user0" using the API
     Then the HTTP status code should be "201"
-    And file "/myFileToTag.txt" shared by "user0" should have the following tags for "another_admin"
+    And file "/myFileToTag.txt" should have the following tags for user "another_admin"
       | MyFirstTag  | normal           |
       | MySecondTag | not user-visible |
-    And file "/myFileToTag.txt" shared by "user0" should have the following tags for "user0"
+    And file "/myFileToTag.txt" should have the following tags for user "user0"
       | MyFirstTag | normal |
 
   Scenario: Assigning a not user-assignable tag to a file shared by someone else as admin user should work
@@ -202,10 +202,10 @@ Feature: tags
     When user "user0" adds the tag "MyFirstTag" to "/myFileToTag.txt" shared by "user0" using the API
     And user "another_admin" adds the tag "MySecondTag" to "/myFileToTag.txt" shared by "user0" using the API
     Then the HTTP status code should be "201"
-    And file "/myFileToTag.txt" shared by "user0" should have the following tags for "another_admin"
+    And file "/myFileToTag.txt" should have the following tags for user "another_admin"
       | MyFirstTag  | normal              |
       | MySecondTag | not user-assignable |
-    And file "/myFileToTag.txt" shared by "user0" should have the following tags for "user0"
+    And file "/myFileToTag.txt" should have the following tags for user "user0"
       | MyFirstTag  | normal              |
       | MySecondTag | not user-assignable |
 
@@ -220,7 +220,7 @@ Feature: tags
     And user "user0" has added the tag "MySecondTag" to "/myFileToTag.txt" owned by "user0"
     When user "user1" removes the tag "MyFirstTag" from "/myFileToTag.txt" shared by "user0" using the API
     Then the HTTP status code should be "204"
-    And file "/myFileToTag.txt" shared by "user0" should have the following tags for "user0"
+    And file "/myFileToTag.txt" should have the following tags for user "user0"
       | MySecondTag | normal |
 
   Scenario: Unassigning a normal tag from a file unshared by someone else as regular user should fail
@@ -233,7 +233,7 @@ Feature: tags
     And user "user0" has added the tag "MySecondTag" to "/myFileToTag.txt" shared by "user0"
     When user "user1" removes the tag "MyFirstTag" from "/myFileToTag.txt" shared by "user0" using the API
     Then the HTTP status code should be "404"
-    And file "/myFileToTag.txt" shared by "user0" should have the following tags for "user0"
+    And file "/myFileToTag.txt" should have the following tags for user "user0"
       | MyFirstTag  | normal |
       | MySecondTag | normal |
 
@@ -251,9 +251,9 @@ Feature: tags
     And user "user0" has added the tag "MySecondTag" to "/myFileToTag.txt" shared by "user0"
     When user "user1" removes the tag "MyFirstTag" from "/myFileToTag.txt" shared by "user0" using the API
     Then the HTTP status code should be "404"
-    And file "/myFileToTag.txt" shared by "user0" should have the following tags for "user0"
+    And file "/myFileToTag.txt" should have the following tags for user "user0"
       | MySecondTag | normal |
-    And file "/myFileToTag.txt" shared by "user0" should have the following tags for "another_admin"
+    And file "/myFileToTag.txt" should have the following tags for user "another_admin"
       | MyFirstTag  | not user-visible |
       | MySecondTag | normal           |
 
@@ -271,9 +271,9 @@ Feature: tags
     And user "user0" has added the tag "MySecondTag" to "/myFileToTag.txt" shared by "user0"
     When user "another_admin" removes the tag "MyFirstTag" from "/myFileToTag.txt" shared by "user0" using the API
     Then the HTTP status code should be "204"
-    And file "/myFileToTag.txt" shared by "user0" should have the following tags for "user0"
+    And file "/myFileToTag.txt" should have the following tags for user "user0"
       | MySecondTag | normal |
-    And file "/myFileToTag.txt" shared by "user0" should have the following tags for "another_admin"
+    And file "/myFileToTag.txt" should have the following tags for user "another_admin"
       | MySecondTag | normal |
 
   Scenario: Unassigning a not user-visible tag from a file unshared by someone else should fail
@@ -306,10 +306,10 @@ Feature: tags
     And user "user0" has added the tag "MySecondTag" to "/myFileToTag.txt" shared by "user0"
     When user "user1" removes the tag "MyFirstTag" from "/myFileToTag.txt" shared by "user0" using the API
     Then the HTTP status code should be "403"
-    And file "/myFileToTag.txt" shared by "user0" should have the following tags for "user0"
+    And file "/myFileToTag.txt" should have the following tags for user "user0"
       | MyFirstTag  | not user-assignable |
       | MySecondTag | normal              |
-    And file "/myFileToTag.txt" shared by "user0" should have the following tags for "another_admin"
+    And file "/myFileToTag.txt" should have the following tags for user "another_admin"
       | MyFirstTag  | not user-assignable |
       | MySecondTag | normal              |
 
@@ -327,9 +327,9 @@ Feature: tags
     And user "user0" has added the tag "MySecondTag" to "/myFileToTag.txt" shared by "user0"
     When user "another_admin" removes the tag "MyFirstTag" from "/myFileToTag.txt" shared by "user0" using the API
     Then the HTTP status code should be "204"
-    And file "/myFileToTag.txt" shared by "user0" should have the following tags for "user0"
+    And file "/myFileToTag.txt" should have the following tags for user "user0"
       | MySecondTag | normal |
-    And file "/myFileToTag.txt" shared by "user0" should have the following tags for "another_admin"
+    And file "/myFileToTag.txt" should have the following tags for user "another_admin"
       | MySecondTag | normal |
 
   Scenario: Unassigning a not user-assignable tag from a file unshared by someone else should fail
@@ -370,9 +370,9 @@ Feature: tags
     And user "admin" has created a "normal" tag with name "MyFirstTag"
     And user "user0" has uploaded file "data/textfile.txt" to "/myFileToTag.txt"
     When user "user0" adds the tag "MyFirstTag" to "/myFileToTag.txt" shared by "user0" using the API
-    Then file "/myFileToTag.txt" shared by "user0" should have the following tags for "user0"
+    Then file "/myFileToTag.txt" should have the following tags for user "user0"
       | MyFirstTag | normal |
-    And file "/myFileToTag.txt" shared by "user0" should have the following tags for "user1"
+    And file "/myFileToTag.txt" should have the following tags for user "user1"
       ||
 
   Scenario: User can assign tags when in the tag's groups

tests/acceptance/features/apiProvisioning-v1/getUserGroups.feature

@@ -52,4 +52,12 @@ So that I can manage group membership
 		When user "anotheruser" sends HTTP method "GET" to API endpoint "/cloud/users/newuser/groups"
 		Then the OCS status code should be "997"
 		And the HTTP status code should be "401"
-		And the API should not return any data
+		And the API should not return any data
+
+	Scenario: admin gets groups of an user who is not in any groups
+		Given user "brand-new-user" has been created
+		And group "unused-group" has been created
+		When user "admin" sends HTTP method "GET" to API endpoint "/cloud/users/brand-new-user/groups"
+		Then the OCS status code should be "100"
+		And the HTTP status code should be "200"
+		And the list of groups returned by the API should be empty

tests/acceptance/features/apiSharing-v1/deleteShare.feature

@@ -27,6 +27,7 @@ Feature: sharing
 
 	Scenario: orphaned shares
 		Given user "user0" has been created
+		And a new browser session for "user0" has been started
 		And user "user1" has been created
 		And user "user0" has created a folder "/common"
 		And user "user0" has created a folder "/common/sub"

tests/acceptance/features/apiTrashbin/trashbin-new-endpoint.feature

@@ -82,10 +82,11 @@ Feature: trashbin-new-endpoint
 
 	Scenario: Trashbin can be emptied
 		Given user "user0" has been created
+		And a new browser session for "user0" has been started
 		And user "user0" has deleted file "/textfile0.txt"
 		And user "user0" has deleted file "/textfile1.txt"
 		And as "user0" the file "/textfile0.txt" should exist in trash
-		And as "user0" the file "/textfile0.txt" should exist in trash
+		And as "user0" the file "/textfile1.txt" should exist in trash
 		When user "user0" empties the trashbin using the API
 		Then as "user0" the file with original path "/textfile0.txt" should not exist in trash
 		And as "user0" the file with original path "/textfile1.txt" should not exist in trash

tests/acceptance/features/apiTrashbin/trashbin-old-endpoint.feature

@@ -82,10 +82,11 @@ Feature: trashbin-new-endpoint
 
 	Scenario: Trashbin can be emptied
 		Given user "user0" has been created
+		And a new browser session for "user0" has been started
 		And user "user0" has deleted file "/textfile0.txt"
 		And user "user0" has deleted file "/textfile1.txt"
 		And as "user0" the file "/textfile0.txt" should exist in trash
-		And as "user0" the file "/textfile0.txt" should exist in trash
+		And as "user0" the file "/textfile1.txt" should exist in trash
 		When user "user0" empties the trashbin using the API
 		Then as "user0" the file with original path "/textfile0.txt" should not exist in trash
 		And as "user0" the file with original path "/textfile1.txt" should not exist in trash

tests/acceptance/features/bootstrap/AppConfiguration.php

@@ -22,7 +22,7 @@
  *
  */
 
-use Behat\Behat\Hook\Scope\BeforeScenarioScope;
+use Behat\Gherkin\Node\TableNode;
 use TestHelpers\AppConfigHelper;
 
 require __DIR__ . '/../../../../lib/composer/autoload.php';
@@ -58,7 +58,7 @@ abstract public function sendingTo($verb, $url);
 	/**
 	 * @param string $verb
 	 * @param string $url
-	 * @param \Behat\Gherkin\Node\TableNode $body
+	 * @param TableNode $body
 	 *
 	 * @return void
 	 */
@@ -247,7 +247,7 @@ protected function modifyServerConfig($app, $parameter, $value) {
 	}
 
 	/**
-	 * @param string $appParameterValues
+	 * @param array $appParameterValues
 	 *
 	 * @return void
 	 */
@@ -300,10 +300,9 @@ abstract protected function resetAppConfigs();
 	/**
 	 * @BeforeScenario
 	 *
-	 * @param BeforeScenarioScope $scope
 	 * @return void
 	 */
-	public function prepareParametersBeforeScenario(BeforeScenarioScope $scope) {
+	public function prepareParametersBeforeScenario() {
 		$user = $this->currentUser;
 		$this->currentUser = $this->getAdminUsername();
 		$this->resetAppConfigs();

tests/acceptance/features/bootstrap/Auth.php

@@ -264,7 +264,7 @@ public function aNewBrowserSessionForHasBeenStarted($user) {
 	 * @param string $hasOrNot
 	 *
 	 * @return void
-	 * @throws Exception
+	 * @throws \Exception
 	 */
 	public function tokenAuthHasBeenEnforced($hasOrNot) {
 		$enforce = (($hasOrNot !== "not") && ($hasOrNot !== "does not enforce"));

tests/acceptance/features/bootstrap/BasicStructure.php

@@ -930,12 +930,12 @@ public function statusPhpRespondedShouldMatch(PyStringNode $jsonExpected) {
 			$jsonExpectedDecoded['version'] = \trim($version[1]);
 			$jsonExpectedDecoded['versionstring'] = \trim($versionString[1]);
 			$jsonExpectedEncoded = \json_encode($jsonExpectedDecoded);
+			PHPUnit\Framework\Assert::assertEquals(
+				$jsonExpectedEncoded, $jsonRespondedEncoded
+			);
 		} else {
 			PHPUnit_Framework_Assert::fail('Cannot get version variables from occ');
 		}
-		PHPUnit\Framework\Assert::assertEquals(
-			$jsonExpectedEncoded, $jsonRespondedEncoded
-		);
 	}
 
 	/**
@@ -1053,6 +1053,7 @@ public static function removeFilesFromLocalStorageAfter() {
 	 * @param BeforeSuiteScope $scope
 	 *
 	 * @return void
+	 * @throws \Exception
 	 */
 	public static function useBigFileIDs(BeforeSuiteScope $scope) {
 		$fullUrl = getenv('TEST_SERVER_URL');

tests/acceptance/features/bootstrap/CalDavContext.php

@@ -185,6 +185,7 @@ public function theCalDavErrorMessageShouldBe($message) {
 	 * @param string $name
 	 *
 	 * @return void
+	 * @throws \Exception
 	 */
 	public function userHasCreatedACalendarNamed($user, $name) {
 		$davUrl = $this->featureContext->getBaseUrl()

tests/acceptance/features/bootstrap/CardDavContext.php

@@ -84,15 +84,15 @@ public function afterScenario() {
 	}
 
 	/**
-	 * @When user :user requests addressbook :addressBook using the API
+	 * @When user :user requests address book :addressBook using the API
 	 *
 	 * @param string $user
 	 * @param string $addressBook
 	 *
 	 * @return void
 	 * @throws \Exception
 	 */
-	public function userRequestsAddressbookUsingTheAPI($user, $addressBook) {
+	public function userRequestsAddressBookUsingTheAPI($user, $addressBook) {
 		$davUrl = $this->featureContext->getBaseUrl()
 			. '/remote.php/dav/addressbooks/users/' . $addressBook;
 
@@ -109,15 +109,15 @@ public function userRequestsAddressbookUsingTheAPI($user, $addressBook) {
 	}
 
 	/**
-	 * @Given user :user has successfully created an addressbook named :addressBook
+	 * @Given user :user has successfully created an address book named :addressBook
 	 *
 	 * @param string $user
 	 * @param string $addressBook
 	 *
 	 * @return void
 	 * @throws \Exception
 	 */
-	public function userHasCreatedAnAddressbookNamed($user, $addressBook) {
+	public function userHasCreatedAnAddressBookNamed($user, $addressBook) {
 		$davUrl = $this->featureContext->getBaseUrl()
 			. '/remote.php/dav/addressbooks/users/' . $user . '/' . $addressBook;
 

tests/acceptance/features/bootstrap/Checksums.php

@@ -141,6 +141,8 @@ public function theHeaderChecksumShouldMatch($checksum) {
 	 * @Then the webdav checksum should be empty
 	 *
 	 * @return void
+	 * @throws \Sabre\Xml\ParseException
+	 * @throws \Exception
 	 */
 	public function theWebdavChecksumShouldBeEmpty() {
 		$service = new Sabre\Xml\Service();
@@ -163,6 +165,7 @@ public function theWebdavChecksumShouldBeEmpty() {
 	 * @Then the OC-Checksum header should not be there
 	 *
 	 * @return void
+	 * @throws \Exception
 	 */
 	public function theOcChecksumHeaderShouldNotBeThere() {
 		if ($this->response->hasHeader('OC-Checksum')) {

tests/acceptance/features/bootstrap/CommandLine.php

@@ -130,6 +130,7 @@ public function findLines($input, $text) {
 	 * @Then /^the command should have been successful$/
 	 *
 	 * @return void
+	 * @throws \Exception
 	 */
 	public function theCommandShouldHaveBeenSuccessful() {
 		$exceptions = $this->findExceptions();
@@ -153,7 +154,7 @@ public function theCommandShouldHaveBeenSuccessful() {
 	 * @param int $exitCode
 	 *
 	 * @return void
-	 * @throws Exception
+	 * @throws \Exception
 	 */
 	public function theCommandFailedWithExitCode($exitCode) {
 		if ($this->lastCode !== (int)$exitCode) {
@@ -170,7 +171,7 @@ public function theCommandFailedWithExitCode($exitCode) {
 	 * @param string $exceptionText
 	 *
 	 * @return void
-	 * @throws Exception
+	 * @throws \Exception
 	 */
 	public function theCommandFailedWithExceptionText($exceptionText) {
 		$exceptions = $this->findExceptions();
@@ -192,7 +193,7 @@ public function theCommandFailedWithExceptionText($exceptionText) {
 	 * @param string $text
 	 *
 	 * @return void
-	 * @throws Exception
+	 * @throws \Exception
 	 */
 	public function theCommandOutputContainsTheText($text) {
 		$lines = $this->findLines($this->lastStdOut, $text);
@@ -210,7 +211,7 @@ public function theCommandOutputContainsTheText($text) {
 	 * @param string $text
 	 *
 	 * @return void
-	 * @throws Exception
+	 * @throws \Exception
 	 */
 	public function theCommandErrorOutputContainsTheText($text) {
 		$lines = $this->findLines($this->lastStdErr, $text);
@@ -289,6 +290,7 @@ public function transferringOwnership($user1, $user2) {
 	 * @Given /^the administrator has successfully recreated the encryption masterkey$/
 	 *
 	 * @return void
+	 * @throws \Exception
 	 */
 	public function recreateMasterKeyUsingOccCommand() {
 		$this->runOcc(['encryption:recreate-master-key', '-y']);