From 8552516ae48cd14b124b6927895d6c62b2c74084 Mon Sep 17 00:00:00 2001 From: Sabin Date: Tue, 29 Oct 2024 10:35:27 +0545 Subject: [PATCH] removed to do comment --- tests/acceptance/TestHelpers/SetupHelper.php | 4 +--- tests/acceptance/bootstrap/FeatureContext.php | 22 ++----------------- tests/acceptance/config/behat.yml | 2 -- 3 files changed, 3 insertions(+), 25 deletions(-) diff --git a/tests/acceptance/TestHelpers/SetupHelper.php b/tests/acceptance/TestHelpers/SetupHelper.php index 15c54866ef6..7754b41663b 100644 --- a/tests/acceptance/TestHelpers/SetupHelper.php +++ b/tests/acceptance/TestHelpers/SetupHelper.php @@ -53,15 +53,13 @@ public static function getSuiteParameters(HookScope $scope):array { * @param string|null $adminUsername * @param string|null $adminPassword * @param string|null $baseUrl - * @param string|null $ocPath * * @return void */ public static function init( ?string $adminUsername, ?string $adminPassword, - ?string $baseUrl, - ?string $ocPath + ?string $baseUrl ): void { foreach (\func_get_args() as $variableToCheck) { if (!\is_string($variableToCheck)) { diff --git a/tests/acceptance/bootstrap/FeatureContext.php b/tests/acceptance/bootstrap/FeatureContext.php index 79e18bbdcb9..ac85c1f3b19 100644 --- a/tests/acceptance/bootstrap/FeatureContext.php +++ b/tests/acceptance/bootstrap/FeatureContext.php @@ -108,7 +108,6 @@ class FeatureContext extends BehatVariablesContext { * The password to use in tests that create public link shares */ private string $publicLinkSharePassword; - private string $ocPath; private string $currentUser = ''; private string $currentServer; @@ -458,29 +457,22 @@ public function usersToBeReplaced(): ?array { /** * BasicStructure constructor. * - * @param string $baseUrl * @param string $adminUsername * @param string $adminPassword * @param string $regularUserPassword - * @param string $ocPath * */ public function __construct( - string $baseUrl, string $adminUsername, string $adminPassword, string $regularUserPassword, - string $ocPath ) { // Initialize your context here - $this->baseUrl = \rtrim($baseUrl, '/'); $this->adminUsername = $adminUsername; $this->adminPassword = $adminPassword; $this->regularUserPassword = $regularUserPassword; - $this->localBaseUrl = $this->baseUrl; $this->currentServer = 'LOCAL'; $this->cookieJar = new CookieJar(); - $this->ocPath = $ocPath; // These passwords are referenced in tests and can be overridden by // setting environment variables. @@ -493,10 +485,8 @@ public function __construct( $this->publicLinkSharePassword = "publicPwd:1"; $testServerUrl = OcisHelper::getServerUrl(); - if ($testServerUrl !== false) { - $this->baseUrl = \rtrim($testServerUrl, '/'); - $this->localBaseUrl = $this->baseUrl; - } + $this->baseUrl = \rtrim($testServerUrl, '/'); + $this->localBaseUrl = $this->baseUrl; // federated server url from the environment $testRemoteServerUrl = \getenv('TEST_SERVER_FED_URL'); @@ -754,13 +744,6 @@ public function removeSchemeFromUrl(string $url): string { ); } - /** - * @return string - */ - public function getOcPath(): string { - return $this->ocPath; - } - /** * returns the base URL (which is without a slash at the end) * @@ -2627,7 +2610,6 @@ public function before(BeforeScenarioScope $scope): void { $this->getAdminUsername(), $this->getAdminPassword(), $this->getBaseUrl(), - $this->getOcPath() ); if ($this->isTestingWithLdap()) { diff --git a/tests/acceptance/config/behat.yml b/tests/acceptance/config/behat.yml index a3c9d467564..43fb2fca485 100644 --- a/tests/acceptance/config/behat.yml +++ b/tests/acceptance/config/behat.yml @@ -14,11 +14,9 @@ default: ldapInitialUserFilePath: /../config/ldap-users.ldif contexts: - FeatureContext: &common_feature_context_params - baseUrl: http://localhost:8080 # TODO: clean me adminUsername: admin adminPassword: admin regularUserPassword: 123456 - ocPath: apps/testing/api/v1/occ # TODO: clean me - SettingsContext: - GraphContext: - SpacesContext: