george/PrivateBin
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #1003 from PrivateBin/yourls-cleanup

Browse Source 
improve configuration wording, adjust self check
This commit is contained in:
El RIDO
2022-11-03 19:54:56 +01:00
committed by GitHub
parent 449dbb8377 987ead2719
commit 66600e5eb3
5 changed files with 29 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
tst/JsonApiTest.php
View File

@@ -272,7 +272,7 @@ class JsonApiTest extends PHPUnit_Framework_TestCase
{
$mock_yourls_service = $this->_path . DIRECTORY_SEPARATOR . 'yourls.json';
$options = parse_ini_file(CONF, true);
$options['main']['basepath'] = 'https://example.com/path';
$options['main']['basepath'] = 'https://example.com/path'; // missing slash gets added by Configuration constructor
$options['main']['urlshortener'] = 'https://example.com/path/shortenviayourls?link=';
$options['yourls']['apiurl'] = $mock_yourls_service;
Helper::createIniFile(CONF, $options);

2
tst/YourlsProxyTest.php
View File

@@ -20,7 +20,7 @@ class YourlsProxyTest extends PHPUnit_Framework_TestCase
}
$this->_mock_yourls_service = $this->_path . DIRECTORY_SEPARATOR . 'yourls.json';
$options = parse_ini_file(CONF_SAMPLE, true);
$options['main']['basepath'] = 'https://example.com';
$options['main']['basepath'] = 'https://example.com/';
$options['main']['urlshortener'] = 'https://example.com/shortenviayourls?link=';
$options['yourls']['apiurl'] = $this->_mock_yourls_service;
Helper::confBackup();