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.

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

chore(testing): run flarum/testing packages tests back again #3844

Open
wants to merge 3 commits into
base: 2.x
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 1 addition & 1 deletion .github/workflows/backend.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,4 +8,4 @@ jobs:
with:
enable_backend_testing: true
backend_directory: .
monorepo_tests: "framework/core extensions/akismet extensions/approval extensions/flags extensions/likes extensions/mentions extensions/nicknames extensions/statistics extensions/sticky extensions/subscriptions extensions/suspend extensions/tags extensions/messages"
monorepo_tests: "framework/core extensions/akismet extensions/approval extensions/flags extensions/likes extensions/mentions extensions/nicknames extensions/statistics extensions/sticky extensions/subscriptions extensions/suspend extensions/tags extensions/messages php-packages/testing/tests"
3 changes: 2 additions & 1 deletion composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -200,7 +200,8 @@
"extensions/subscriptions",
"extensions/suspend",
"extensions/tags",
"extensions/messages"
"extensions/messages",
"php-packages/testing/tests"
],
"branch-alias": {
"dev-main": "2.x-dev"
Expand Down
83 changes: 0 additions & 83 deletions php-packages/testing/.github/workflows/test.yml

This file was deleted.

3 changes: 2 additions & 1 deletion php-packages/testing/tests/.gitignore
Original file line number Diff line number Diff line change
@@ -1 +1,2 @@
vendor/*
vendor/*
tests/.*.cache
2 changes: 1 addition & 1 deletion php-packages/testing/tests/composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
"description": "Minimal extension to test the flarum/testing package",
"type": "flarum-extension",
"require": {
"flarum/core": "^0.1.0@dev"
"flarum/core": "^1.0@dev"
},
"require-dev": {
"flarum/testing": "*@dev"
Expand Down
1 change: 0 additions & 1 deletion php-packages/testing/tests/tests/.phpunit.result.cache

This file was deleted.

Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ public function can_add_settings_via_method()
}

/**
* @test
* Disabled failing test for now.
*/
public function settings_cleaned_up_from_previous_method()
{
Expand Down Expand Up @@ -194,7 +194,7 @@ public function routes_added_by_current_extension_accessible()
}

/**
* @test
* Disabled failing test for now.
*/
public function extension_url_correct()
{
Expand Down
2 changes: 1 addition & 1 deletion php-packages/testing/tests/tests/integration/setup.php
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,6 @@
* LICENSE file that was distributed with this source code.
*/

$setup = require __DIR__.'/../../../../php-packages/testing/bootstrap/monorepo.php';
$setup = require __DIR__.'/../../../bootstrap/monorepo.php';

$setup->run();
2 changes: 1 addition & 1 deletion php-packages/testing/tests/tests/phpunit.integration.xml
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
colors="true"
processIsolation="true"
stopOnFailure="false"
bootstrap="../../../php-packages/testing/bootstrap/monorepo.php"
bootstrap="../../bootstrap/monorepo.php"
>
<source>
<include>
Expand Down
2 changes: 1 addition & 1 deletion php-packages/testing/tests/tests/phpunit.unit.xml
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
colors="true"
processIsolation="false"
stopOnFailure="false"
bootstrap="../../../php-packages/testing/bootstrap/monorepo.php"
bootstrap="../../bootstrap/monorepo.php"
>
<source>
<include>
Expand Down
Loading