Merge pull request #7828 from nupplaphil/task/move_enotify

[friendica.git] / tests / src / App / ModuleTest.php

diff --git a/tests/src/App/ModuleTest.php b/tests/src/App/ModuleTest.php
index 309e94bba46d05f68b8b2182db6a690d38a3d641..ce2a40b80640bca61ee2a4caa4fdf9b30527763b 100644 (file)
--- a/tests/src/App/ModuleTest.php
+++ b/tests/src/App/ModuleTest.php
@@ -5,7 +5,7 @@ namespace Friendica\Test\src\App;
 use Friendica\App;
 use Friendica\Core\Config\Configuration;
 use Friendica\LegacyModule;
-use Friendica\Module\PageNotFound;
+use Friendica\Module\HTTPException\PageNotFound;
 use Friendica\Module\WellKnown\HostMeta;
 use Friendica\Test\DatabaseTest;
 
@@ -45,7 +45,6 @@ class ModuleTest extends DatabaseTest
                                        'network/data/in',
                                        ['network', 'data', 'in'],
                                        3),
-                               'server' => [],
                        ],
                        'withStrikeAndPoint'        => [
                                'assert' => [
@@ -57,7 +56,6 @@ class ModuleTest extends DatabaseTest
                                        'with-strike.and-point/data/in',
                                        ['with-strike.and-point', 'data', 'in'],
                                        3),
-                               'server' => [],
                        ],
                        'withNothing'               => [
                                'assert' => [
@@ -66,7 +64,6 @@ class ModuleTest extends DatabaseTest
                                        'class'     => App\Module::DEFAULT_CLASS,
                                ],
                                'args'   => new App\Arguments(),
-                               'server' => []
                        ],
                        'withIndex'                 => [
                                'assert' => [
@@ -75,21 +72,8 @@ class ModuleTest extends DatabaseTest
                                        'class'     => App\Module::DEFAULT_CLASS,
                                ],
                                'args'   => new App\Arguments(),
-                               'server' => ['PHP_SELF' => 'index.php']
                        ],
-                       'withIndexButBackendMod'    => [
-                               'assert' => [
-                                       'isBackend' => false,
-                                       'name'      => App\Module::BACKEND_MODULES[0],
-                                       'class'     => App\Module::DEFAULT_CLASS,
-                               ],
-                               'args'   => new App\Arguments(App\Module::BACKEND_MODULES[0] . '/data/in',
-                                       App\Module::BACKEND_MODULES[0] . '/data/in',
-                                       [App\Module::BACKEND_MODULES[0], 'data', 'in'],
-                                       3),
-                               'server' => ['PHP_SELF' => 'index.php']
-                       ],
-                       'withNotIndexAndBackendMod' => [
+                       'withBackendMod'    => [
                                'assert' => [
                                        'isBackend' => true,
                                        'name'      => App\Module::BACKEND_MODULES[0],
@@ -99,7 +83,6 @@ class ModuleTest extends DatabaseTest
                                        App\Module::BACKEND_MODULES[0] . '/data/in',
                                        [App\Module::BACKEND_MODULES[0], 'data', 'in'],
                                        3),
-                               'server' => ['PHP_SELF' => 'daemon.php']
                        ],
                        'withFirefoxApp'            => [
                                'assert' => [
@@ -111,7 +94,6 @@ class ModuleTest extends DatabaseTest
                                        'users/sign_in',
                                        ['users', 'sign_in'],
                                        3),
-                               'server' => ['PHP_SELF' => 'index.php'],
                        ],
                ];
        }
@@ -121,9 +103,9 @@ class ModuleTest extends DatabaseTest
         *
         * @dataProvider dataModuleName
         */
-       public function testModuleName(array $assert, App\Arguments $args, array $server)
+       public function testModuleName(array $assert, App\Arguments $args)
        {
-               $module = (new App\Module())->determineModule($args, $server);
+               $module = (new App\Module())->determineModule($args);
 
                $this->assertModule($assert, $module);
        }
@@ -170,7 +152,9 @@ class ModuleTest extends DatabaseTest
                $config = \Mockery::mock(Configuration::class);
                $config->shouldReceive('get')->with('config', 'private_addons', false)->andReturn($privAdd)->atMost()->once();
 
-               $module = (new App\Module($name))->determineClass(new App\Arguments('', $command), new App\Router(), $config);
+               $router = (new App\Router([]))->loadRoutes(include __DIR__ . '/../../../static/routes.config.php');
+
+               $module = (new App\Module($name))->determineClass(new App\Arguments('', $command), $router, $config);
 
                $this->assertEquals($assert, $module->getClassName());
        }
@@ -182,7 +166,7 @@ class ModuleTest extends DatabaseTest
        {
                $module = new App\Module();
 
-               $moduleNew = $module->determineModule(new App\Arguments(), []);
+               $moduleNew = $module->determineModule(new App\Arguments());
 
                $this->assertNotSame($moduleNew, $module);
        }