From 5ed24402725b0d6684e0c606e1e622f996e7face Mon Sep 17 00:00:00 2001
From: Cameron <e107inc@gmail.com>
Date: Wed, 31 Mar 2021 13:04:20 -0700
Subject: [PATCH] Issue #4473 - some merged code from Deltik

---
 e107_tests/tests/unit/e107_user_extendedTest.php |  7 +++++--
 e107_tests/tests/unit/e_parse_shortcodeTest.php  | 13 +++++++++++++
 2 files changed, 18 insertions(+), 2 deletions(-)

diff --git a/e107_tests/tests/unit/e107_user_extendedTest.php b/e107_tests/tests/unit/e107_user_extendedTest.php
index ba3b658df..8cb15d789 100644
--- a/e107_tests/tests/unit/e107_user_extendedTest.php
+++ b/e107_tests/tests/unit/e107_user_extendedTest.php
@@ -118,14 +118,17 @@
 			// clear the table.
 
 			$sql = e107::getDb();
-			$fieldCount = (int) $sql->count('user_extended_struct');
+		/*	$fieldCount = (int) $sql->count('user_extended_struct');
 
 			if($fieldCount > 17)
 			{
 				codecept_debug("Truncating user_extended_struct");
 				$sql->truncate('user_extended_struct');
 
-			}
+			}*/
+
+			$sql->truncate('user_extended_struct');
+
 
 
 			// Add a field of each type.
diff --git a/e107_tests/tests/unit/e_parse_shortcodeTest.php b/e107_tests/tests/unit/e_parse_shortcodeTest.php
index 0b908120d..65143ce1e 100644
--- a/e107_tests/tests/unit/e_parse_shortcodeTest.php
+++ b/e107_tests/tests/unit/e_parse_shortcodeTest.php
@@ -12,6 +12,10 @@ class e_parse_shortcodeTest extends \Codeception\Test\Unit
 {
 	/** @var e_parse_shortcode */
 	private $scParser;
+	/**
+	 * @var e_render
+	 */
+	private $original_e_render;
 
 	public function _before()
 	{
@@ -28,6 +32,15 @@ class e_parse_shortcodeTest extends \Codeception\Test\Unit
 		}
 
 		$this->scParser->__construct();
+
+		$this->original_e_render = e107::getRender();
+		$mock_e_render = $this->make('e_render');
+		e107::setRegistry('core/e107/singleton/e_render', $mock_e_render);
+	}
+
+	public function _after()
+	{
+		e107::setRegistry('core/e107/singleton/e_render', $this->original_e_render);
 	}
 
 //	public function testShortcode_SITELINKS_ALT()