Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[tests-only][full-ci] Remove OcisHelper class and its references #40629

Merged
merged 2 commits into from
Feb 10, 2023
Merged

[tests-only][full-ci] Remove OcisHelper class and its references #40629

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
70b3b53
Removed OcisHelper class and its references
Feb 10, 2023
5568a4b
Removed extra stuff and fixed ldap resyning conditional check
Feb 10, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
35 changes: 0 additions & 35 deletions tests/TestHelpers/HttpRequestHelper.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,27 +42,6 @@
class HttpRequestHelper {
public const HTTP_TOO_EARLY = 425;

/**
* @var string
*/
private static $oCSelectorCookie = null;

/**
* @return string
*/
public static function getOCSelectorCookie(): string {
return self::$oCSelectorCookie;
}

/**
* @param string $oCSelectorCookie "owncloud-selector=oc10;path=/;"
*
* @return void
*/
public static function setOCSelectorCookie(string $oCSelectorCookie): void {
self::$oCSelectorCookie = $oCSelectorCookie;
}

/**
* Some systems-under-test do async post-processing of operations like upload,
* move etc. If a client does a request on the resource before the post-processing
Expand Down Expand Up @@ -349,20 +328,6 @@ public static function createRequest(
$headers['Content-Type'] = 'application/x-www-form-urlencoded';
}

if (OcisHelper::isTestingParallelDeployment()) {
// oCIS cannot handle '/apps/testing' endpoints
// so those requests must be redirected to oC10 server
// change server to oC10 if the request url has `/apps/testing`
if (strpos($url, "/apps/testing") !== false) {
$oCISServerUrl = \getenv('TEST_SERVER_URL');
$oC10ServerUrl = \getenv('TEST_OC10_URL');
$url = str_replace($oCISServerUrl, $oC10ServerUrl, $url);
} else {
// set 'owncloud-server' selector cookie for oCIS requests
$headers['Cookie'] = self::getOCSelectorCookie();
}
roshanlc marked this conversation as resolved.
Show resolved Hide resolved
}

$request = new Request(
$method,
$url,
Expand Down
343 changes: 0 additions & 343 deletions tests/TestHelpers/OcisHelper.php
View file
Open in desktop

This file was deleted.

Loading