Skip to content

[OP#47849]Fix unit test failing on CI #393

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

Merged
SwikritiT merged 3 commits into from
Apr 25, 2023
Merged

[OP#47849]Fix unit test failing on CI #393

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
2033666
Fix unit test failing on CI
SwikritiT Apr 24, 2023
b1a24dd
seperate according to version
SwikritiT Apr 25, 2023
e5d85da
seperate according to version
SwikritiT Apr 25, 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
46 changes: 44 additions & 2 deletions tests/lib/Service/OpenProjectAPIServiceTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -226,12 +226,46 @@ private function getOpenProjectAPIService(
$client = new GuzzleClient();
$clientConfigMock = $this->getMockBuilder(IConfig::class)->getMock();

$clientConfigMock

if (version_compare(OC_Util::getVersionString(), '27') >= 0) {
$clientConfigMock
->method('getSystemValueBool')
->withConsecutive(
['allow_local_remote_servers', false],
['installed', false],
['allow_local_remote_servers', false],
['allow_local_remote_servers', false],
['installed', false],
['allow_local_remote_servers', false],
['allow_local_remote_servers', false],
['installed', false],
['allow_local_remote_servers', false]
)
->willReturnOnConsecutiveCalls(
true,
true,
true,
true,
true,
true,
true,
true,
true
);
//changed from nextcloud 26
// @phpstan-ignore-next-line
$ocClient = new Client(
$clientConfigMock, // @phpstan-ignore-line
$certificateManager, // @phpstan-ignore-line
$client, // @phpstan-ignore-line
$this->createMock(IRemoteHostValidator::class) // @phpstan-ignore-line
);
} elseif (version_compare(OC_Util::getVersionString(), '26') >= 0) {
$clientConfigMock
->method('getSystemValueBool')
->with('allow_local_remote_servers', false)
->willReturn(true);

if (version_compare(OC_Util::getVersionString(), '26') >= 0) {
//changed from nextcloud 26
// @phpstan-ignore-next-line
$ocClient = new Client(
Expand All @@ -241,6 +275,10 @@ private function getOpenProjectAPIService(
$this->createMock(IRemoteHostValidator::class) // @phpstan-ignore-line
);
} elseif (version_compare(OC_Util::getVersionString(), '24') >= 0) {
$clientConfigMock
->method('getSystemValueBool')
->with('allow_local_remote_servers', false)
->willReturn(true);
//changed from nextcloud 24
// @phpstan-ignore-next-line
$ocClient = new Client(
Expand All @@ -250,6 +288,10 @@ private function getOpenProjectAPIService(
$this->createMock(\OC\Http\Client\LocalAddressChecker::class) // @phpstan-ignore-line
);
} else {
$clientConfigMock
->method('getSystemValueBool')
->with('allow_local_remote_servers', false)
->willReturn(true);
// @phpstan-ignore-next-line
$ocClient = new Client(
$clientConfigMock, // @phpstan-ignore-line
Expand Down