Merge branch 'develop' of https://github.com/getgrav/grav into develop

This commit is contained in:
Djamil Legato
2016-02-01 16:39:04 -08:00

View File

@@ -297,8 +297,8 @@ class MarkdownTest extends \Codeception\TestCase\Test
$this->config->set('system.absolute_urls', false);
$this->uri->initializeWithUrlAndRootPath('http://localhost/subdir/item2/item-2-2', '/subdir')->init();
$this->assertSame('<p><a href="/subdir">Root</a></p>',
$this->parsedown->text('[Root](/)'));
// $this->assertSame('<p><a href="/subdir/">Root</a></p>',
// $this->parsedown->text('[Root](/)'));
$this->assertSame('<p><a href="/subdir/item2/item2-1">Peer Page</a></p>',
$this->parsedown->text('[Peer Page](/item2/item2-1)'));
$this->assertSame('<p><a href="/subdir/item2/item2-2/item2-2-1">Down a Level</a></p>',
@@ -319,8 +319,8 @@ class MarkdownTest extends \Codeception\TestCase\Test
$this->config->set('system.absolute_urls', true);
$this->uri->initializeWithUrlAndRootPath('http://localhost/subdir/item2/item-2-2', '/subdir')->init();
$this->assertSame('<p><a href="http://localhost/subdir">Root</a></p>',
$this->parsedown->text('[Root](/)'));
// $this->assertSame('<p><a href="http://localhost/subdir/">Root</a></p>',
// $this->parsedown->text('[Root](/)'));
$this->assertSame('<p><a href="http://localhost/subdir/item2/item2-1">Peer Page</a></p>',
$this->parsedown->text('[Peer Page](/item2/item2-1)'));
$this->assertSame('<p><a href="http://localhost/subdir/item2/item2-2/item2-2-1">Down a Level</a></p>',