Fixing some AutomaticInstallationConsoleTests

tests/Util/AppMockTrait.php

@@ -40,6 +40,7 @@ trait AppMockTrait
 	 *
 	 * @param vfsStreamDirectory $root The root directory
 	 * @param Config\Cache\ConfigCache $configCache
+	 * @param bool $raw If true, no config mocking will be done
 	 */
 	public function mockApp(vfsStreamDirectory $root, $configCache = null, $raw = false)
 	{
@@ -81,7 +82,7 @@ trait AppMockTrait
 		$this->app
 			->shouldReceive('getBaseUrl')
 			->andReturnUsing(function () {
-				return $this->configMock->get('system', 'url');
+				return $this->app->getConfigCache()->get('system', 'url');
 			});
 
 		BaseObject::setApp($this->app);
@@ -90,6 +91,9 @@ trait AppMockTrait
 			return;
 		}
 
+		$this->configMock
+			->shouldReceive('has')
+			->andReturn(true);
 		$this->configMock
 			->shouldReceive('get')
 			->with('database', 'hostname')

tests/Util/RendererMockTrait.php

@@ -36,16 +36,20 @@ trait RendererMockTrait
 	 * Mocking the method 'Renderer::replaceMacros()'
 	 *
 	 * @param string $template The template to use (normally, it is the mock result of 'mockGetMarkupTemplate()'
-	 * @param array $args The arguments to pass to the macro
+	 * @param array|\Closure|null $args The arguments to pass to the macro
 	 * @param string $return the return value of the mock
 	 * @param null|int $times How often the method will get used
 	 */
-	public function mockReplaceMacros($template, $args = [], $return = '', $times = null)
+	public function mockReplaceMacros($template, $args = null, $return = '', $times = null)
 	{
 		if (!isset($this->rendererMock)) {
 			$this->rendererMock = \Mockery::mock('alias:' . Renderer::class);
 		}
 
+		if (!isset($args)) {
+			$args = [];
+		}
+
 		$this->rendererMock
 			->shouldReceive('replaceMacros')
 			->with($template, $args)