opdavies/drupalcampbristol
Archived
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Update to Drupal 8.0-dev-2015-11-17. Commits through da81cd220, Tue Nov 17 15:53:49 2015 +0000, Issue #2617224 by Wim Leers: Move around/fix some documentation.

Browse source
This commit is contained in:
Pantheon Automation 2015-11-17 13:42:33 -08:00 • committed by Greg Anderson
parent 4afb23bbd3
commit 7784f4c23d
929 changed files with 19798 additions and 5304 deletions
Download patch file Download diff file Expand all files Collapse all files

50
core/modules/views/tests/src/Unit/Plugin/argument_default/QueryParameterTest.php
View file

@ -48,41 +48,33 @@ class QueryParameterTest extends UnitTestCase {
* - third entry: the expected default argument value.
*/
public function providerGetArgument() {
$data = array();
$data = [];
$single[] = array(
'query_param' => 'test',
);
$single[] = new Request(array('test' => 'data'));
$single[] = 'data';
$data[] = $single;
$data[] = [
['query_param' => 'test'],
new Request(['test' => 'data']),
'data',
];
$single[] = array(
'query_param' => 'test',
'multiple' => 'AND'
);
$single[] = new Request(array('test' => array('data1', 'data2')));
$single[] = 'data1+data2';
$data[] = $single;
$data[] = [
['query_param' => 'test', 'multiple' => 'and'],
new Request(['test' => ['data1', 'data2']]),
'data1,data2',
];
$single[] = array(
'query_param' => 'test',
'multiple' => 'OR'
);
$single[] = new Request(array('test' => array('data1', 'data2')));
$single[] = 'data1,data2';
$data[] = $single;
$data[] = [
['query_param' => 'test', 'multiple' => 'or'],
new Request(['test' => ['data1', 'data2']]),
'data1+data2',
];
$single[] = array(
'query_param' => 'test',
'fallback' => 'blub',
);
$single[] = new Request(array());
$single[] = 'blub';
$data[] = $single;
$data[] = [
['query_param' => 'test', 'fallback' => 'blub'],
new Request([]),
'blub',
];
return $data;
}
}

36
core/modules/views/tests/src/Unit/Plugin/argument_default/RawTest.php
View file

