Skip to content

Commit 89df543

Browse files
committed
fix test
1 parent cb1bd19 commit 89df543

File tree

4 files changed

+5
-6
lines changed

4 files changed

+5
-6
lines changed

Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -82,7 +82,7 @@ unittests:
8282
integrationtests:
8383
./scripts/run-app.sh "32.0.0" 1
8484
composer install
85-
./vendor/bin/phpunit --bootstrap tests/integration/bootstrap.php tests/integration/ --testdox
85+
./vendor/bin/phpunit -c tests/integration/phpunit.xml tests/integration/ --testdox
8686

8787
# Run bats tests
8888
.PHONY: bats
Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
use PHPUnit\Framework\TestCase;
1212
use RuntimeException;
1313

14-
abstract class BaseIntegrationTest extends TestCase {
14+
abstract class IntegrationTestBase extends TestCase {
1515
protected string $hostname;
1616
protected string $folderPrefix;
1717
protected string $testUser;
@@ -28,7 +28,7 @@ protected function setUp(): void {
2828
parent::setUp();
2929

3030
// Load environment variables
31-
$this->hostname = $_ENV['HOSTNAME'] ?? '127.0.0.1:8080';
31+
$this->hostname = $_ENV['NEXTCLOUD_HOSTNAME'] ?? '127.0.0.1:8080';
3232
$this->folderPrefix = $_ENV['FOLDER_PREFIX'] ?? './tmp/functionality-parallel';
3333
$this->testUser = $_ENV['TESTUSER'] ?? 'testuser';
3434
$this->testUserPassword = $_ENV['TESTUSER_PASSWORD'] ?? 'myfancysecurepassword234';

tests/integration/SettingsControllerTest.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,9 +8,9 @@
88

99
use PHPUnit\Framework\Attributes\DataProvider;
1010

11-
require_once __DIR__ . '/BaseIntegrationTest.php';
11+
require_once __DIR__ . '/IntegrationTestBase.php';
1212

13-
class SettingsControllerTest extends BaseIntegrationTest {
13+
class SettingsControllerTest extends IntegrationTestBase {
1414
public static function adminGetRouteProvider(): array {
1515
return [
1616
['getAuthMethod'],

tests/integration/phpunit.xml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,6 @@ SPDX-License-Identifier: AGPL-3.0-or-later
1212
>
1313
<testsuite name='G DATA Antivirus Integration Tests'>
1414
<directory suffix='Test.php'>.</directory>
15-
<exclude>BaseIntegrationTest.php</exclude>
1615
</testsuite>
1716
<php>
1817
<env name="PHPUNIT_INTEGRATION_ENV" value="true"/>

0 commit comments

Comments
 (0)