Update to Drupal 8.0.0 beta 14. For more information, see https://drupal.org/node/2544542
This commit is contained in:
parent
3b2511d96d
commit
81ccda77eb
2155 changed files with 54307 additions and 46870 deletions
|
@ -7,10 +7,13 @@
|
|||
|
||||
namespace Drupal\views_test_data\Cache;
|
||||
|
||||
use Drupal\Core\Cache\CacheableMetadata;
|
||||
use Drupal\Core\Cache\Context\CacheContextInterface;
|
||||
|
||||
/**
|
||||
* Test cache context which uses a dynamic context coming from state.
|
||||
*
|
||||
* Cache context ID: 'views_test_cache_context'.
|
||||
*/
|
||||
class ViewsTestCacheContext implements CacheContextInterface {
|
||||
|
||||
|
@ -28,4 +31,11 @@ class ViewsTestCacheContext implements CacheContextInterface {
|
|||
return \Drupal::state()->get('views_test_cache_context', 'George');
|
||||
}
|
||||
|
||||
/**
|
||||
* {@inheritdoc}
|
||||
*/
|
||||
public function getCacheableMetadata() {
|
||||
return new CacheableMetadata();
|
||||
}
|
||||
|
||||
}
|
||||
|
|
|
@ -7,11 +7,13 @@
|
|||
|
||||
namespace Drupal\Tests\views\Unit\Controller {
|
||||
|
||||
use Drupal\Core\Render\RenderContext;
|
||||
use Drupal\Tests\UnitTestCase;
|
||||
use Drupal\views\Ajax\ViewAjaxResponse;
|
||||
use Drupal\views\Controller\ViewAjaxController;
|
||||
use Symfony\Component\HttpFoundation\Request;
|
||||
use Symfony\Component\DependencyInjection\ContainerBuilder;
|
||||
use Symfony\Component\HttpFoundation\RequestStack;
|
||||
|
||||
/**
|
||||
* @coversDefaultClass \Drupal\views\Controller\ViewAjaxController
|
||||
|
@ -76,6 +78,11 @@ class ViewAjaxControllerTest extends UnitTestCase {
|
|||
$elements['#attached'] = [];
|
||||
return isset($elements['#markup']) ? $elements['#markup'] : '';
|
||||
}));
|
||||
$this->renderer->expects($this->any())
|
||||
->method('executeInRenderContext')
|
||||
->willReturnCallback(function (RenderContext $context, callable $callable) {
|
||||
return $callable();
|
||||
});
|
||||
$this->currentPath = $this->getMockBuilder('Drupal\Core\Path\CurrentPathStack')
|
||||
->disableOriginalConstructor()
|
||||
->getMock();
|
||||
|
@ -83,8 +90,23 @@ class ViewAjaxControllerTest extends UnitTestCase {
|
|||
|
||||
$this->viewAjaxController = new ViewAjaxController($this->viewStorage, $this->executableFactory, $this->renderer, $this->currentPath, $this->redirectDestination);
|
||||
|
||||
$request_stack = new RequestStack();
|
||||
$request_stack->push(new Request());
|
||||
$args = [
|
||||
$this->getMock('\Drupal\Core\Controller\ControllerResolverInterface'),
|
||||
$this->getMock('\Drupal\Core\Theme\ThemeManagerInterface'),
|
||||
$this->getMock('\Drupal\Core\Render\ElementInfoManagerInterface'),
|
||||
$this->getMock('\Drupal\Core\Render\RenderCacheInterface'),
|
||||
$request_stack,
|
||||
[
|
||||
'required_cache_contexts' => [
|
||||
'languages:language_interface',
|
||||
'theme',
|
||||
],
|
||||
],
|
||||
];
|
||||
$this->renderer = $this->getMockBuilder('Drupal\Core\Render\Renderer')
|
||||
->disableOriginalConstructor()
|
||||
->setConstructorArgs($args)
|
||||
->setMethods(NULL)
|
||||
->getMock();
|
||||
$container = new ContainerBuilder();
|
||||
|
|
|
@ -168,20 +168,12 @@ class FieldPluginBaseTest extends UnitTestCase {
|
|||
* Sets up the unrouted url assembler and the link generator.
|
||||
*/
|
||||
protected function setUpUrlIntegrationServices() {
|
||||
$config = $this->getMockBuilder('Drupal\Core\Config\ImmutableConfig')
|
||||
->disableOriginalConstructor()
|
||||
->getMock();
|
||||
$config_factory = $this->getMock('\Drupal\Core\Config\ConfigFactoryInterface');
|
||||
$config_factory->expects($this->any())
|
||||
->method('get')
|
||||
->willReturn($config);
|
||||
|
||||
$this->pathProcessor = $this->getMock('Drupal\Core\PathProcessor\OutboundPathProcessorInterface');
|
||||
$this->unroutedUrlAssembler = new UnroutedUrlAssembler($this->requestStack, $config_factory, $this->pathProcessor);
|
||||
$this->unroutedUrlAssembler = new UnroutedUrlAssembler($this->requestStack, $this->pathProcessor);
|
||||
|
||||
\Drupal::getContainer()->set('unrouted_url_assembler', $this->unroutedUrlAssembler);
|
||||
|
||||
$this->linkGenerator = new LinkGenerator($this->urlGenerator, $this->getMock('Drupal\Core\Extension\ModuleHandlerInterface'));
|
||||
$this->linkGenerator = new LinkGenerator($this->urlGenerator, $this->getMock('Drupal\Core\Extension\ModuleHandlerInterface'), $this->renderer);
|
||||
}
|
||||
|
||||
/**
|
||||
|
@ -453,6 +445,7 @@ class FieldPluginBaseTest extends UnitTestCase {
|
|||
'#type' => 'inline_template',
|
||||
'#template' => 'base:test-path/' . explode('/', $path)[1],
|
||||
'#context' => ['foo' => 123],
|
||||
'#post_render' => [function() {}],
|
||||
];
|
||||
|
||||
$this->renderer->expects($this->once())
|
||||
|
|
|
@ -13,7 +13,6 @@ use Drupal\views\Routing\ViewPageController;
|
|||
use Symfony\Cmf\Component\Routing\RouteObjectInterface;
|
||||
use Symfony\Component\HttpFoundation\ParameterBag;
|
||||
use Symfony\Component\HttpFoundation\Request;
|
||||
use Symfony\Component\HttpFoundation\Session\Attribute\AttributeBag;
|
||||
use Symfony\Component\Routing\Route;
|
||||
|
||||
/**
|
||||
|
@ -29,20 +28,6 @@ class ViewPageControllerTest extends UnitTestCase {
|
|||
*/
|
||||
public $pageController;
|
||||
|
||||
/**
|
||||
* The mocked view storage.
|
||||
*
|
||||
* @var \Drupal\views\ViewStorage|\PHPUnit_Framework_MockObject_MockObject
|
||||
*/
|
||||
protected $storage;
|
||||
|
||||
/**
|
||||
* The mocked view executable factory.
|
||||
*
|
||||
* @var \Drupal\views\ViewExecutableFactory|\PHPUnit_Framework_MockObject_MockObject
|
||||
*/
|
||||
protected $executableFactory;
|
||||
|
||||
/**
|
||||
* A render array expected for every page controller render array result.
|
||||
*
|
||||
|
@ -56,23 +41,13 @@ class ViewPageControllerTest extends UnitTestCase {
|
|||
];
|
||||
|
||||
protected function setUp() {
|
||||
$this->storage = $this->getMockBuilder('Drupal\Core\Config\Entity\ConfigEntityStorage')
|
||||
->disableOriginalConstructor()
|
||||
->getMock();
|
||||
$this->executableFactory = $this->getMockBuilder('Drupal\views\ViewExecutableFactory')
|
||||
->disableOriginalConstructor()
|
||||
->getMock();
|
||||
|
||||
$this->pageController = new ViewPageController($this->storage, $this->executableFactory);
|
||||
$this->pageController = new ViewPageController();
|
||||
}
|
||||
|
||||
/**
|
||||
* Tests the page controller.
|
||||
*/
|
||||
public function testPageController() {
|
||||
$this->storage->expects($this->never())
|
||||
->method('load');
|
||||
|
||||
$build = [
|
||||
'#type' => 'view',
|
||||
'#name' => 'test_page_view',
|
||||
|
@ -102,9 +77,6 @@ class ViewPageControllerTest extends UnitTestCase {
|
|||
* Tests the page controller with arguments on a non overridden page view.
|
||||
*/
|
||||
public function testHandleWithArgumentsWithoutOverridden() {
|
||||
$this->storage->expects($this->never())
|
||||
->method('load');
|
||||
|
||||
$request = new Request();
|
||||
$request->attributes->set('view_id', 'test_page_view');
|
||||
$request->attributes->set('display_id', 'page_1');
|
||||
|
@ -139,9 +111,6 @@ class ViewPageControllerTest extends UnitTestCase {
|
|||
* Note: This test does not care about upcasting for now.
|
||||
*/
|
||||
public function testHandleWithArgumentsOnOverriddenRoute() {
|
||||
$this->storage->expects($this->never())
|
||||
->method('load');
|
||||
|
||||
$request = new Request();
|
||||
$request->attributes->set('view_id', 'test_page_view');
|
||||
$request->attributes->set('display_id', 'page_1');
|
||||
|
@ -179,9 +148,6 @@ class ViewPageControllerTest extends UnitTestCase {
|
|||
* are pulled in.
|
||||
*/
|
||||
public function testHandleWithArgumentsOnOverriddenRouteWithUpcasting() {
|
||||
$this->storage->expects($this->never())
|
||||
->method('load');
|
||||
|
||||
$request = new Request();
|
||||
$request->attributes->set('view_id', 'test_page_view');
|
||||
$request->attributes->set('display_id', 'page_1');
|
||||
|
|
Reference in a new issue