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.

2015-11-17 13:42:33 -08:00 · 2015-11-17 13:42:33 -08:00 · 7784f4c23d
commit 7784f4c23d
parent 4afb23bbd3
929 changed files with 19798 additions and 5304 deletions
--- a/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_summary.yml
+++ b/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_summary.yml
@ -0,0 +1,127 @@
+langcode: en
+status: true
+id: test_summary
+label: Test Summary
+module: views
+description: ''
+tag: default
+base_table: entity_test
+base_field: id
+core: '8'
+display:
+  default:
+    id: default
+    display_title: Master
+    display_plugin: default
+    position: 0
+    display_options:
+      query:
+        type: views_query
+        options:
+          query_comment: ''
+          disable_sql_rewrite: false
+          distinct: false
+          replica: false
+          query_tags: {  }
+      title: 'Summary test'
+      access:
+        type: none
+      cache:
+        type: tag
+        options: {  }
+      pager:
+        type: mini
+        options:
+          items_per_page: 2
+          offset: 0
+          id: 0
+          total_pages: 0
+          expose:
+            items_per_page: false
+            items_per_page_label: 'Items per page'
+            items_per_page_options: '1, 2, 3, 4'
+            items_per_page_options_all: false
+            items_per_page_options_all_label: '- All -'
+            offset: false
+            offset_label: Offset
+          tags:
+            previous: ‹‹
+            next: ››
+      sorts:
+        id:
+          id: id
+          table: entity_test
+          field: id
+          order: ASC
+          plugin_id: standard
+          relationship: none
+      arguments:
+        type:
+          id: type
+          field: type
+          table: entity_test
+          default_action: summary
+          exception:
+            title_enable: true
+          title_enable: true
+          title: '{{ arguments.type }}'
+          default_argument_type: fixed
+          summary:
+            sort_order: asc
+            format: default_summary
+          summary_options:
+            override: true
+            items_per_page: 4
+          specify_validation: true
+          plugin_id: string
+          entity_type: entity_test
+      fields:
+        id:
+          id: id
+          field: id
+          table: entity_test
+          plugin_id: field
+          entity_type: entity_test
+      style:
+        type: default
+        options:
+          grouping: {  }
+          row_class: ''
+          default_row_class: true
+          uses_fields: false
+      row:
+        type: fields
+      header: {  }
+      footer: {  }
+      empty: {  }
+      relationships: {  }
+      fields: {  }
+      display_extenders: {  }
+    cache_metadata:
+      contexts:
+        - 'languages:language_interface'
+        - url
+        - url.query_args
+        - user.permissions
+      max-age: -1
+      tags: {  }
+  page_1:
+    id: page_1
+    display_title: Page
+    display_plugin: page
+    position: 2
+    display_options:
+      query:
+        type: views_query
+        options: {  }
+      path: test-summary
+      display_extenders: {  }
+    cache_metadata:
+      contexts:
+        - 'languages:language_interface'
+        - url
+        - url.query_args
+        - 'user.node_grants:view'
+        - user.permissions
+      max-age: -1
+      tags: {  }
--- a/core/modules/views/tests/src/Unit/Plugin/argument_default/QueryParameterTest.php
+++ b/core/modules/views/tests/src/Unit/Plugin/argument_default/QueryParameterTest.php
@ -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;
  }

 }
-
--- a/core/modules/views/tests/src/Unit/Plugin/argument_default/RawTest.php
+++ b/core/modules/views/tests/src/Unit/Plugin/argument_default/RawTest.php
@ -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());
  }

 }
--- a/core/modules/views/tests/src/Unit/ViewExecutableTest.php
+++ b/core/modules/views/tests/src/Unit/ViewExecutableTest.php
@ -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']);
+  }
+
 }