From aa58ad8c9a9522042a82c4e9e91a579f483c6d5c Mon Sep 17 00:00:00 2001
From: Russel Anthony <anthonyrw@cmog.org>
Date: Mon, 3 Aug 2020 14:18:04 -0400
Subject: [PATCH] refactor test files and update with current standards

---
 .../Functional/TaxonomyMenuOperationsTest.php | 68 ++++++++++---------
 .../src/Unit}/TaxonomyMenuTest.php            |  8 +--
 2 files changed, 41 insertions(+), 35 deletions(-)
 rename src/Tests/TaxonomyMenuOperations.php => tests/src/Functional/TaxonomyMenuOperationsTest.php (71%)
 rename {src/Tests => tests/src/Unit}/TaxonomyMenuTest.php (80%)

diff --git a/src/Tests/TaxonomyMenuOperations.php b/tests/src/Functional/TaxonomyMenuOperationsTest.php
similarity index 71%
rename from src/Tests/TaxonomyMenuOperations.php
rename to tests/src/Functional/TaxonomyMenuOperationsTest.php
index dbb6197..a8ee50f 100644
--- a/src/Tests/TaxonomyMenuOperations.php
+++ b/tests/src/Functional/TaxonomyMenuOperationsTest.php
@@ -1,15 +1,15 @@
 <?php
 
-namespace Drupal\taxonomy_menu\Tests;
+namespace Drupal\Tests\taxonomy_menu\Functional;
 
-use Drupal\simpletest\WebTestBase;
+use Drupal\Tests\BrowserTestBase;
 
 /**
  * Tests the operations of Taxonomy Menu.
  *
  * @group taxonomy_menu
  */
