Stop scrollToItem() animate twice.

[friendica.git] / tests / Util / AppMockTrait.php

diff --git a/tests/Util/AppMockTrait.php b/tests/Util/AppMockTrait.php
index caf8a7c08475d24d04f6f95ba1531445fecc95cd..7948f09f602efdac1ee11ca268dd243f19599881 100644 (file)
--- a/tests/Util/AppMockTrait.php
+++ b/tests/Util/AppMockTrait.php
@@ -2,9 +2,10 @@
 
 namespace Friendica\Test\Util;
 
+use Dice\Dice;
 use Friendica\App;
-use Friendica\BaseObject;
 use Friendica\Core\Config;
+use Friendica\DI;
 use Friendica\Render\FriendicaSmartyEngine;
 use Friendica\Util\Profiler;
 use Mockery\MockInterface;
@@ -21,7 +22,7 @@ trait AppMockTrait
        protected $app;
 
        /**
-        * @var MockInterface|Config\Configuration The mocked Config Cache
+        * @var MockInterface|Config\IConfiguration The mocked Config Cache
         */
        protected $configMock;
 
@@ -35,6 +36,11 @@ trait AppMockTrait
         */
        protected $mode;
 
+       /**
+        * @var MockInterface|Dice The dependency injection library
+        */
+       protected $dice;
+
        /**
         * Mock the App
         *
@@ -43,18 +49,31 @@ trait AppMockTrait
         */
        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\Cache\ConfigCache::class);
+               $this->dice->shouldReceive('create')
+                          ->with(Config\Cache\ConfigCache::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(\Friendica\Model\Config\Config::class);
                // Disable the adapter
                $configModel->shouldReceive('isConnected')->andReturn(false);
 
                $config = new Config\JitConfiguration($this->configMock, $configModel);
-               // Initialize empty Config
-               Config::init($config);
+               $this->dice->shouldReceive('create')
+                          ->with(Config\IConfiguration::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());
@@ -65,6 +84,9 @@ trait AppMockTrait
 
                $this->profilerMock = \Mockery::mock(Profiler::class);
                $this->profilerMock->shouldReceive('saveTimestamp');
+               $this->dice->shouldReceive('create')
+                          ->with(Profiler::class, [])
+                          ->andReturn($this->profilerMock);
 
                $this->app
                        ->shouldReceive('getConfigCache')
@@ -87,7 +109,7 @@ trait AppMockTrait
                                return $this->configMock->get('system', 'url');
                        });
 
-               BaseObject::setApp($this->app);
+               DI::init($this->dice);
 
                if ($raw) {
                        return;