diff --git a/tests/src/Content/Text/BBCodeTest.php b/tests/src/Content/Text/BBCodeTest.php
index 7fd39927fc..802a90278b 100644
--- a/tests/src/Content/Text/BBCodeTest.php
+++ b/tests/src/Content/Text/BBCodeTest.php
@@ -1,130 +1,133 @@
-setUpVfsDir();
- $this->mockApp($this->root);
- $this->app->videowidth = 425;
- $this->app->videoheight = 350;
- $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', 'itemcache_duration')
- ->andReturn(-1);
- $this->mockL10nT();
- }
-
- public function dataLinks()
- {
- return [
- /** @see https://github.com/friendica/friendica/issues/2487 */
- 'bug-2487-1' => [
- 'data' => 'https://de.wikipedia.org/wiki/Juha_Sipilä',
- 'assertHTML' => true,
- ],
- 'bug-2487-2' => [
- 'data' => 'https://de.wikipedia.org/wiki/Dnepr_(Motorradmarke)',
- 'assertHTML' => true,
- ],
- 'bug-2487-3' => [
- 'data' => 'https://friendica.wäckerlin.ch/friendica',
- 'assertHTML' => true,
- ],
- 'bug-2487-4' => [
- 'data' => 'https://mastodon.social/@morevnaproject',
- 'assertHTML' => true,
- ],
- /** @see https://github.com/friendica/friendica/issues/5795 */
- 'bug-5795' => [
- 'data' => 'https://social.nasqueron.org/@liw/100798039015010628',
- 'assertHTML' => true,
- ],
- /** @see https://github.com/friendica/friendica/issues/6095 */
- 'bug-6095' => [
- 'data' => 'https://en.wikipedia.org/wiki/Solid_(web_decentralization_project)',
- 'assertHTML' => true,
- ],
- 'no-protocol' => [
- 'data' => 'example.com/path',
- 'assertHTML' => false
- ],
- 'wrong-protocol' => [
- 'data' => 'ftp://example.com',
- 'assertHTML' => false
- ],
- 'wrong-domain-without-path' => [
- 'data' => 'http://example',
- 'assertHTML' => false
- ],
- 'wrong-domain-with-path' => [
- 'data' => 'http://example/path',
- 'assertHTML' => false
- ],
- 'bug-6857-domain-start' => [
- 'data' => "http://\nexample.com",
- 'assertHTML' => false
- ],
- 'bug-6857-domain-end' => [
- 'data' => "http://example\n.com",
- 'assertHTML' => false
- ],
- 'bug-6857-tld' => [
- 'data' => "http://example.\ncom",
- 'assertHTML' => false
- ],
- 'bug-6857-end' => [
- 'data' => "http://example.com\ntest",
- 'assertHTML' => false
- ],
- 'bug-6901' => [
- 'data' => "http://example.com
",
- 'assertHTML' => false
- ],
- ];
- }
-
- /**
- * Test convert different links inside a text
- * @dataProvider dataLinks
- *
- * @param string $data The data to text
- * @param bool $assertHTML True, if the link is a HTML link (...)
- * @throws \Friendica\Network\HTTPException\InternalServerErrorException
- */
- public function testAutoLinking($data, $assertHTML)
- {
- $output = BBCode::convert($data);
- $assert = '' . $data . '';
- if ($assertHTML) {
- $this->assertEquals($assert, $output);
- } else {
- $this->assertNotEquals($assert, $output);
- }
- }
-}
+setUpVfsDir();
+ $this->mockApp($this->root);
+ $this->app->videowidth = 425;
+ $this->app->videoheight = 350;
+ $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', 'itemcache_duration')
+ ->andReturn(-1);
+ $this->configMock->shouldReceive('get')
+ ->with('system', 'url')
+ ->andReturn('friendica.local');
+ $this->mockL10nT();
+ }
+
+ public function dataLinks()
+ {
+ return [
+ /** @see https://github.com/friendica/friendica/issues/2487 */
+ 'bug-2487-1' => [
+ 'data' => 'https://de.wikipedia.org/wiki/Juha_Sipilä',
+ 'assertHTML' => true,
+ ],
+ 'bug-2487-2' => [
+ 'data' => 'https://de.wikipedia.org/wiki/Dnepr_(Motorradmarke)',
+ 'assertHTML' => true,
+ ],
+ 'bug-2487-3' => [
+ 'data' => 'https://friendica.wäckerlin.ch/friendica',
+ 'assertHTML' => true,
+ ],
+ 'bug-2487-4' => [
+ 'data' => 'https://mastodon.social/@morevnaproject',
+ 'assertHTML' => true,
+ ],
+ /** @see https://github.com/friendica/friendica/issues/5795 */
+ 'bug-5795' => [
+ 'data' => 'https://social.nasqueron.org/@liw/100798039015010628',
+ 'assertHTML' => true,
+ ],
+ /** @see https://github.com/friendica/friendica/issues/6095 */
+ 'bug-6095' => [
+ 'data' => 'https://en.wikipedia.org/wiki/Solid_(web_decentralization_project)',
+ 'assertHTML' => true,
+ ],
+ 'no-protocol' => [
+ 'data' => 'example.com/path',
+ 'assertHTML' => false
+ ],
+ 'wrong-protocol' => [
+ 'data' => 'ftp://example.com',
+ 'assertHTML' => false
+ ],
+ 'wrong-domain-without-path' => [
+ 'data' => 'http://example',
+ 'assertHTML' => false
+ ],
+ 'wrong-domain-with-path' => [
+ 'data' => 'http://example/path',
+ 'assertHTML' => false
+ ],
+ 'bug-6857-domain-start' => [
+ 'data' => "http://\nexample.com",
+ 'assertHTML' => false
+ ],
+ 'bug-6857-domain-end' => [
+ 'data' => "http://example\n.com",
+ 'assertHTML' => false
+ ],
+ 'bug-6857-tld' => [
+ 'data' => "http://example.\ncom",
+ 'assertHTML' => false
+ ],
+ 'bug-6857-end' => [
+ 'data' => "http://example.com\ntest",
+ 'assertHTML' => false
+ ],
+ 'bug-6901' => [
+ 'data' => "http://example.com",
+ 'assertHTML' => false
+ ],
+ ];
+ }
+
+ /**
+ * Test convert different links inside a text
+ * @dataProvider dataLinks
+ *
+ * @param string $data The data to text
+ * @param bool $assertHTML True, if the link is a HTML link (...)
+ * @throws \Friendica\Network\HTTPException\InternalServerErrorException
+ */
+ public function testAutoLinking($data, $assertHTML)
+ {
+ $output = BBCode::convert($data);
+ $assert = '' . $data . '';
+ if ($assertHTML) {
+ $this->assertEquals($assert, $output);
+ } else {
+ $this->assertNotEquals($assert, $output);
+ }
+ }
+}
diff --git a/tests/src/Core/Console/AutomaticInstallationConsoleTest.php b/tests/src/Core/Console/AutomaticInstallationConsoleTest.php
index f18e71ccca..f24f56cdb5 100644
--- a/tests/src/Core/Console/AutomaticInstallationConsoleTest.php
+++ b/tests/src/Core/Console/AutomaticInstallationConsoleTest.php
@@ -54,6 +54,7 @@ class AutomaticInstallationConsoleTest extends ConsoleTest
$this->configCache = new ConfigCache();
$this->configCache->set('system', 'basepath', $this->root->url());
$this->configCache->set('config', 'php_path', trim(shell_exec('which php')));
+ $this->configCache->set('system', 'theme', 'smarty3');
$this->mockApp($this->root, null, true);
diff --git a/tests/src/Core/Console/ConfigConsoleTest.php b/tests/src/Core/Console/ConfigConsoleTest.php
index c8deda5555..c58b05ec39 100644
--- a/tests/src/Core/Console/ConfigConsoleTest.php
+++ b/tests/src/Core/Console/ConfigConsoleTest.php
@@ -24,14 +24,10 @@ class ConfigConsoleTest extends ConsoleTest
]
]);
- $mode = \Mockery::mock(Mode::class);
- $mode
+ $this->mode
->shouldReceive('has')
->andReturn(true);
- $this->app
- ->shouldReceive('getMode')
- ->andReturn($mode);
}
function testSetGetKeyValue() {