Skip to content

[stable20] Fix casing of core test folder, bring back missing tests #26275

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
MorrisJobke merged 9 commits into from
Mar 24, 2021
Merged

[stable20] Fix casing of core test folder, bring back missing tests #26275

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
7444781
Fix casing of core test folder
PVince81 Mar 23, 2021
acfffcc
Fix core tests command for app enabling/disabling
PVince81 Mar 23, 2021
97c11ff
Fix more tests in the Core subdir
PVince81 Mar 24, 2021
a9a6f51
Fix more controller tests in Core subdir
PVince81 Mar 24, 2021
522c319
Bring back forgotten tests
PVince81 Mar 24, 2021
6fcb1ab
Fix language codes test result order
PVince81 Mar 24, 2021
31f7257
Revert controller tests to match stable21 API
PVince81 Mar 24, 2021
945eb07
Revert autocomplete controller tests to match stable20
PVince81 Mar 24, 2021
d86c4f9
Revert "Fix core tests command for app enabling/disabling"
PVince81 Mar 24, 2021
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
Prev Previous commit
Next Next commit
Bring back forgotten tests 
Remove "ocs-provider" test folder reference as it doesn't exist any
more.
Added back "Test" test subdir and fixed the tests inside.

Signed-off-by: Vincent Petry <[email protected]>
  • Loading branch information
@PVince81 @backportbot
PVince81 authored and backportbot[bot] committed Mar 24, 2021
commit 522c3193852a2301a07a7bafc33d9ddf2837bea1
2 changes: 1 addition & 1 deletion tests/Test/Repair/Owncloud/CleanPreviewsBackgroundJobTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ class CleanPreviewsBackgroundJobTest extends TestCase {
/** @var IUserManager|\PHPUnit_Framework_MockObject_MockObject */
private $userManager;

public function setUp() {
public function setUp(): void {
parent::setUp();

$this->rootFolder = $this->createMock(IRootFolder::class);
Expand Down
2 changes: 1 addition & 1 deletion tests/Test/Repair/Owncloud/CleanPreviewsTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ class CleanPreviewsTest extends TestCase {
/** @var CleanPreviews */
private $repair;

public function setUp() {
public function setUp(): void {
parent::setUp();

$this->jobList = $this->createMock(IJobList::class);
Expand Down
2 changes: 1 addition & 1 deletion tests/Test/Repair/Owncloud/InstallCoreBundleTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ class InstallCoreBundleTest extends TestCase {
/** @var InstallCoreBundle */
private $installCoreBundle;

public function setUp() {
public function setUp(): void {
parent::setUp();
$this->bundleFetcher = $this->createMock(BundleFetcher::class);
$this->config = $this->createMock(IConfig::class);
Expand Down
2 changes: 1 addition & 1 deletion tests/Test/Repair/Owncloud/UpdateLanguageCodesTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ class UpdateLanguageCodesTest extends TestCase {
/** @var IConfig | \PHPUnit_Framework_MockObject_MockObject */
private $config;

protected function setUp() {
protected function setUp(): void {
parent::setUp();

$this->connection = \OC::$server->getDatabaseConnection();
Expand Down
2 changes: 1 addition & 1 deletion tests/phpunit-autotest.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
<testsuite name='ownCloud'>
<directory suffix='.php'>lib/</directory>
<directory suffix='.php'>Core/</directory>
<directory suffix='.php'>ocs-provider/</directory>
<directory suffix='.php'>Test/</directory>
<file>apps.php</file>
</testsuite>
<!-- filters for code coverage -->
Expand Down