From 48654804bdcceb28e1882fe2f4b6c55e5b8dee28 Mon Sep 17 00:00:00 2001
From: Deltik <deltik@gmx.com>
Date: Fri, 9 Nov 2018 16:52:37 -0600
Subject: [PATCH] e_parse::parseTemplate() behavior clarification

New tests cover the behavior described in
https://github.com/e107inc/e107/issues/3547
---
 tests/unit/e_parseTest.php | 62 ++++++++++++++++++++++++++++++++++++--
 tests/unit/pluginsTest.php |  4 ++-
 2 files changed, 63 insertions(+), 3 deletions(-)

diff --git a/tests/unit/e_parseTest.php b/tests/unit/e_parseTest.php
index a74b89368..7648718be 100644
--- a/tests/unit/e_parseTest.php
+++ b/tests/unit/e_parseTest.php
@@ -77,12 +77,70 @@ TMP;
 		{
 
 		}
+*/
 
-		public function testParseTemplate()
+		public function testParseTemplateWithEnabledCoreShortcodes()
 		{
-
+			$needle = '<ul class="nav navbar-nav nav-main">';
+			$result = $this->tp->parseTemplate('{NAVIGATION}', true);
+			$this->assertContains($needle, $result);
 		}
 
+		public function testParseTemplateWithDisabledCoreShortcodes()
+		{
+			$result = $this->tp->parseTemplate('{NAVIGATION}', false);
+			$this->assertEmpty($result);
+		}
+
+		public function testParseTemplateWithCoreAddonShortcodes()
+		{
+			e107::getPlugin()->uninstall('online');
+			e107::getScParser()->__construct();
+
+			$result = $this->tp->parseTemplate('{ONLINE_MEMBER_PAGE}', false);
+			$this->assertEmpty($result);
+
+			$result = $this->tp->parseTemplate('{ONLINE_MEMBER_PAGE}', true);
+			$this->assertEmpty($result);
+
+			$shortcodeObject = e107::getScBatch('online', true);
+
+			$expected = "<a href=''>lost</a>";
+			$result = $this->tp->parseTemplate('{ONLINE_MEMBER_PAGE}', false, $shortcodeObject);
+			$this->assertEquals($expected, $result);
+
+			$result = $this->tp->parseTemplate('{ONLINE_MEMBER_PAGE}', false);
+			$this->assertEmpty($result);
+
+			$result = $this->tp->parseTemplate('{ONLINE_MEMBER_PAGE}', true);
+			$this->assertEquals($expected, $result);
+		}
+
+		public function testParseTemplateWithNonCoreShortcodes()
+		{
+			e107::getPlugin()->uninstall('download');
+			e107::getScParser()->__construct();
+
+			$result = $this->tp->parseTemplate('{DOWNLOAD_CAT_SEARCH}', false);
+			$this->assertEmpty($result);
+
+			$result = $this->tp->parseTemplate('{DOWNLOAD_CAT_SEARCH}', true);
+			$this->assertEmpty($result);
+
+			$shortcodeObject = e107::getScBatch('download', true);
+
+			$needle = "<form class='form-search form-inline' ";
+			$result = $this->tp->parseTemplate('{DOWNLOAD_CAT_SEARCH}', false, $shortcodeObject);
+			$this->assertContains($needle, $result);
+
+			$result = $this->tp->parseTemplate('{DOWNLOAD_CAT_SEARCH}', false);
+			$this->assertEmpty($result);
+
+			$result = $this->tp->parseTemplate('{DOWNLOAD_CAT_SEARCH}', true);
+			$this->assertEmpty($result);
+		}
+
+/*
 		public function testCreateConstants()
 		{
 
diff --git a/tests/unit/pluginsTest.php b/tests/unit/pluginsTest.php
index 64ddbb4e3..0e435bd61 100644
--- a/tests/unit/pluginsTest.php
+++ b/tests/unit/pluginsTest.php
@@ -118,6 +118,9 @@
 			);
 		}
 
+		/**
+		 * @see https://github.com/e107inc/e107/issues/3547
+		 */
 		public function testBanner()
 		{
 
@@ -130,7 +133,6 @@
 
 			$tp = e107::getParser();
 
-			// XXX: Contradicts https://github.com/e107inc/e107/issues/3547#issuecomment-437163733
 			$result = $tp->parseTemplate("{BANNER=e107promo}",true);
 			$this->assertContains("<img class='e-banner img-responsive img-fluid'", $result);