Nemcio/Grav
1
0
Fork 0
mirror of https://github.com/getgrav/grav.git synced 2026-05-07 01:46:47 +02:00
Code Issues Packages Projects Releases Activity

Fix URITest with static methods

Browse Source
This commit is contained in:
Andy Miller
2016-01-26 15:08:52 -07:00
parent d1b24d0077
commit a8bfa88cac
1 changed files with 6 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
tests/unit/Grav/Common/UriTest.php
View File

@@ -1,6 +1,7 @@
<?php
use Codeception\Util\Fixtures;
use Grav\Common\Uri;
use Grav\Common\Utils;
class UriTest extends \Codeception\TestCase\Test
@@ -419,7 +420,7 @@ class UriTest extends \Codeception\TestCase\Test
'port' => '8080',
];
$this->assertSame($this->grav()['uri']::buildUrl($parsed_url), 'http://localhost:8080');
$this->assertSame(Uri::buildUrl($parsed_url), 'http://localhost:8080');
$parsed_url = [
'scheme' => 'http',
@@ -432,7 +433,7 @@ class UriTest extends \Codeception\TestCase\Test
'fragment' => 'xxx',
];
$this->assertSame($this->grav()['uri']::buildUrl($parsed_url), 'http://foo:bar@localhost:8080/test?x=2#xxx');
$this->assertSame(\Uri::buildUrl($parsed_url), 'http://foo:bar@localhost:8080/test?x=2#xxx');
}
public function testConvertUrl()
@@ -443,12 +444,12 @@ class UriTest extends \Codeception\TestCase\Test
public function testAddNonce()
{
$url = 'http://localhost/foo';
$this->assertStringStartsWith($url, $this->grav()['uri']::addNonce($url, 'test-action'));
$this->assertStringStartsWith($url . '/nonce:', $this->grav()['uri']::addNonce($url, 'test-action'));
$this->assertStringStartsWith($url, Uri::addNonce($url, 'test-action'));
$this->assertStringStartsWith($url . '/nonce:', Uri::addNonce($url, 'test-action'));
$uri = $this->getURI();
$uri->initializeWithURL($this->grav()['uri']::addNonce($url, 'test-action'))->init();
$uri->initializeWithURL(Uri::addNonce($url, 'test-action'))->init();
$this->assertTrue(is_string($uri->param('nonce')));
$this->assertSame($uri->param('nonce'), Utils::getNonce('test-action'));
}