Merge pull request #36513 from owncloud/tests-do-not-depend-on-core-dependencies

Remove dependency of acceptance tests on core lib/composer/autoload.php

Author: phil-davis

tests/TestHelpers/SharingHelper.php

@@ -45,6 +45,13 @@ class SharingHelper {
 			'federated' => 6,
 	];
 
+	const SHARE_STATES = [
+			'accepted' => 0,
+			'pending' => 1,
+			'rejected' => 2,
+			'declined' => 2, // declined is a synonym for rejected
+	];
+
 	/**
 	 *
 	 * @param string $baseUrl baseURL of the ownCloud installation without /ocs.

tests/acceptance/features/bootstrap/AppConfiguration.php

@@ -29,8 +29,6 @@
 use TestHelpers\SetupHelper;
 use Behat\Gherkin\Node\TableNode;
 
-require __DIR__ . '/../../../../lib/composer/autoload.php';
-
 /**
  * AppConfiguration trait
  */

tests/acceptance/features/bootstrap/AppManagementContext.php

@@ -25,8 +25,6 @@
 use PHPUnit\Framework\Assert;
 use TestHelpers\SetupHelper;
 
-require __DIR__ . '/../../../../lib/composer/autoload.php';
-
 /**
  * Context for steps that test apps_paths.
  */

tests/acceptance/features/bootstrap/Auth.php

@@ -23,8 +23,6 @@
 use TestHelpers\HttpRequestHelper;
 use Behat\Gherkin\Node\TableNode;
 
-require __DIR__ . '/../../../../lib/composer/autoload.php';
-
 /**
  * Authentication functions
  */

tests/acceptance/features/bootstrap/BasicStructure.php

@@ -30,8 +30,6 @@
 use TestHelpers\SetupHelper;
 use TestHelpers\HttpRequestHelper;
 
-require __DIR__ . '/../../../../lib/composer/autoload.php';
-
 /**
  * Basic functions needed by mostly everything
  */

tests/acceptance/features/bootstrap/CalDavContext.php

@@ -19,8 +19,6 @@
  *
  */
 
-require __DIR__ . '/../../../../lib/composer/autoload.php';
-
 use Behat\Behat\Hook\Scope\BeforeScenarioScope;
 use GuzzleHttp\Message\ResponseInterface;
 use TestHelpers\HttpRequestHelper;

tests/acceptance/features/bootstrap/CardDavContext.php

@@ -19,8 +19,6 @@
  *
  */
 
-require __DIR__ . '/../../../../lib/composer/autoload.php';
-
 use Behat\Behat\Hook\Scope\BeforeScenarioScope;
 use GuzzleHttp\Message\ResponseInterface;
 use TestHelpers\HttpRequestHelper;

tests/acceptance/features/bootstrap/CommandLine.php

@@ -21,8 +21,6 @@
 
 use TestHelpers\SetupHelper;
 
-require __DIR__ . '/../../../../lib/composer/autoload.php';
-
 /**
  * Command line functions
  */

tests/acceptance/features/bootstrap/Provisioning.php

@@ -28,8 +28,6 @@
 use TestHelpers\UserHelper;
 use TestHelpers\HttpRequestHelper;
 
-require __DIR__ . '/../../../../lib/composer/autoload.php';
-
 /**
  * Functions for provisioning of users and groups
  */

tests/acceptance/features/bootstrap/Sharing.php

@@ -29,8 +29,6 @@
 use TestHelpers\SharingHelper;
 use TestHelpers\HttpRequestHelper;
 
-require __DIR__ . '/../../../../lib/composer/autoload.php';
-
 /**
  * Sharing trait
  */
@@ -1914,14 +1912,10 @@ public function administratorAddsGroupToExcludeFromSharingList($group) {
 	private function getAllSharesSharedWithUser($user, $state = "all") {
 		switch ($state) {
 			case 'pending':
-				$stateCode = \OCP\Share::STATE_PENDING;
-				break;
 			case 'accepted':
-				$stateCode = \OCP\Share::STATE_ACCEPTED;
-				break;
 			case 'declined':
 			case 'rejected':
-				$stateCode = \OCP\Share::STATE_REJECTED;
+				$stateCode = SharingHelper::SHARE_STATES[$state];
 				break;
 			case 'all':
 				$stateCode = "all";