tonyair/silverstripe-framework
1
0
Fork 0
mirror of https://github.com/silverstripe/silverstripe-framework synced 2024-10-22 12:05:37 +00:00
Code Issues Projects Releases Wiki Activity

Minor cleanup of DirectorTest

Browse Source
This commit is contained in:
Dan Hensby 2018-09-26 00:55:46 +01:00
parent 3a007d52e6
commit 3c532cea0c
No known key found for this signature in database
GPG Key ID: 3906B235643EF10B
1 changed files with 23 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

43
tests/php/Control/DirectorTest.php
View File

@ -1,4 +1,5 @@
<?php <?php
namespace SilverStripe\Control\Tests; namespace SilverStripe\Control\Tests;
use SilverStripe\Control\Cookie_Backend; use SilverStripe\Control\Cookie_Backend;
@ -193,24 +194,26 @@ class DirectorTest extends SapphireTest
/** /**
* Tests that {@link Director::is_absolute()} works under different environment types * Tests that {@link Director::is_absolute()} works under different environment types
* @dataProvider provideAbsolutePaths
*/ */
public function testIsAbsolute() public function testIsAbsolute($path, $result)
{ {
$expected = array ( $this->assertEquals($result, Director::is_absolute($path));
'C:/something' => true, }
'd:\\' => true,
'e/' => false,
's:/directory' => true,
'/var/www' => true,
'\\Something' => true,
'something/c:' => false,
'folder' => false,
'a/c:/' => false
);
foreach ($expected as $path => $result) { public function provideAbsolutePaths()
$this->assertEquals(Director::is_absolute($path), $result, "Test result for $path"); {
} return [
['C:/something', true],
['d:\\', true],
['e/', false],
['s:/directory', true],
['/var/www', true],
['\\Something', true],
['something/c:', false],
['folder', false],
['a/c:/', false],
];
} }
public function testIsAbsoluteUrl() public function testIsAbsoluteUrl()
@ -486,7 +489,7 @@ class DirectorTest extends SapphireTest
public function providerTestTestRequestCarriesGlobals() public function providerTestTestRequestCarriesGlobals()
{ {
$tests = []; $tests = [];
$fixture = [ 'somekey' => 'sometestvalue' ]; $fixture = ['somekey' => 'sometestvalue'];
foreach (array('get', 'post') as $method) { foreach (array('get', 'post') as $method) {
foreach (array('return%sValue', 'returnRequestValue', 'returnCookieValue') as $testfunction) { foreach (array('return%sValue', 'returnRequestValue', 'returnCookieValue') as $testfunction) {
$url = 'TestController/' . sprintf($testfunction, ucfirst($method)) $url = 'TestController/' . sprintf($testfunction, ucfirst($method))
@ -761,7 +764,7 @@ class DirectorTest extends SapphireTest
null, null,
null, null,
null, null,
[ 'X-Forwarded-Protocol' => 'https' ] ['X-Forwarded-Protocol' => 'https']
)->getBody() )->getBody()
); );
@ -773,7 +776,7 @@ class DirectorTest extends SapphireTest
null, null,
null, null,
null, null,
[ 'X-Forwarded-Protocol' => 'http' ] ['X-Forwarded-Protocol' => 'http']
)->getBody() )->getBody()
); );
@ -785,7 +788,7 @@ class DirectorTest extends SapphireTest
null, null,
null, null,
null, null,
[ 'X-Forwarded-Protocol' => 'ftp' ] ['X-Forwarded-Protocol' => 'ftp']
)->getBody() )->getBody()
); );
@ -925,7 +928,7 @@ class DirectorTest extends SapphireTest
// Global middleware // Global middleware
$middleware = new DirectorTest\TestMiddleware; $middleware = new DirectorTest\TestMiddleware;
Director::singleton()->setMiddlewares([ $middleware ]); Director::singleton()->setMiddlewares([$middleware]);
// URL rules, one of which has a specific middleware // URL rules, one of which has a specific middleware
Config::modify()->set( Config::modify()->set(