@ -42,7 +42,15 @@ class RawTest extends UnitTestCase {
$alias_manager->expects($this->never())
->method('getAliasByPath');
// Don't use aliases.
// Don't use aliases. Check against NULL and nonexistent path component
// values in addition to valid ones.
$raw = new Raw(array(), 'raw', array(), $alias_manager, $current_path);
$options = array(
'use_alias' => FALSE,
);
$raw->init($view, $display_plugin, $options);
$this->assertEquals(NULL, $raw->getArgument());
$raw = new Raw(array(), 'raw', array(), $alias_manager, $current_path);
$options = array(
'use_alias' => FALSE,
@ -59,12 +67,27 @@ class RawTest extends UnitTestCase {
$raw->init($view, $display_plugin, $options);
$this->assertEquals('example', $raw->getArgument());
$raw = new Raw(array(), 'raw', array(), $alias_manager, $current_path);
$options = array(
'use_alias' => FALSE,
'index' => 2,
);
$raw->init($view, $display_plugin, $options);
$this->assertEquals(NULL, $raw->getArgument());
// Setup an alias manager with a path alias.
$alias_manager = $this->getMock('Drupal\Core\Path\AliasManagerInterface');
$alias_manager->expects($this->any())
->method('getAliasByPath')
->with($this->equalTo('test/example'))
->will($this->returnValue('other/example'));
->with($this->equalTo('/test/example'))
->will($this->returnValue('/other/example'));
$raw = new Raw(array(), 'raw', array(), $alias_manager, $current_path);
$options = array(
'use_alias' => TRUE,
);
$raw->init($view, $display_plugin, $options);
$this->assertEquals(NULL, $raw->getArgument());
$raw = new Raw(array(), 'raw', array(), $alias_manager, $current_path);
$options = array(
@ -82,6 +105,13 @@ class RawTest extends UnitTestCase {
$raw->init($view, $display_plugin, $options);
$this->assertEquals('example', $raw->getArgument());
$raw = new Raw(array(), 'raw', array(), $alias_manager, $current_path);
$options = array(
'use_alias' => TRUE,
'index' => 2,
);
$raw->init($view, $display_plugin, $options);
$this->assertEquals(NULL, $raw->getArgument());
}
}

96
core/modules/views/tests/src/Unit/ViewExecutableTest.php
View file

@ -469,4 +469,100 @@ class ViewExecutableTest extends UnitTestCase {
return array($view, $display);
}
/**
* @covers ::setItemsPerPage
* @covers ::getItemsPerPage
*/
public function testSetItemsPerPageBeforePreRender() {
/** @var \Drupal\views\ViewExecutable|\PHPUnit_Framework_MockObject_MockObject $view */
/** @var \Drupal\views\Plugin\views\display\DisplayPluginBase|\PHPUnit_Framework_MockObject_MockObject $display */
list($view, $display) = $this->setupBaseViewAndDisplay();
$view->setItemsPerPage(12);
$this->assertEquals(12, $view->getItemsPerPage());
$this->assertContains('items_per_page:12', $view->element['#cache']['keys']);
}
/**
* @covers ::setItemsPerPage
* @covers ::getItemsPerPage
*/
public function testSetItemsPerPageDuringPreRender() {
/** @var \Drupal\views\ViewExecutable|\PHPUnit_Framework_MockObject_MockObject $view */
/** @var \Drupal\views\Plugin\views\display\DisplayPluginBase|\PHPUnit_Framework_MockObject_MockObject $display */
list($view, $display) = $this->setupBaseViewAndDisplay();
$elements = &$view->element;
$elements['#cache'] += ['keys' => []];
$elements['#pre_rendered'] = TRUE;
$view->setItemsPerPage(12);
$this->assertEquals(12, $view->getItemsPerPage());
$this->assertNotContains('items_per_page:12', $view->element['#cache']['keys']);
}
/**
* @covers ::setOffset
* @covers ::getOffset
*/
public function testSetOffsetBeforePreRender() {
/** @var \Drupal\views\ViewExecutable|\PHPUnit_Framework_MockObject_MockObject $view */
/** @var \Drupal\views\Plugin\views\display\DisplayPluginBase|\PHPUnit_Framework_MockObject_MockObject $display */
list($view, $display) = $this->setupBaseViewAndDisplay();
$view->setOffset(12);
$this->assertEquals(12, $view->getOffset());
$this->assertContains('offset:12', $view->element['#cache']['keys']);
}
/**
* @covers ::setOffset
* @covers ::getOffset
*/
public function testSetOffsetDuringPreRender() {
/** @var \Drupal\views\ViewExecutable|\PHPUnit_Framework_MockObject_MockObject $view */
/** @var \Drupal\views\Plugin\views\display\DisplayPluginBase|\PHPUnit_Framework_MockObject_MockObject $display */
list($view, $display) = $this->setupBaseViewAndDisplay();
$elements = &$view->element;
$elements['#cache'] += ['keys' => []];
$elements['#pre_rendered'] = TRUE;
$view->setOffset(12);
$this->assertEquals(12, $view->getOffset());
$this->assertNotContains('offset:12', $view->element['#cache']['keys']);
}
/**
* @covers ::setCurrentPage
* @covers ::getCurrentPage
*/
public function testSetCurrentPageBeforePreRender() {
/** @var \Drupal\views\ViewExecutable|\PHPUnit_Framework_MockObject_MockObject $view */
/** @var \Drupal\views\Plugin\views\display\DisplayPluginBase|\PHPUnit_Framework_MockObject_MockObject $display */
list($view, $display) = $this->setupBaseViewAndDisplay();
$view->setCurrentPage(12);
$this->assertEquals(12, $view->getCurrentPage());
$this->assertContains('page:12', $view->element['#cache']['keys']);
}
/**
* @covers ::setCurrentPage
* @covers ::getCurrentPage
*/
public function testSetCurrentPageDuringPreRender() {
/** @var \Drupal\views\ViewExecutable|\PHPUnit_Framework_MockObject_MockObject $view */
/** @var \Drupal\views\Plugin\views\display\DisplayPluginBase|\PHPUnit_Framework_MockObject_MockObject $display */
list($view, $display) = $this->setupBaseViewAndDisplay();
$elements = &$view->element;
$elements['#cache'] += ['keys' => []];
$elements['#pre_rendered'] = TRUE;
$view->setCurrentPage(12);
$this->assertEquals(12, $view->getCurrentPage());
$this->assertNotContains('page:12', $view->element['#cache']['keys']);
}
}