Issue #2089195 by dawehner: Fixed ControllerBase::config does not work as expected.

core/lib/Drupal/Core/Controller/ControllerBase.php

@@ -138,9 +138,9 @@ protected function cache($bin = 'cache') {
    */
   protected function config($name) {
     if (!$this->configFactory) {
-      $this->configFactory = $this->container()->get('config.factory')->get($name);
+      $this->configFactory = $this->container()->get('config.factory');
     }
-    return $this->configFactory;
+    return $this->configFactory->get($name);
   }
 
   /**

core/tests/Drupal/Tests/Core/Controller/ControllerBaseTest.php

+<?php
+
+/**
+ * @file
+ * Contains \Drupal\Tests\Core\Controller\ControllerBaseTest.
+ */
+
+namespace Drupal\Tests\Core\Controller;
+
+use Drupal\Tests\UnitTestCase;
+
+/**
+ * Tests that the base controller class.
+ */
+class ControllerBaseTest extends UnitTestCase {
+
+  /**
+   * The tested controller base class.
+   *
+   * @var \Drupal\Core\Controller\ControllerBase|\PHPUnit_Framework_MockObject_MockObject
+   */
+  protected $controllerBase;
+
+  public static function getInfo() {
+    return array(
+      'name' => 'Controller Base tests',
+      'description' => 'Tests that the base controller class.',
+      'group' => 'Routing',
+    );
+  }
+
+  protected function setUp() {
+    $this->controllerBase = $this->getMockForAbstractClass('Drupal\Core\Controller\ControllerBase');
+  }
+
+  /**
+   * Tests the config method.
+   */
+  public function testGetConfig() {
+    $config_factory = $this->getConfigFactoryStub(array(
+      'config_name' => array(
+        'key' => 'value',
+      ),
+      'config_name2' => array(
+        'key2' => 'value2',
+      ),
+    ));
+
+    $container = $this->getMock('Symfony\Component\DependencyInjection\ContainerInterface');
+    $container->expects($this->once())
+      ->method('get')
+      ->with('config.factory')
+      ->will($this->returnValue($config_factory));
+    \Drupal::setContainer($container);
+
+    $config_method = new \ReflectionMethod('Drupal\Core\Controller\ControllerBase', 'config');
+    $config_method->setAccessible(TRUE);
+
+    // Call config twice to ensure that the container is just called once.
+    $config = $config_method->invoke($this->controllerBase, 'config_name');
+    $this->assertEquals('value', $config->get('key'));
+
+    $config = $config_method->invoke($this->controllerBase, 'config_name2');
+    $this->assertEquals('value2', $config->get('key2'));
+  }
+
+}