updated core from 8.4 to 8.5 : bug with login_destination

core/modules/statistics/tests/modules/statistics_test_views/statistics_test_views.info.yml

@@ -8,8 +8,8 @@ dependencies:
   - statistics
   - views
 
-# Information added by Drupal.org packaging script on 2018-01-03
-version: '8.4.4'
+# Information added by Drupal.org packaging script on 2018-03-07
+version: '8.5.0'
 core: '8.x'
 project: 'drupal'
-datestamp: 1515021228
+datestamp: 1520457825

core/modules/statistics/tests/src/Kernel/Migrate/d6/MigrateNodeCounterTest.php

@@ -0,0 +1,77 @@
+<?php
+
+namespace Drupal\Tests\statistics\Kernel\Migrate\d6;
+
+use Drupal\Tests\migrate_drupal\Kernel\d6\MigrateDrupal6TestBase;
+
+/**
+ * Tests the migration of node counter data to Drupal 8.
+ *
+ * @group statistics
+ */
+class MigrateNodeCounterTest extends MigrateDrupal6TestBase {
+
+  /**
+   * {@inheritdoc}
+   */
+  public static $modules = [
+    'menu_ui',
+    'node',
+    'statistics',
+    'text',
+  ];
+
+  /**
+   * {@inheritdoc}
+   */
+  protected function setUp() {
+    parent::setUp();
+
+    $this->installEntitySchema('node');
+    $this->installConfig('node');
+    $this->installSchema('statistics', ['node_counter']);
+
+    $this->executeMigrations([
+      'd6_filter_format',
+      'd6_user_role',
+      'd6_node_settings',
+      'd6_user',
+      'd6_node_type',
+      'd6_node',
+      'statistics_node_counter'
+    ]);
+  }
+
+  /**
+   * Tests migration of node counter.
+   */
+  public function testStatisticsSettings() {
+    $this->assertNodeCounter(1, 2, 0, 1421727536);
+    $this->assertNodeCounter(2, 1, 0, 1471428059);
+    $this->assertNodeCounter(3, 1, 0, 1471428153);
+    $this->assertNodeCounter(4, 1, 1, 1478755275);
+    $this->assertNodeCounter(5, 1, 1, 1478755314);
+  }
+
+  /**
+   * Asserts various aspects of a node counter.
+   *
+   * @param int $nid
+   *   The node ID.
+   * @param int $total_count
+   *   The expected total count.
+   * @param int $day_count
+   *   The expected day count.
+   * @param int $timestamp
+   *   The expected timestamp.
+   */
+  protected function assertNodeCounter($nid, $total_count, $day_count, $timestamp) {
+    /** @var \Drupal\statistics\StatisticsViewsResult $statistics */
+    $statistics = $this->container->get('statistics.storage.node')->fetchView($nid);
+    // @todo Remove casting after https://www.drupal.org/node/2926069 lands.
+    $this->assertSame($total_count, (int) $statistics->getTotalCount());
+    $this->assertSame($day_count, (int) $statistics->getDayCount());
+    $this->assertSame($timestamp, (int) $statistics->getTimestamp());
+  }
+
+}

core/modules/statistics/tests/src/Kernel/Migrate/d7/MigrateNodeCounterTest.php

