test: get necessary contexts properly

2024-10-08 15:17:44 +05:45
parent 883d7601b4
commit ca76f79be3
27 changed files with 205 additions and 183 deletions
@@ -13,11 +13,12 @@ use Behat\Behat\Hook\Scope\BeforeScenarioScope;
 use Behat\Gherkin\Node\PyStringNode;
 use Behat\Gherkin\Node\TableNode;
 use GuzzleHttp\Exception\GuzzleException;
+use PHPUnit\Framework\Assert;
 use Psr\Http\Message\ResponseInterface;
 use TestHelpers\GraphHelper;
 use TestHelpers\WebDavHelper;
-use PHPUnit\Framework\Assert;
 use TestHelpers\HttpRequestHelper;
+use TestHelpers\BehatHelper;

 require_once 'bootstrap.php';

@@ -47,10 +48,8 @@ class GraphContext implements Context {
 		// Get the environment
 		$environment = $scope->getEnvironment();
 		// Get all the contexts you need in this context from here
-		$this->featureContext = $environment->getContext('FeatureContext');
-		if (!\TestHelpers\OcisHelper::isTestingOnReva()) {
-			$this->spacesContext = $environment->getContext('SpacesContext');
-		}
+		$this->featureContext = BehatHelper::getContext($scope, $environment, 'FeatureContext');
+		$this->spacesContext = BehatHelper::getContext($scope, $environment, 'SpacesContext');
 	}

 	/**