From 76fe68d924d424283d0a1784c5f5e7582dda3a00 Mon Sep 17 00:00:00 2001 From: ArthurHoaro Date: Tue, 22 Sep 2020 12:44:08 +0200 Subject: Fix plugin base path in core plugins Also fix note check in archiveorg plugin, and regression on vintage template. Documentation regarding relative path has been added. Fixes #1548 --- tests/plugins/PluginArchiveorgTest.php | 37 +++++++++++++++++++++++++--------- 1 file changed, 27 insertions(+), 10 deletions(-) (limited to 'tests/plugins/PluginArchiveorgTest.php') diff --git a/tests/plugins/PluginArchiveorgTest.php b/tests/plugins/PluginArchiveorgTest.php index b9a67adb..9c19752c 100644 --- a/tests/plugins/PluginArchiveorgTest.php +++ b/tests/plugins/PluginArchiveorgTest.php @@ -1,10 +1,12 @@ savedScriptName = $_SERVER['SCRIPT_NAME'] ?? null; + $_SERVER['SCRIPT_NAME'] = '/index.php'; + } + + public function tearDown(): void + { + unset($_SERVER['SERVER_PORT']); + unset($_SERVER['SERVER_NAME']); + $_SERVER['SCRIPT_NAME'] = $this->savedScriptName; } /** * Test render_linklist hook on external bookmarks. */ - public function testArchiveorgLinklistOnExternalLinks() + public function testArchiveorgLinklistOnExternalLinks(): void { $str = 'http://randomstr.com/test'; @@ -56,16 +73,16 @@ class PluginArchiveorgTest extends \PHPUnit\Framework\TestCase /** * Test render_linklist hook on internal bookmarks. */ - public function testArchiveorgLinklistOnInternalLinks() + public function testArchiveorgLinklistOnInternalLinks(): void { - $internalLink1 = 'http://shaarli.shaarli/?qvMAqg'; - $internalLinkRealURL1 = '?qvMAqg'; + $internalLink1 = 'http://shaarli.shaarli/shaare/qvMAqg'; + $internalLinkRealURL1 = '/shaare/qvMAqg'; - $internalLink2 = 'http://shaarli.shaarli/?2_7zww'; - $internalLinkRealURL2 = '?2_7zww'; + $internalLink2 = 'http://shaarli.shaarli/shaare/2_7zww'; + $internalLinkRealURL2 = '/shaare/2_7zww'; - $internalLink3 = 'http://shaarli.shaarli/?z7u-_Q'; - $internalLinkRealURL3 = '?z7u-_Q'; + $internalLink3 = 'http://shaarli.shaarli/shaare/z7u-_Q'; + $internalLinkRealURL3 = '/shaare/z7u-_Q'; $data = array( 'title' => $internalLink1, -- cgit v1.2.3