From 0717b7ba5c2dcfd4b1274fbb5231f7e971a1fe1d Mon Sep 17 00:00:00 2001
From: GoZ <goz@226961.no-reply.drupal.org>
Date: Sun, 26 Mar 2017 15:02:52 +0200
Subject: [PATCH] Issue #2864121: Convert web tests to browser tests for
 statistics module

---
 .../statistics/src/Tests/StatisticsTestBase.php    | 54 ----------------------
 .../src/Functional}/StatisticsAdminTest.php        |  9 ++--
 .../src/Functional}/StatisticsLoggingTest.php      |  6 +--
 .../src/Functional}/StatisticsReportsTest.php      |  2 +-
 .../tests/src/Functional/StatisticsTestBase.php    |  3 ++
 5 files changed, 13 insertions(+), 61 deletions(-)
 delete mode 100644 core/modules/statistics/src/Tests/StatisticsTestBase.php
 rename core/modules/statistics/{src/Tests => tests/src/Functional}/StatisticsAdminTest.php (96%)
 rename core/modules/statistics/{src/Tests => tests/src/Functional}/StatisticsLoggingTest.php (97%)
 rename core/modules/statistics/{src/Tests => tests/src/Functional}/StatisticsReportsTest.php (98%)

diff --git a/core/modules/statistics/src/Tests/StatisticsTestBase.php b/core/modules/statistics/src/Tests/StatisticsTestBase.php
deleted file mode 100644
index 4f530cf..0000000
--- a/core/modules/statistics/src/Tests/StatisticsTestBase.php
+++ /dev/null
@@ -1,54 +0,0 @@
-<?php
-
-namespace Drupal\statistics\Tests;
-
-use Drupal\simpletest\WebTestBase;
-
-/**
- * Defines a base class for testing the Statistics module.
- *
- * @deprecated Scheduled for removal in Drupal 9.0.0.
- *   Use \Drupal\Tests\statistics\Functional\StatisticsTestBase instead.
- */
-abstract class StatisticsTestBase extends WebTestBase {
-
-  /**
-   * Modules to enable.
-   *
-   * @var array
-   */
-  public static $modules = ['node', 'block', 'ban', 'statistics'];
-
-  /**
-   * User with permissions to ban IP's.
-   *
-   * @var \Drupal\user\UserInterface
-   */
-  protected $blockingUser;
-
-  protected function setUp() {
-    parent::setUp();
-
-    // Create Basic page node type.
-    if ($this->profile != 'standard') {
-      $this->drupalCreateContentType(['type' => 'page', 'name' => 'Basic page']);
-    }
-
-    // Create user.
-    $this->blockingUser = $this->drupalCreateUser([
-      'access administration pages',
-      'access site reports',
-      'ban IP addresses',
-      'administer blocks',
-      'administer statistics',
-      'administer users',
-    ]);
-    $this->drupalLogin($this->blockingUser);
-
-    // Enable logging.
-    $this->config('statistics.settings')
-      ->set('count_content_views', 1)
-      ->save();
-  }
-
-}
diff --git a/core/modules/statistics/src/Tests/StatisticsAdminTest.php b/core/modules/statistics/tests/src/Functional/StatisticsAdminTest.php
similarity index 96%
rename from core/modules/statistics/src/Tests/StatisticsAdminTest.php
rename to core/modules/statistics/tests/src/Functional/StatisticsAdminTest.php
index 3ce0457..bef8ff3 100644
--- a/core/modules/statistics/src/Tests/StatisticsAdminTest.php
+++ b/core/modules/statistics/tests/src/Functional/StatisticsAdminTest.php
@@ -1,15 +1,18 @@
 <?php
 
-namespace Drupal\statistics\Tests;
+namespace Drupal\Tests\statistics\Functional;
 
-use Drupal\simpletest\WebTestBase;
+use Drupal\Tests\BrowserTestBase;
+use \Drupal\Tests\Traits\Core\CronRunTrait;
 
 /**
  * Tests the statistics admin.
  *
  * @group statistics
  */
-class StatisticsAdminTest extends WebTestBase {
+class StatisticsAdminTest extends BrowserTestBase {
+
+  use CronRunTrait;
 
   /**
    * Modules to enable.
diff --git a/core/modules/statistics/src/Tests/StatisticsLoggingTest.php b/core/modules/statistics/tests/src/Functional/StatisticsLoggingTest.php
similarity index 97%
rename from core/modules/statistics/src/Tests/StatisticsLoggingTest.php
rename to core/modules/statistics/tests/src/Functional/StatisticsLoggingTest.php
index 152c95a..7490f36 100644
--- a/core/modules/statistics/src/Tests/StatisticsLoggingTest.php
+++ b/core/modules/statistics/tests/src/Functional/StatisticsLoggingTest.php
@@ -1,8 +1,8 @@
 <?php
 
-namespace Drupal\statistics\Tests;
+namespace Drupal\Tests\statistics\Functional;
 
-use Drupal\simpletest\WebTestBase;
+use Drupal\Tests\BrowserTestBase;
 
 /**
  * Tests request logging for cached and uncached pages.
@@ -12,7 +12,7 @@
  *
  * @group statistics
  */
-class StatisticsLoggingTest extends WebTestBase {
+class StatisticsLoggingTest extends BrowserTestBase {
 
   /**
    * Modules to enable.
diff --git a/core/modules/statistics/src/Tests/StatisticsReportsTest.php b/core/modules/statistics/tests/src/Functional/StatisticsReportsTest.php
similarity index 98%
rename from core/modules/statistics/src/Tests/StatisticsReportsTest.php
rename to core/modules/statistics/tests/src/Functional/StatisticsReportsTest.php
index ea597f4..edebca1 100644
--- a/core/modules/statistics/src/Tests/StatisticsReportsTest.php
+++ b/core/modules/statistics/tests/src/Functional/StatisticsReportsTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Drupal\statistics\Tests;
+namespace Drupal\Tests\statistics\Functional;
 
 use Drupal\Core\Cache\Cache;
 use Drupal\system\Tests\Cache\AssertPageCacheContextsAndTagsTrait;
diff --git a/core/modules/statistics/tests/src/Functional/StatisticsTestBase.php b/core/modules/statistics/tests/src/Functional/StatisticsTestBase.php
index 3be95e2..65d08bd 100644
--- a/core/modules/statistics/tests/src/Functional/StatisticsTestBase.php
+++ b/core/modules/statistics/tests/src/Functional/StatisticsTestBase.php
@@ -6,6 +6,9 @@
 
 /**
  * Defines a base class for testing the Statistics module.
+ *
+ * @deprecated Scheduled for removal in Drupal 9.0.0.
+ *   Use \Drupal\Tests\statistics\Functional\StatisticsTestBase instead.
  */
 abstract class StatisticsTestBase extends BrowserTestBase {
 
-- 
2.8.1