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

Jump to bottom

[stable21] Fix casing of core test folder, bring back missing tests #26276

Merged
merged 7 commits into from
Mar 24, 2021
Merged

[stable21] Fix casing of core test folder, bring back missing tests #26276

merged 7 commits into from
Mar 24, 2021

Conversation

backportbot-nextcloud[bot]
Copy link

backport of #26265

PVince81 added 6 commits March 24, 2021 12:38
@PVince81 @backportbot
Fix casing of core test folder
544ea63 
It seems Phpunit < 9 was case insensitive.
Fixed the phpunit config to target the correct name for the "Core" test
directory.

Signed-off-by: Vincent Petry <vincent@nextcloud.com>
@PVince81 @backportbot
Fix core tests command for app enabling/disabling
2c4b21b 
Signed-off-by: Vincent Petry <vincent@nextcloud.com>
@PVince81 @backportbot
Fix more tests in the Core subdir
365c99b 
Signed-off-by: Vincent Petry <vincent@nextcloud.com>
@PVince81 @backportbot
Fix more controller tests in Core subdir
3e815f5 
Signed-off-by: Vincent Petry <vincent@nextcloud.com>
@PVince81 @backportbot
Bring back forgotten tests
bad3243 
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 <vincent@nextcloud.com>
@PVince81 @backportbot
Fix language codes test result order
447ccc1 
Fixes issue with Oracle by enforcing the order of the results to check.

Signed-off-by: Vincent Petry <vincent@nextcloud.com>
@backportbot-nextcloud backportbot-nextcloud bot added this to the Nextcloud 21.0.1 milestone Mar 24, 2021
@MorrisJobke MorrisJobke added the 3. to review Waiting for reviews label Mar 24, 2021
@PVince81
Copy link
Member 

1) Tests\Core\Controller\AppPasswordControllerTest::testGetAppPasswordWithAppPassword
TypeError: Argument 7 passed to OC\Core\Controller\AppPasswordController::__construct() must implement interface Symfony\Component\EventDispatcher\EventDispatcherInterface, instance of Mock_IEventDispatcher_7ac0ee84 given, called in /drone/src/tests/Core/Controller/AppPasswordControllerTest.php on line 85

Aha, so that change was only needed on master where we switched to IEventDispatcher.

@PVince81
Revert controller tests to match stable21 API
bb7ff7f 
Signed-off-by: Vincent Petry <vincent@nextcloud.com>
@MorrisJobke MorrisJobke merged commit ba9e1c0 into stable21 Mar 24, 2021
@MorrisJobke MorrisJobke deleted the backport/26265/stable21 branch March 24, 2021 16:13
@rullzer rullzer mentioned this pull request Mar 26, 2021
Merged
2 tasks
@rullzer rullzer mentioned this pull request Apr 8, 2021
Merged
3 tasks
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@nickvergessen nickvergessen nickvergessen approved these changes

@MorrisJobke MorrisJobke MorrisJobke approved these changes

@ChristophWurst ChristophWurst Awaiting requested review from ChristophWurst

@kesselb kesselb Awaiting requested review from kesselb

@PVince81 PVince81 Awaiting requested review from PVince81

@rullzer rullzer Awaiting requested review from rullzer

Assignees
No one assigned
Labels
3. to review Waiting for reviews bug
Projects
None yet
Milestone
Nextcloud 21.0.1
Development

Successfully merging this pull request may close these issues.
3 participants
@PVince81 @nickvergessen @MorrisJobke