-class TaxonomyMenuOperations extends WebTestBase {
+class TaxonomyMenuOperationsTest extends BrowserTestBase {
   /**
    * List of modules.
    *
@@ -19,6 +19,11 @@ class TaxonomyMenuOperations extends WebTestBase {
     'taxonomy_menu', 'system', 'menu_ui', 'taxonomy', 'dblog',
   ];
 
+  /**
+   * {@inheritdoc}
+   */
+  protected $defaultTheme = 'stark';
+
   /**
    * Set up for all tests.
    */
@@ -95,27 +100,31 @@ class TaxonomyMenuOperations extends WebTestBase {
   public function testTaxMenuCreate() {
     // Check menu for taxonomy-based menu items keyed 1, 2, and 3.
     $this->drupalGet('admin/structure/menu/manage/test-menu');
-    $this->assertFieldByName(
-      'links[menu_plugin_id:taxonomy_menu.menu_link:taxonomy_menu.menu_link.test_tax_menu.1][enabled]',
-      NULL,
-      'I should expect to see enabled field for taxonomy term 1'
+
+    // We should expect to see enabled field for taxonomy term 1
+    $this->assertSession()->fieldExists(
+      'links[menu_plugin_id:taxonomy_menu.menu_link:taxonomy_menu.menu_link.test_tax_menu.1][enabled]'
     );
-    $this->assertFieldByName(
-      'links[menu_plugin_id:taxonomy_menu.menu_link:taxonomy_menu.menu_link.test_tax_menu.2][enabled]',
-      NULL,
-      'I should expect to see enabled field for taxonomy term 2'
+
+    // We should expect to see enabled field for taxonomy term 2
+    $this->assertSession()->fieldExists(
+      'links[menu_plugin_id:taxonomy_menu.menu_link:taxonomy_menu.menu_link.test_tax_menu.2][enabled]'
     );
-    $this->assertFieldByName(
-      'links[menu_plugin_id:taxonomy_menu.menu_link:taxonomy_menu.menu_link.test_tax_menu.3][enabled]',
-      NULL,
-      'I should expect to see enabled field for taxonomy term 3'
+
+    // We should expect to see enabled field for taxonomy term 3
+    $this->assertSession()->fieldExists(
+      'links[menu_plugin_id:taxonomy_menu.menu_link:taxonomy_menu.menu_link.test_tax_menu.3][enabled]'
     );
 
     // Check 2 is a parent of 1.
-    $this->assertFieldByName(
-      'links[menu_plugin_id:taxonomy_menu.menu_link:taxonomy_menu.menu_link.test_tax_menu.2][parent]',
-      'taxonomy_menu.menu_link:taxonomy_menu.menu_link.test_tax_menu.1',
-      'I should expect to see taxonomy term 2 have a parent of taxonomy term 1'
+    $this->drupalGet('admin/structure/menu/link/taxonomy_menu.menu_link:taxonomy_menu.menu_link.test_tax_menu.2/edit');
+    // We should expect to see taxonomy term 2 have a parent of taxonomy term 1'
+    $this->assertSession()->fieldExists(
+      'menu_parent',
+    );
+    $this->assertSession()->fieldValueEquals(
+      'menu_parent',
+      'test-menu:taxonomy_menu.menu_link:taxonomy_menu.menu_link.test_tax_menu.1',
     );
 
   }
@@ -133,10 +142,9 @@ class TaxonomyMenuOperations extends WebTestBase {
 
     $this->drupalGet('admin/structure/menu/manage/test-menu');
     // Check for it within the menu.
-    $this->assertFieldByName(
-      'links[menu_plugin_id:taxonomy_menu.menu_link:taxonomy_menu.menu_link.test_tax_menu.4][enabled]',
-      NULL,
-      'I should expect to see enabled field for taxonomy term 4'
+    // We should expect to see enabled field for taxonomy term 4
+    $this->assertSession()->fieldExists(
+      'links[menu_plugin_id:taxonomy_menu.menu_link:taxonomy_menu.menu_link.test_tax_menu.3][enabled]'
     );
   }
 
@@ -150,10 +158,9 @@ class TaxonomyMenuOperations extends WebTestBase {
     $this->drupalPostForm(NULL, $edit, t('Delete'));
 
     // Check for it within the menu.
-    $this->assertNoFieldByName(
-      'links[menu_plugin_id:taxonomy_menu.menu_link.test.3][enabled]',
-      NULL,
-      'I should not expect to see enabled field for taxonomy term 3'
+    // We should not expect to see enabled field for taxonomy term 3
+    $this->assertSession()->fieldNotExists(
+      'enabled'
     );
   }
 
@@ -162,11 +169,10 @@ class TaxonomyMenuOperations extends WebTestBase {
    */
   public function testTaxMenuLinkExpanded() {
     $this->drupalGet('admin/structure/menu/link/taxonomy_menu.menu_link:taxonomy_menu.menu_link.test_tax_menu.1/edit');
-
-    $this->assertFieldByName(
+    // We should expect to see expanded value for menu based on taxonomy term 1
+    $this->assertSession()->fieldValueEquals(
       'expanded',
-      1,
-      'I should expect to see expanded value for menu based on taxonomy term 1'
+      1
     );
   }
 
diff --git a/src/Tests/TaxonomyMenuTest.php b/tests/src/Unit/TaxonomyMenuTest.php
similarity index 80%
rename from src/Tests/TaxonomyMenuTest.php
rename to tests/src/Unit/TaxonomyMenuTest.php
index a98257a..16f2cd5 100644
--- a/src/Tests/TaxonomyMenuTest.php
+++ b/tests/src/Unit/TaxonomyMenuTest.php
@@ -1,19 +1,19 @@
 <?php
 
-namespace Drupal\taxonomy_menu\Tests;
+namespace Drupal\Tests\taxonomy_menu\Unit;
 
-use Drupal\simpletest\WebTestBase;
+use Drupal\Tests\UnitTestCase;
 
 /**
  * Class TaxonomyMenuTest.
  *
  * Provides automated tests for the taxonomy_menu module.
  *
- * @package Drupal\taxonomy_menu\Tests
+ * @package Drupal\Tests\taxonomy_menu
  *
  * @group taxonomy_menu
  */
-class TaxonomyMenuTest extends WebTestBase {
+class TaxonomyMenuTest extends UnitTestCase {
 
   /**
    * {@inheritdoc}
-- 
2.20.1.windows.1