Fix BBCode::expandTags() & Remove AppMockTrait
This commit is contained in:
parent
583ce63ac7
commit
4cc36c9b2c
6 changed files with 21 additions and 252 deletions
|
@ -2322,7 +2322,7 @@ class BBCode
|
|||
break;
|
||||
case '#':
|
||||
default:
|
||||
return $match[1] . '[url=' . 'https://' . DI::baseUrl() . '/search?tag=' . $match[2] . ']' . $match[2] . '[/url]';
|
||||
return $match[1] . '[url=' . DI::baseUrl() . '/search?tag=' . $match[2] . ']' . $match[2] . '[/url]';
|
||||
}
|
||||
}, $body);
|
||||
}
|
||||
|
|
|
@ -1,161 +0,0 @@
|
|||
<?php
|
||||
/**
|
||||
* @copyright Copyright (C) 2010-2021, the Friendica project
|
||||
*
|
||||
* @license GNU AGPL version 3 or any later version
|
||||
*
|
||||
* This program is free software: you can redistribute it and/or modify
|
||||
* it under the terms of the GNU Affero General Public License as
|
||||
* published by the Free Software Foundation, either version 3 of the
|
||||
* License, or (at your option) any later version.
|
||||
*
|
||||
* This program is distributed in the hope that it will be useful,
|
||||
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||
* GNU Affero General Public License for more details.
|
||||
*
|
||||
* You should have received a copy of the GNU Affero General Public License
|
||||
* along with this program. If not, see <https://www.gnu.org/licenses/>.
|
||||
*
|
||||
*/
|
||||
|
||||
namespace Friendica\Test\Util;
|
||||
|
||||
use Dice\Dice;
|
||||
use Friendica\App;
|
||||
use Friendica\Core\Config;
|
||||
use Friendica\DI;
|
||||
use Friendica\Network\HTTPException\InternalServerErrorException;
|
||||
use Friendica\Render\FriendicaSmartyEngine;
|
||||
use Friendica\Util\Profiler;
|
||||
use Mockery\MockInterface;
|
||||
use org\bovigo\vfs\vfsStreamDirectory;
|
||||
|
||||
/**
|
||||
* Trait to Mock the global App instance
|
||||
*/
|
||||
trait AppMockTrait
|
||||
{
|
||||
/**
|
||||
* @var MockInterface|App The mocked Friendica\App
|
||||
*/
|
||||
protected $app;
|
||||
|
||||
/**
|
||||
* @var MockInterface|Config\Capability\IManageConfigValues The mocked Config Cache
|
||||
*/
|
||||
protected $configMock;
|
||||
|
||||
/**
|
||||
* @var MockInterface|Profiler The mocked profiler
|
||||
*/
|
||||
protected $profilerMock;
|
||||
|
||||
/**
|
||||
* @var MockInterface|App\Mode The mocked App mode
|
||||
*/
|
||||
protected $mode;
|
||||
|
||||
/**
|
||||
* @var MockInterface|Dice The dependency injection library
|
||||
*/
|
||||
protected $dice;
|
||||
|
||||
/**
|
||||
* Mock the App
|
||||
*
|
||||
* @param vfsStreamDirectory $root The root directory
|
||||
* @param bool $raw If true, no config mocking will be done
|
||||
*
|
||||
* @throws InternalServerErrorException
|
||||
*/
|
||||
public function mockApp(vfsStreamDirectory $root, $raw = false)
|
||||
{
|
||||
$this->dice = \Mockery::mock(Dice::class)->makePartial();
|
||||
$this->dice = $this->dice->addRules(include __DIR__ . '/../../static/dependencies.config.php');
|
||||
|
||||
$this->configMock = \Mockery::mock(Config\ValueObject\Cache::class);
|
||||
$this->dice->shouldReceive('create')
|
||||
->with(Config\ValueObject\Cache::class)
|
||||
->andReturn($this->configMock);
|
||||
$this->mode = \Mockery::mock(App\Mode::class);
|
||||
$this->dice->shouldReceive('create')
|
||||
->with(App\Mode::class)
|
||||
->andReturn($this->mode);
|
||||
$configModel= \Mockery::mock(Config\Repository\Config::class);
|
||||
// Disable the adapter
|
||||
$configModel->shouldReceive('isConnected')->andReturn(false);
|
||||
|
||||
$config = new Config\Type\JitConfig($this->configMock, $configModel);
|
||||
$this->dice->shouldReceive('create')
|
||||
->with(Config\Capability\IManageConfigValues::class)
|
||||
->andReturn($config);
|
||||
|
||||
// Mocking App and most used functions
|
||||
$this->app = \Mockery::mock(App::class);
|
||||
$this->dice->shouldReceive('create')
|
||||
->with(App::class)
|
||||
->andReturn($this->app);
|
||||
$this->app
|
||||
->shouldReceive('getBasePath')
|
||||
->andReturn($root->url());
|
||||
|
||||
$this->profilerMock = \Mockery::mock(Profiler::class);
|
||||
$this->profilerMock->shouldReceive('startRecording');
|
||||
$this->profilerMock->shouldReceive('stopRecording');
|
||||
$this->profilerMock->shouldReceive('saveTimestamp');
|
||||
$this->dice->shouldReceive('create')
|
||||
->with(Profiler::class)
|
||||
->andReturn($this->profilerMock);
|
||||
|
||||
$this->app
|
||||
->shouldReceive('getConfigCache')
|
||||
->andReturn($this->configMock);
|
||||
$this->app
|
||||
->shouldReceive('getTemplateEngine')
|
||||
->andReturn(new FriendicaSmartyEngine('frio', []));
|
||||
$this->app
|
||||
->shouldReceive('getCurrentTheme')
|
||||
->andReturn('Smarty3');
|
||||
$this->app->shouldReceive('getThemeInfoValue')
|
||||
->with('videowidth')
|
||||
->andReturn(425);
|
||||
$this->app->shouldReceive('getThemeInfoValue')
|
||||
->with('videoheight')
|
||||
->andReturn(350);
|
||||
|
||||
DI::init($this->dice);
|
||||
|
||||
if ($raw) {
|
||||
return;
|
||||
}
|
||||
|
||||
$this->configMock
|
||||
->shouldReceive('has')
|
||||
->andReturn(true);
|
||||
$this->configMock
|
||||
->shouldReceive('get')
|
||||
->with('database', 'hostname')
|
||||
->andReturn(getenv('MYSQL_HOST'));
|
||||
$this->configMock
|
||||
->shouldReceive('get')
|
||||
->with('database', 'username')
|
||||
->andReturn(getenv('MYSQL_USERNAME'));
|
||||
$this->configMock
|
||||
->shouldReceive('get')
|
||||
->with('database', 'password')
|
||||
->andReturn(getenv('MYSQL_PASSWORD'));
|
||||
$this->configMock
|
||||
->shouldReceive('get')
|
||||
->with('database', 'database')
|
||||
->andReturn(getenv('MYSQL_DATABASE'));
|
||||
$this->configMock
|
||||
->shouldReceive('get')
|
||||
->with('config', 'hostname')
|
||||
->andReturn('localhost');
|
||||
$this->configMock
|
||||
->shouldReceive('get')
|
||||
->with('system', 'theme')
|
||||
->andReturn('system_theme');
|
||||
}
|
||||
}
|
|
@ -9,27 +9,17 @@
|
|||
namespace Friendica\Test\src\Content;
|
||||
|
||||
use Friendica\Content\Smilies;
|
||||
use Friendica\DI;
|
||||
use Friendica\Network\HTTPException\InternalServerErrorException;
|
||||
use Friendica\Test\MockedTest;
|
||||
use Friendica\Test\Util\AppMockTrait;
|
||||
use Friendica\Test\Util\VFSTrait;
|
||||
use Friendica\Test\FixtureTest;
|
||||
|
||||
class SmiliesTest extends MockedTest
|
||||
class SmiliesTest extends FixtureTest
|
||||
{
|
||||
use VFSTrait;
|
||||
use AppMockTrait;
|
||||
|
||||
protected function setUp(): void
|
||||
{
|
||||
parent::setUp();
|
||||
$this->setUpVfsDir();
|
||||
$this->mockApp($this->root);
|
||||
$this->configMock->shouldReceive('get')
|
||||
->with('system', 'no_smilies')
|
||||
->andReturn(false);
|
||||
$this->configMock->shouldReceive('get')
|
||||
->with(false, 'system', 'no_smilies')
|
||||
->andReturn(false);
|
||||
|
||||
DI::config()->set('system', 'no_smilies', false);
|
||||
}
|
||||
|
||||
public function dataLinks()
|
||||
|
|
|
@ -21,61 +21,25 @@
|
|||
|
||||
namespace Friendica\Test\src\Content\Text;
|
||||
|
||||
use Friendica\App\BaseURL;
|
||||
use Friendica\Content\Text\BBCode;
|
||||
use Friendica\Core\L10n;
|
||||
use Friendica\DI;
|
||||
use Friendica\Network\HTTPException\InternalServerErrorException;
|
||||
use Friendica\Test\MockedTest;
|
||||
use Friendica\Test\Util\AppMockTrait;
|
||||
use Friendica\Test\Util\VFSTrait;
|
||||
use Mockery;
|
||||
use Friendica\Test\FixtureTest;
|
||||
|
||||
class BBCodeTest extends MockedTest
|
||||
class BBCodeTest extends FixtureTest
|
||||
{
|
||||
use VFSTrait;
|
||||
use AppMockTrait;
|
||||
|
||||
protected function setUp(): void
|
||||
{
|
||||
parent::setUp();
|
||||
$this->setUpVfsDir();
|
||||
$this->mockApp($this->root);
|
||||
$this->configMock->shouldReceive('get')
|
||||
->with('system', 'remove_multiplicated_lines')
|
||||
->andReturn(false);
|
||||
$this->configMock->shouldReceive('get')
|
||||
->with('system', 'no_oembed')
|
||||
->andReturn(false);
|
||||
$this->configMock->shouldReceive('get')
|
||||
->with('system', 'allowed_link_protocols')
|
||||
->andReturn(null);
|
||||
$this->configMock->shouldReceive('get')
|
||||
->with('system', 'url')
|
||||
->andReturn('friendica.local');
|
||||
$this->configMock->shouldReceive('get')
|
||||
->with('system', 'no_smilies')
|
||||
->andReturn(false);
|
||||
$this->configMock->shouldReceive('get')
|
||||
->with('system', 'big_emojis')
|
||||
->andReturn(false);
|
||||
$this->configMock->shouldReceive('get')
|
||||
->with('system', 'allowed_oembed')
|
||||
->andReturn('');
|
||||
DI::config()->set('system', 'remove_multiplicated_lines', false);
|
||||
DI::config()->set('system', 'no_oembed', false);
|
||||
DI::config()->set('system', 'allowed_link_protocols', []);
|
||||
DI::config()->set('system', 'url', 'friendica.local');
|
||||
DI::config()->set('system', 'no_smilies', false);
|
||||
DI::config()->set('system', 'big_emojis', false);
|
||||
DI::config()->set('system', 'allowed_oembed', '');
|
||||
|
||||
$l10nMock = Mockery::mock(L10n::class);
|
||||
$l10nMock->shouldReceive('t')->withAnyArgs()->andReturnUsing(function ($args) { return $args; });
|
||||
$this->dice->shouldReceive('create')
|
||||
->with(L10n::class)
|
||||
->andReturn($l10nMock);
|
||||
|
||||
$baseUrlMock = Mockery::mock(BaseURL::class);
|
||||
$baseUrlMock->shouldReceive('get')->withAnyArgs()->andReturn('friendica.local');
|
||||
$this->dice->shouldReceive('create')
|
||||
->with(BaseURL::class)
|
||||
->andReturn($baseUrlMock);
|
||||
$baseUrlMock->shouldReceive('getHostname')->withNoArgs()->andReturn('friendica.local');
|
||||
$baseUrlMock->shouldReceive('getUrlPath')->withNoArgs()->andReturn('');
|
||||
$baseUrlMock->shouldReceive('__toString')->withNoArgs()->andReturn('friendica.local');
|
||||
DI::baseUrl()->save('friendica.local', DI::baseUrl()::SSL_POLICY_FULL, '');
|
||||
|
||||
$config = \HTMLPurifier_HTML5Config::createDefault();
|
||||
$config->set('HTML.Doctype', 'HTML5');
|
||||
|
|
|
@ -24,22 +24,10 @@ namespace Friendica\Test\src\Content\Text;
|
|||
use Exception;
|
||||
use Friendica\Content\Text\HTML;
|
||||
use Friendica\Network\HTTPException\InternalServerErrorException;
|
||||
use Friendica\Test\MockedTest;
|
||||
use Friendica\Test\Util\AppMockTrait;
|
||||
use Friendica\Test\Util\VFSTrait;
|
||||
use Friendica\Test\FixtureTest;
|
||||
|
||||
class HTMLTest extends MockedTest
|
||||
class HTMLTest extends FixtureTest
|
||||
{
|
||||
use VFSTrait;
|
||||
use AppMockTrait;
|
||||
|
||||
protected function setUp(): void
|
||||
{
|
||||
parent::setUp();
|
||||
$this->setUpVfsDir();
|
||||
$this->mockApp($this->root);
|
||||
}
|
||||
|
||||
public function dataHTML()
|
||||
{
|
||||
$inputFiles = glob(__DIR__ . '/../../../datasets/content/text/html/*.html');
|
||||
|
|
|
@ -23,22 +23,10 @@ namespace Friendica\Test\src\Content\Text;
|
|||
|
||||
use Exception;
|
||||
use Friendica\Content\Text\Markdown;
|
||||
use Friendica\Test\MockedTest;
|
||||
use Friendica\Test\Util\AppMockTrait;
|
||||
use Friendica\Test\Util\VFSTrait;
|
||||
use Friendica\Test\FixtureTest;
|
||||
|
||||
class MarkdownTest extends MockedTest
|
||||
class MarkdownTest extends FixtureTest
|
||||
{
|
||||
use VFSTrait;
|
||||
use AppMockTrait;
|
||||
|
||||
protected function setUp(): void
|
||||
{
|
||||
parent::setUp();
|
||||
$this->setUpVfsDir();
|
||||
$this->mockApp($this->root);
|
||||
}
|
||||
|
||||
public function dataMarkdown()
|
||||
{
|
||||
$inputFiles = glob(__DIR__ . '/../../../datasets/content/text/markdown/*.md');
|
||||
|
|
Loading…
Reference in a new issue