@@ -0,0 +1,73 @@
+<?php
+
+namespace Drupal\Tests\statistics\Kernel\Migrate\d7;
+
+use Drupal\Tests\migrate_drupal\Kernel\d7\MigrateDrupal7TestBase;
+
+/**
+ * Tests the migration of node counter data to Drupal 8.
+ *
+ * @group statistics
+ */
+class MigrateNodeCounterTest extends MigrateDrupal7TestBase {
+
+  /**
+   * {@inheritdoc}
+   */
+  public static $modules = [
+    'menu_ui',
+    'node',
+    'statistics',
+    'text',
+  ];
+
+  /**
+   * {@inheritdoc}
+   */
+  protected function setUp() {
+    parent::setUp();
+
+    $this->installEntitySchema('node');
+    $this->installConfig('node');
+    $this->installSchema('statistics', ['node_counter']);
+
+    $this->executeMigrations([
+      'd7_user_role',
+      'd7_user',
+      'd7_node_type',
+      'd7_node',
+      'statistics_node_counter'
+    ]);
+  }
+
+  /**
+   * Tests migration of node counter.
+   */
+  public function testStatisticsSettings() {
+    $this->assertNodeCounter(1, 2, 0, 1421727536);
+    $this->assertNodeCounter(2, 1, 0, 1471428059);
+    $this->assertNodeCounter(4, 1, 1, 1478755275);
+  }
+
+  /**
+   * Asserts various aspects of a node counter.
+   *
+   * @param int $nid
+   *   The node ID.
+   * @param int $total_count
+   *   The expected total count.
+   * @param int $day_count
+   *   The expected day count.
+   * @param int $timestamp
+   *   The expected timestamp.
+   */
+  protected function assertNodeCounter($nid, $total_count, $day_count, $timestamp) {
+    /** @var \Drupal\statistics\StatisticsViewsResult $statistics */
+    $statistics = $this->container->get('statistics.storage.node')->fetchView($nid);
+    // @todo Remove casting after https://www.drupal.org/node/2926069 lands.
+    $this->assertSame($total_count, (int) $statistics->getTotalCount());
+    $this->assertSame($day_count, (int) $statistics->getDayCount());
+    $this->assertSame($timestamp, (int) $statistics->getTimestamp());
+  }
+
+}

core/modules/statistics/tests/src/Kernel/Plugin/migrate/source/NodeCounterTest.php

@@ -0,0 +1,67 @@
+<?php
+
+namespace Drupal\Tests\statistics\Kernel\Plugin\migrate\source;
+
+use Drupal\Tests\migrate\Kernel\MigrateSqlSourceTestBase;
+
+/**
+ * Tests the node_counter source plugin.
+ *
+ * @covers \Drupal\statistics\Plugin\migrate\source\NodeCounter
+ *
+ * @group statistics
+ */
+class NodeCounterTest extends MigrateSqlSourceTestBase {
+
+  /**
+   * {@inheritdoc}
+   */
+  public static $modules = ['migrate_drupal', 'statistics'];
+
+  /**
+   * {@inheritdoc}
+   */
+  public function providerSource() {
+    $tests = [];
+
+    // The source data.
+    $tests[0]['source_data']['node_counter'] = [
+      [
+        'nid' => 1,
+        'totalcount' => 2,
+        'daycount' => 0,
+        'timestamp' => 1421727536,
+      ],
+      [
+        'nid' => 2,
+        'totalcount' => 1,
+        'daycount' => 0,
+        'timestamp' => 1471428059,
+      ],
+      [
+        'nid' => 3,
+        'totalcount' => 1,
+        'daycount' => 0,
+        'timestamp' => 1471428153,
+      ],
+      [
+        'nid' => 4,
+        'totalcount' => 1,
+        'daycount' => 1,
+        'timestamp' => 1478755275,
+      ],
+      [
+        'nid' => 5,
+        'totalcount' => 1,
+        'daycount' => 1,
+        'timestamp' => 1478755314,
+      ],
+    ];
+
+    // The expected results.
+    $tests[0]['expected_data'] = $tests[0]['source_data']['node_counter'];
+
+    return $tests;
+  }
+
+}

core/modules/statistics/tests/themes/statistics_test_attached/statistics_test_attached.info.yml

@@ -4,8 +4,8 @@ description: 'Theme for testing attached library'
 # version: VERSION
 # core: 8.x
 
-# Information added by Drupal.org packaging script on 2018-01-03
-version: '8.4.4'
+# Information added by Drupal.org packaging script on 2018-03-07
+version: '8.5.0'
 core: '8.x'
 project: 'drupal'
-datestamp: 1515021228
+datestamp: 1520457825