Fixing Unittests

diff --git a/tests/src/Content/Text/BBCodeTest.php b/tests/src/Content/Text/BBCodeTest.php
index 7fd39927fcacdb17e8ab0a5b2cd00c17a24ce6bc..802a90278b9ec33c1b2070033b2ed4539fd0a531 100644 (file)
--- a/tests/src/Content/Text/BBCodeTest.php
+++ b/tests/src/Content/Text/BBCodeTest.php
@@ -1,130 +1,133 @@
-<?php\r
-\r
-namespace Friendica\Test\src\Content\Text;\r
-\r
-use Friendica\Content\Text\BBCode;\r
-use Friendica\Test\MockedTest;\r
-use Friendica\Test\Util\AppMockTrait;\r
-use Friendica\Test\Util\L10nMockTrait;\r
-use Friendica\Test\Util\VFSTrait;\r
-\r
-/**\r
- * @runTestsInSeparateProcesses\r
- * @preserveGlobalState disabled\r
- */\r
-class BBCodeTest extends MockedTest\r
-{\r
-       use VFSTrait;\r
-       use AppMockTrait;\r
-       use L10nMockTrait;\r
-\r
-       protected function setUp()\r
-       {\r
-               parent::setUp();\r
-               $this->setUpVfsDir();\r
-               $this->mockApp($this->root);\r
-               $this->app->videowidth = 425;\r
-               $this->app->videoheight = 350;\r
-               $this->configMock->shouldReceive('get')\r
-                       ->with('system', 'remove_multiplicated_lines')\r
-                       ->andReturn(false);\r
-               $this->configMock->shouldReceive('get')\r
-                       ->with('system', 'no_oembed')\r
-                       ->andReturn(false);\r
-               $this->configMock->shouldReceive('get')\r
-                       ->with('system', 'allowed_link_protocols')\r
-                       ->andReturn(null);\r
-               $this->configMock->shouldReceive('get')\r
-                       ->with('system', 'itemcache_duration')\r
-                       ->andReturn(-1);\r
-               $this->mockL10nT();\r
-       }\r
-\r
-       public function dataLinks()\r
-       {\r
-               return [\r
-                       /** @see https://github.com/friendica/friendica/issues/2487 */\r
-                       'bug-2487-1' => [\r
-                               'data' => 'https://de.wikipedia.org/wiki/Juha_Sipilä',\r
-                               'assertHTML' => true,\r
-                       ],\r
-                       'bug-2487-2' => [\r
-                               'data' => 'https://de.wikipedia.org/wiki/Dnepr_(Motorradmarke)',\r
-                               'assertHTML' => true,\r
-                       ],\r
-                       'bug-2487-3' => [\r
-                               'data' => 'https://friendica.wäckerlin.ch/friendica',\r
-                               'assertHTML' => true,\r
-                       ],\r
-                       'bug-2487-4' => [\r
-                               'data' => 'https://mastodon.social/@morevnaproject',\r
-                               'assertHTML' => true,\r
-                       ],\r
-                       /** @see https://github.com/friendica/friendica/issues/5795 */\r
-                       'bug-5795' => [\r
-                               'data' => 'https://social.nasqueron.org/@liw/100798039015010628',\r
-                               'assertHTML' => true,\r
-                       ],\r
-                       /** @see https://github.com/friendica/friendica/issues/6095 */\r
-                       'bug-6095' => [\r
-                               'data' => 'https://en.wikipedia.org/wiki/Solid_(web_decentralization_project)',\r
-                               'assertHTML' => true,\r
-                       ],\r
-                       'no-protocol' => [\r
-                               'data' => 'example.com/path',\r
-                               'assertHTML' => false\r
-                       ],\r
-                       'wrong-protocol' => [\r
-                               'data' => 'ftp://example.com',\r
-                               'assertHTML' => false\r
-                       ],\r
-                       'wrong-domain-without-path' => [\r
-                               'data' => 'http://example',\r
-                               'assertHTML' => false\r
-                       ],\r
-                       'wrong-domain-with-path' => [\r
-                               'data' => 'http://example/path',\r
-                               'assertHTML' => false\r
-                       ],\r
-                       'bug-6857-domain-start' => [\r
-                               'data' => "http://\nexample.com",\r
-                               'assertHTML' => false\r
-                       ],\r
-                       'bug-6857-domain-end' => [\r
-                               'data' => "http://example\n.com",\r
-                               'assertHTML' => false\r
-                       ],\r
-                       'bug-6857-tld' => [\r
-                               'data' => "http://example.\ncom",\r
-                               'assertHTML' => false\r
-                       ],\r
-                       'bug-6857-end' => [\r
-                               'data' => "http://example.com\ntest",\r
-                               'assertHTML' => false\r
-                       ],\r
-                       'bug-6901' => [\r
-                               'data' => "http://example.com<ul>",\r
-                               'assertHTML' => false\r
-                       ],\r
-               ];\r
-       }\r
-\r
-       /**\r
-        * Test convert different links inside a text\r
-        * @dataProvider dataLinks\r
-        *\r
-        * @param string $data The data to text\r
-        * @param bool $assertHTML True, if the link is a HTML link (<a href...>...</a>)\r
-        * @throws \Friendica\Network\HTTPException\InternalServerErrorException\r
-        */\r
-       public function testAutoLinking($data, $assertHTML)\r
-       {\r
-               $output = BBCode::convert($data);\r
-               $assert = '<a href="' . $data . '" target="_blank">' . $data . '</a>';\r
-               if ($assertHTML) {\r
-                       $this->assertEquals($assert, $output);\r
-               } else {\r
-                       $this->assertNotEquals($assert, $output);\r
-               }\r
-       }\r
-}\r
+<?php
+
+namespace Friendica\Test\src\Content\Text;
+
+use Friendica\Content\Text\BBCode;
+use Friendica\Test\MockedTest;
+use Friendica\Test\Util\AppMockTrait;
+use Friendica\Test\Util\L10nMockTrait;
+use Friendica\Test\Util\VFSTrait;
+
+/**
+ * @runTestsInSeparateProcesses
+ * @preserveGlobalState disabled
+ */
+class BBCodeTest extends MockedTest
+{
+       use VFSTrait;
+       use AppMockTrait;
+       use L10nMockTrait;
+
+       protected function setUp()
+       {
+               parent::setUp();
+               $this->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<ul>",
+                               '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 (<a href...>...</a>)
+        * @throws \Friendica\Network\HTTPException\InternalServerErrorException
+        */
+       public function testAutoLinking($data, $assertHTML)
+       {
+               $output = BBCode::convert($data);
+               $assert = '<a href="' . $data . '" target="_blank">' . $data . '</a>';
+               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 f18e71cccaa27af73bfa20d384969c8d0b0987c0..f24f56cdb54281132eb14159fa451df442266f82 100644 (file)
--- 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 c8deda55557e9da8a4962119bfbc62beb26099aa..c58b05ec39f9b78b8324f86ff1452a284282a3b8 100644 (file)
--- 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() {