mirror/php-flarum
1
0
Fork 0
mirror of https://github.com/flarum/core.git synced 2025-08-02 14:37:49 +02:00
Code Issues Releases Wiki Activity

Update tests to use setting method (#68)

Browse Source
This commit is contained in:
Sami Mazouz
2021-05-17 22:46:02 +01:00
committed by GitHub
parent 53bbb63a24
commit a311edf106
2 changed files with 6 additions and 110 deletions
Download Patch File Download Diff File Expand all files Collapse all files

51
extensions/mentions/tests/integration/api/PostMentionsTest.php
View File

@@ -14,14 +14,12 @@ use Flarum\Extend;
use Flarum\Post\CommentPost; use Flarum\Post\CommentPost;
use Flarum\Testing\integration\RetrievesAuthorizedUsers; use Flarum\Testing\integration\RetrievesAuthorizedUsers;
use Flarum\Testing\integration\TestCase; use Flarum\Testing\integration\TestCase;
use Flarum\Testing\integration\UsesSettings;
use Flarum\User\DisplayName\DriverInterface; use Flarum\User\DisplayName\DriverInterface;
use Flarum\User\User; use Flarum\User\User;
class PostMentionsTest extends TestCase class PostMentionsTest extends TestCase
{ {
use RetrievesAuthorizedUsers; use RetrievesAuthorizedUsers;
use UsesSettings;
/** /**
* @inheritDoc * @inheritDoc
@@ -56,36 +54,21 @@ class PostMentionsTest extends TestCase
['post_id' => 6, 'mentions_post_id' => 7], ['post_id' => 6, 'mentions_post_id' => 7],
['post_id' => 10, 'mentions_post_id' => 9] ['post_id' => 10, 'mentions_post_id' => 9]
], ],
'settings' => [
['key' => 'display_name_driver', 'value' => 'custom_display_name_driver'],
],
]); ]);
$this->setting('display_name_driver', 'custom_display_name_driver');
$this->extend( $this->extend(
(new Extend\User) (new Extend\User)
->displayNameDriver('custom_display_name_driver', CustomOtherDisplayNameDriver::class) ->displayNameDriver('custom_display_name_driver', CustomOtherDisplayNameDriver::class)
); );
} }
/**
* Purge the settings cache and reset the new display name driver.
*/
protected function recalculateDisplayNameDriver()
{
$this->purgeSettingsCache();
$container = $this->app()->getContainer();
$container->forgetInstance('flarum.user.display_name.driver');
User::setDisplayNameDriver($container->make('flarum.user.display_name.driver'));
}
/** /**
* @test * @test
*/ */
public function mentioning_a_valid_post_with_old_format_doesnt_work() public function mentioning_a_valid_post_with_old_format_doesnt_work()
{ {
$this->app();
$this->recalculateDisplayNameDriver();
$response = $this->send( $response = $this->send(
$this->request('POST', '/api/posts', [ $this->request('POST', '/api/posts', [
'authenticatedAs' => 1, 'authenticatedAs' => 1,
@@ -117,9 +100,6 @@ class PostMentionsTest extends TestCase
*/ */
public function mentioning_a_valid_post_with_new_format_works() public function mentioning_a_valid_post_with_new_format_works()
{ {
$this->app();
$this->recalculateDisplayNameDriver();
$response = $this->send( $response = $this->send(
$this->request('POST', '/api/posts', [ $this->request('POST', '/api/posts', [
'authenticatedAs' => 1, 'authenticatedAs' => 1,
@@ -151,9 +131,6 @@ class PostMentionsTest extends TestCase
*/ */
public function mentioning_an_invalid_post_doesnt_work() public function mentioning_an_invalid_post_doesnt_work()
{ {
$this->app();
$this->recalculateDisplayNameDriver();
$response = $this->send( $response = $this->send(
$this->request('POST', '/api/posts', [ $this->request('POST', '/api/posts', [
'authenticatedAs' => 1, 'authenticatedAs' => 1,
@@ -185,9 +162,6 @@ class PostMentionsTest extends TestCase
*/ */
public function mentioning_multiple_posts_works() public function mentioning_multiple_posts_works()
{ {
$this->app();
$this->recalculateDisplayNameDriver();
$response = $this->send( $response = $this->send(
$this->request('POST', '/api/posts', [ $this->request('POST', '/api/posts', [
'authenticatedAs' => 1, 'authenticatedAs' => 1,
@@ -221,9 +195,6 @@ class PostMentionsTest extends TestCase
*/ */
public function post_mentions_render_with_fresh_data() public function post_mentions_render_with_fresh_data()
{ {
$this->app();
$this->recalculateDisplayNameDriver();
$response = $this->send( $response = $this->send(
$this->request('GET', '/api/posts/4', [ $this->request('GET', '/api/posts/4', [
'authenticatedAs' => 1, 'authenticatedAs' => 1,
@@ -244,9 +215,6 @@ class PostMentionsTest extends TestCase
*/ */
public function post_mentions_unparse_with_fresh_data() public function post_mentions_unparse_with_fresh_data()
{ {
$this->app();
$this->recalculateDisplayNameDriver();
$response = $this->send( $response = $this->send(
$this->request('GET', '/api/posts/4', [ $this->request('GET', '/api/posts/4', [
'authenticatedAs' => 1, 'authenticatedAs' => 1,
@@ -266,8 +234,6 @@ class PostMentionsTest extends TestCase
*/ */
public function deleted_post_mentions_s_user_unparse_and_render_without_user_data() public function deleted_post_mentions_s_user_unparse_and_render_without_user_data()
{ {
$this->app();
$this->recalculateDisplayNameDriver();
$deleted_text = $this->app()->getContainer()->make('translator')->trans('core.lib.username.deleted_text'); $deleted_text = $this->app()->getContainer()->make('translator')->trans('core.lib.username.deleted_text');
$response = $this->send( $response = $this->send(
@@ -293,8 +259,6 @@ class PostMentionsTest extends TestCase
*/ */
public function deleted_post_mentions_unparse_and_render_without_user_data() public function deleted_post_mentions_unparse_and_render_without_user_data()
{ {
$this->app();
$this->recalculateDisplayNameDriver();
$deleted_text = $this->app()->getContainer()->make('translator')->trans('flarum-mentions.forum.post_mention.deleted_text'); $deleted_text = $this->app()->getContainer()->make('translator')->trans('flarum-mentions.forum.post_mention.deleted_text');
$response = $this->send( $response = $this->send(
@@ -320,8 +284,6 @@ class PostMentionsTest extends TestCase
*/ */
public function deleted_post_mentions_and_deleted_user_unparse_and_render_without_user_data() public function deleted_post_mentions_and_deleted_user_unparse_and_render_without_user_data()
{ {
$this->app();
$this->recalculateDisplayNameDriver();
$deleted_text = $this->app()->getContainer()->make('translator')->trans('flarum-mentions.forum.post_mention.deleted_text'); $deleted_text = $this->app()->getContainer()->make('translator')->trans('flarum-mentions.forum.post_mention.deleted_text');
$response = $this->send( $response = $this->send(
@@ -347,9 +309,6 @@ class PostMentionsTest extends TestCase
*/ */
public function post_mentions_with_unremoved_bad_string_from_display_names_doesnt_work() public function post_mentions_with_unremoved_bad_string_from_display_names_doesnt_work()
{ {
$this->app();
$this->recalculateDisplayNameDriver();
$response = $this->send( $response = $this->send(
$this->request('POST', '/api/posts', [ $this->request('POST', '/api/posts', [
'authenticatedAs' => 1, 'authenticatedAs' => 1,
@@ -381,9 +340,6 @@ class PostMentionsTest extends TestCase
*/ */
public function post_mentions_unparsing_removes_bad_display_name_string() public function post_mentions_unparsing_removes_bad_display_name_string()
{ {
$this->app();
$this->recalculateDisplayNameDriver();
$response = $this->send( $response = $this->send(
$this->request('GET', '/api/posts/10', [ $this->request('GET', '/api/posts/10', [
'authenticatedAs' => 1, 'authenticatedAs' => 1,
@@ -405,9 +361,6 @@ class PostMentionsTest extends TestCase
*/ */
public function post_mentions_with_removed_bad_string_from_display_names_works() public function post_mentions_with_removed_bad_string_from_display_names_works()
{ {
$this->app();
$this->recalculateDisplayNameDriver();
$response = $this->send( $response = $this->send(
$this->request('POST', '/api/posts', [ $this->request('POST', '/api/posts', [
'authenticatedAs' => 1, 'authenticatedAs' => 1,

65
extensions/mentions/tests/integration/api/UserMentionsTest.php
View File

@@ -14,14 +14,12 @@ use Flarum\Extend;
use Flarum\Post\CommentPost; use Flarum\Post\CommentPost;
use Flarum\Testing\integration\RetrievesAuthorizedUsers; use Flarum\Testing\integration\RetrievesAuthorizedUsers;
use Flarum\Testing\integration\TestCase; use Flarum\Testing\integration\TestCase;
use Flarum\Testing\integration\UsesSettings;
use Flarum\User\DisplayName\DriverInterface; use Flarum\User\DisplayName\DriverInterface;
use Flarum\User\User; use Flarum\User\User;
class UserMentionsTest extends TestCase class UserMentionsTest extends TestCase
{ {
use RetrievesAuthorizedUsers; use RetrievesAuthorizedUsers;
use UsesSettings;
/** /**
* @inheritDoc * @inheritDoc
@@ -51,41 +49,22 @@ class UserMentionsTest extends TestCase
['post_id' => 4, 'mentions_user_id' => 4], ['post_id' => 4, 'mentions_user_id' => 4],
['post_id' => 10, 'mentions_user_id' => 5] ['post_id' => 10, 'mentions_user_id' => 5]
], ],
'settings' => [
['key' => 'display_name_driver', 'value' => 'custom_display_name_driver'],
],
]); ]);
$this->setting('display_name_driver', 'custom_display_name_driver');
$this->extend( $this->extend(
(new Extend\User) (new Extend\User)
->displayNameDriver('custom_display_name_driver', CustomDisplayNameDriver::class) ->displayNameDriver('custom_display_name_driver', CustomDisplayNameDriver::class)
); );
} }
/**
* Purge the settings cache and reset the new display name driver.
*/
protected function recalculateDisplayNameDriver()
{
$this->purgeSettingsCache();
$container = $this->app()->getContainer();
$container->forgetInstance('flarum.user.display_name.driver');
User::setDisplayNameDriver($container->make('flarum.user.display_name.driver'));
}
/** /**
* @test * @test
*/ */
public function mentioning_a_valid_user_with_old_format_doesnt_work_if_off() public function mentioning_a_valid_user_with_old_format_doesnt_work_if_off()
{ {
$this->prepareDatabase([ $this->setting('flarum-mentions.allow_username_format', '0');
'settings' => [
['key' => 'flarum-mentions.allow_username_format', 'value' => '0']
]
]);
$this->app();
$this->recalculateDisplayNameDriver();
$response = $this->send( $response = $this->send(
$this->request('POST', '/api/posts', [ $this->request('POST', '/api/posts', [
@@ -118,14 +97,7 @@ class UserMentionsTest extends TestCase
*/ */
public function mentioning_a_valid_user_with_old_format_works_if_on() public function mentioning_a_valid_user_with_old_format_works_if_on()
{ {
$this->prepareDatabase([ $this->setting('flarum-mentions.allow_username_format', '1');
'settings' => [
['key' => 'flarum-mentions.allow_username_format', 'value' => '1']
]
]);
$this->app();
$this->recalculateDisplayNameDriver();
$response = $this->send( $response = $this->send(
$this->request('POST', '/api/posts', [ $this->request('POST', '/api/posts', [
@@ -158,9 +130,6 @@ class UserMentionsTest extends TestCase
*/ */
public function mentioning_a_valid_user_with_new_format_works() public function mentioning_a_valid_user_with_new_format_works()
{ {
$this->app();
$this->recalculateDisplayNameDriver();
$response = $this->send( $response = $this->send(
$this->request('POST', '/api/posts', [ $this->request('POST', '/api/posts', [
'authenticatedAs' => 1, 'authenticatedAs' => 1,
@@ -192,9 +161,6 @@ class UserMentionsTest extends TestCase
*/ */
public function mentioning_an_invalid_user_doesnt_work() public function mentioning_an_invalid_user_doesnt_work()
{ {
$this->app();
$this->recalculateDisplayNameDriver();
$response = $this->send( $response = $this->send(
$this->request('POST', '/api/posts', [ $this->request('POST', '/api/posts', [
'authenticatedAs' => 1, 'authenticatedAs' => 1,
@@ -226,9 +192,6 @@ class UserMentionsTest extends TestCase
*/ */
public function mentioning_multiple_users_works() public function mentioning_multiple_users_works()
{ {
$this->app();
$this->recalculateDisplayNameDriver();
$response = $this->send( $response = $this->send(
$this->request('POST', '/api/posts', [ $this->request('POST', '/api/posts', [
'authenticatedAs' => 1, 'authenticatedAs' => 1,
@@ -262,9 +225,6 @@ class UserMentionsTest extends TestCase
*/ */
public function old_user_mentions_still_render() public function old_user_mentions_still_render()
{ {
$this->app();
$this->recalculateDisplayNameDriver();
$response = $this->send( $response = $this->send(
$this->request('GET', '/api/posts/4', [ $this->request('GET', '/api/posts/4', [
'authenticatedAs' => 1, 'authenticatedAs' => 1,
@@ -285,9 +245,6 @@ class UserMentionsTest extends TestCase
*/ */
public function user_mentions_render_with_fresh_data() public function user_mentions_render_with_fresh_data()
{ {
$this->app();
$this->recalculateDisplayNameDriver();
$response = $this->send( $response = $this->send(
$this->request('POST', '/api/posts', [ $this->request('POST', '/api/posts', [
'authenticatedAs' => 1, 'authenticatedAs' => 1,
@@ -318,9 +275,6 @@ class UserMentionsTest extends TestCase
*/ */
public function user_mentions_unparse_with_fresh_data() public function user_mentions_unparse_with_fresh_data()
{ {
$this->app();
$this->recalculateDisplayNameDriver();
$response = $this->send( $response = $this->send(
$this->request('POST', '/api/posts', [ $this->request('POST', '/api/posts', [
'authenticatedAs' => 1, 'authenticatedAs' => 1,
@@ -350,8 +304,6 @@ class UserMentionsTest extends TestCase
*/ */
public function deleted_user_mentions_unparse_and_render_without_user_data() public function deleted_user_mentions_unparse_and_render_without_user_data()
{ {
$this->app();
$this->recalculateDisplayNameDriver();
$deleted_text = $this->app()->getContainer()->make('translator')->trans('core.lib.username.deleted_text'); $deleted_text = $this->app()->getContainer()->make('translator')->trans('core.lib.username.deleted_text');
$response = $this->send( $response = $this->send(
@@ -378,9 +330,6 @@ class UserMentionsTest extends TestCase
*/ */
public function user_mentions_with_unremoved_bad_string_from_display_names_doesnt_work() public function user_mentions_with_unremoved_bad_string_from_display_names_doesnt_work()
{ {
$this->app();
$this->recalculateDisplayNameDriver();
$response = $this->send( $response = $this->send(
$this->request('POST', '/api/posts', [ $this->request('POST', '/api/posts', [
'authenticatedAs' => 1, 'authenticatedAs' => 1,
@@ -412,9 +361,6 @@ class UserMentionsTest extends TestCase
*/ */
public function user_mentions_unparsing_removes_bad_display_name_string() public function user_mentions_unparsing_removes_bad_display_name_string()
{ {
$this->app();
$this->recalculateDisplayNameDriver();
$response = $this->send( $response = $this->send(
$this->request('GET', '/api/posts/10', [ $this->request('GET', '/api/posts/10', [
'authenticatedAs' => 1, 'authenticatedAs' => 1,
@@ -436,9 +382,6 @@ class UserMentionsTest extends TestCase
*/ */
public function user_mentions_with_removed_bad_string_from_display_names_works() public function user_mentions_with_removed_bad_string_from_display_names_works()
{ {
$this->app();
$this->recalculateDisplayNameDriver();
$response = $this->send( $response = $this->send(
$this->request('POST', '/api/posts', [ $this->request('POST', '/api/posts', [
'authenticatedAs' => 1, 'authenticatedAs' => 1,