tonyair
/
silverstripe-framework
mirror of https://github.com/silverstripe/silverstripe-framework
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Fix core tests

This commit is contained in:
Damian Mooyman 2017-06-13 15:43:13 +12:00
parent a0ae723514
commit fc7188da7d
3 changed files with 42 additions and 74 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
tests/php/Core/Startup/ErrorControlChainTest.php
View File

@ -2,10 +2,10 @@
namespace SilverStripe\Core\Tests\Startup; namespace SilverStripe\Core\Tests\Startup;
use Exception;
use Foo;
use SilverStripe\Core\Startup\ErrorControlChain; use SilverStripe\Core\Startup\ErrorControlChain;
use SilverStripe\Dev\SapphireTest; use SilverStripe\Dev\SapphireTest;
use Foo;
use Exception;
class ErrorControlChainTest extends SapphireTest class ErrorControlChainTest extends SapphireTest
{ {

110
tests/php/Core/Startup/ParameterConfirmationTokenTest.php
View File

@ -2,6 +2,8 @@
namespace SilverStripe\Core\Tests\Startup; namespace SilverStripe\Core\Tests\Startup;
use SilverStripe\Control\Controller;
use SilverStripe\Control\HTTPRequest;
use SilverStripe\Core\Startup\ParameterConfirmationToken; use SilverStripe\Core\Startup\ParameterConfirmationToken;
use SilverStripe\Core\Tests\Startup\ParameterConfirmationTokenTest\ParameterConfirmationTokenTest_Token; use SilverStripe\Core\Tests\Startup\ParameterConfirmationTokenTest\ParameterConfirmationTokenTest_Token;
use SilverStripe\Core\Tests\Startup\ParameterConfirmationTokenTest\ParameterConfirmationTokenTest_ValidToken; use SilverStripe\Core\Tests\Startup\ParameterConfirmationTokenTest\ParameterConfirmationTokenTest_ValidToken;
@ -9,56 +11,34 @@ use SilverStripe\Dev\SapphireTest;
class ParameterConfirmationTokenTest extends SapphireTest class ParameterConfirmationTokenTest extends SapphireTest
{ {
/**
private function addPart($answer, $slash, $part) * @var HTTPRequest
{ */
$bare = str_replace('/', '', $part); protected $request = null;
if ($bare) {
$answer = array_merge($answer, array($bare));
}
if ($part) {
$slash = (substr($part, -1) == '/') ? '/' : '';
}
return array($answer, $slash);
}
protected $oldHost = null;
protected function setUp() protected function setUp()
{ {
parent::setUp(); parent::setUp();
$this->oldHost = $_SERVER['HTTP_HOST']; $get = [];
$_GET['parameterconfirmationtokentest_notoken'] = 'value'; $get['parameterconfirmationtokentest_notoken'] = 'value';
$_GET['parameterconfirmationtokentest_empty'] = ''; $get['parameterconfirmationtokentest_empty'] = '';
$_GET['parameterconfirmationtokentest_withtoken'] = '1'; $get['parameterconfirmationtokentest_withtoken'] = '1';
$_GET['parameterconfirmationtokentest_withtokentoken'] = 'dummy'; $get['parameterconfirmationtokentest_withtokentoken'] = 'dummy';
$_GET['parameterconfirmationtokentest_nulltoken'] = '1'; $get['parameterconfirmationtokentest_nulltoken'] = '1';
$_GET['parameterconfirmationtokentest_nulltokentoken'] = null; $get['parameterconfirmationtokentest_nulltokentoken'] = null;
$_GET['parameterconfirmationtokentest_emptytoken'] = '1'; $get['parameterconfirmationtokentest_emptytoken'] = '1';
$_GET['parameterconfirmationtokentest_emptytokentoken'] = ''; $get['parameterconfirmationtokentest_emptytokentoken'] = '';
} $this->request = new HTTPRequest('GET', '/', $get);
protected function tearDown()
{
foreach ($_GET as $param => $value) {
if (stripos($param, 'parameterconfirmationtokentest_') === 0) {
unset($_GET[$param]);
}
}
$_SERVER['HTTP_HOST'] = $this->oldHost;
parent::tearDown();
} }
public function testParameterDetectsParameters() public function testParameterDetectsParameters()
{ {
$withoutToken = new ParameterConfirmationTokenTest_Token('parameterconfirmationtokentest_notoken'); $withoutToken = new ParameterConfirmationTokenTest_Token('parameterconfirmationtokentest_notoken', $this->request);
$emptyParameter = new ParameterConfirmationTokenTest_Token('parameterconfirmationtokentest_empty'); $emptyParameter = new ParameterConfirmationTokenTest_Token('parameterconfirmationtokentest_empty', $this->request);
$withToken = new ParameterConfirmationTokenTest_ValidToken('parameterconfirmationtokentest_withtoken'); $withToken = new ParameterConfirmationTokenTest_ValidToken('parameterconfirmationtokentest_withtoken', $this->request);
$withoutParameter = new ParameterConfirmationTokenTest_Token('parameterconfirmationtokentest_noparam'); $withoutParameter = new ParameterConfirmationTokenTest_Token('parameterconfirmationtokentest_noparam', $this->request);
$nullToken = new ParameterConfirmationTokenTest_Token('parameterconfirmationtokentest_nulltoken'); $nullToken = new ParameterConfirmationTokenTest_Token('parameterconfirmationtokentest_nulltoken', $this->request);
$emptyToken = new ParameterConfirmationTokenTest_Token('parameterconfirmationtokentest_emptytoken'); $emptyToken = new ParameterConfirmationTokenTest_Token('parameterconfirmationtokentest_emptytoken', $this->request);
// Check parameter // Check parameter
$this->assertTrue($withoutToken->parameterProvided()); $this->assertTrue($withoutToken->parameterProvided());
@ -85,27 +65,27 @@ class ParameterConfirmationTokenTest extends SapphireTest
$this->assertTrue($emptyToken->reloadRequired()); $this->assertTrue($emptyToken->reloadRequired());
// Check suppression // Check suppression
$this->assertTrue(isset($_GET['parameterconfirmationtokentest_notoken'])); $this->assertEquals('value', $this->request->getVar('parameterconfirmationtokentest_notoken'));
$withoutToken->suppress(); $withoutToken->suppress();
$this->assertFalse(isset($_GET['parameterconfirmationtokentest_notoken'])); $this->assertNull($this->request->getVar('parameterconfirmationtokentest_notoken'));
} }
public function testPrepareTokens() public function testPrepareTokens()
{ {
// Test priority ordering // Test priority ordering
$token = ParameterConfirmationToken::prepare_tokens( $token = ParameterConfirmationToken::prepare_tokens(
array( [
'parameterconfirmationtokentest_notoken', 'parameterconfirmationtokentest_notoken',
'parameterconfirmationtokentest_empty', 'parameterconfirmationtokentest_empty',
'parameterconfirmationtokentest_noparam' 'parameterconfirmationtokentest_noparam'
) ],
$this->request
); );
// Test no invalid tokens // Test no invalid tokens
$this->assertEquals('parameterconfirmationtokentest_empty', $token->getName()); $this->assertEquals('parameterconfirmationtokentest_empty', $token->getName());
$token = ParameterConfirmationToken::prepare_tokens( $token = ParameterConfirmationToken::prepare_tokens(
array( [ 'parameterconfirmationtokentest_noparam' ],
'parameterconfirmationtokentest_noparam' $this->request
)
); );
$this->assertEmpty($token); $this->assertEmpty($token);
} }
@ -118,25 +98,15 @@ class ParameterConfirmationTokenTest extends SapphireTest
*/ */
public function testCurrentAbsoluteURLHandlesSlashes() public function testCurrentAbsoluteURLHandlesSlashes()
{ {
global $url; $token = new ParameterConfirmationTokenTest_Token(
'parameterconfirmationtokentest_parameter',
$this->request
);
$token = new ParameterConfirmationTokenTest_Token('parameterconfirmationtokentest_parameter'); foreach (array('', '/', 'bar', 'bar/', '/bar', '/bar/') as $url) {
$this->request->setUrl($url);
foreach (array('foo','foo/') as $host) { $expected = rtrim(Controller::join_links(BASE_URL, '/', $url), '/') ?: '/';
list($hostAnswer, $hostSlash) = $this->addPart(array(), '', $host); $this->assertEquals($expected, $token->currentURL(), "Invalid redirect for request url $url");
foreach (array('', '/', 'bar', 'bar/', '/bar', '/bar/') as $base) {
list($baseAnswer, $baseSlash) = $this->addPart($hostAnswer, $hostSlash, $base);
foreach (array('', '/', 'baz', 'baz/', '/baz', '/baz/') as $url) {
list($urlAnswer, $urlSlash) = $this->addPart($baseAnswer, $baseSlash, $url);
$_SERVER['HTTP_HOST'] = $host;
ParameterConfirmationToken::$alternateBaseURL = $base;
$this->assertEquals('http://'.implode('/', $urlAnswer) . $urlSlash, $token->currentURL());
}
}
} }
} }
} }

2
tests/php/Core/Startup/ParameterConfirmationTokenTest/ParameterConfirmationTokenTest_ValidToken.php
View File

@ -2,8 +2,6 @@
namespace SilverStripe\Core\Tests\Startup\ParameterConfirmationTokenTest; namespace SilverStripe\Core\Tests\Startup\ParameterConfirmationTokenTest;
use SilverStripe\Core\Tests\Startup\ParameterConfirmationTokenTest\ParameterConfirmationTokenTest_Token;
/** /**
* A token that always validates a given token * A token that always validates a given token
*/ */