joshtronic/pickles
1
0
Fork 0
Code Issues 8 Pull requests Projects Releases Packages Wiki Activity Actions

More tests

Browse source 
Also, found that damn newline that was being output.
This commit is contained in:
Joshua Sherman 2013-12-30 17:13:22 -05:00
parent 64dc006b5f
commit c0dbb39bda
5 changed files with 76 additions and 45 deletions
Download patch file Download diff file Expand all files Collapse all files

8
classes/Browser.php
View file

@ -134,8 +134,16 @@ class Browser extends Object
}
header('Location: ' . $destination);
if (defined('UNIT_TESTING'))
{
throw new Exception();
}
else
{
exit;
}
}
/**
* Remote IP

2
classes/Controller.php
View file

@ -201,7 +201,7 @@ class Controller extends Object
if ($_SERVER['REQUEST_METHOD'] == 'POST')
{
// @todo Perhaps I could force a logout / redirect to the login page
exit('{"status": "error", "message": "You are not properly authenticated, try logging out and back in."}');
throw new Exception('{"status": "error", "message": "You are not properly authenticated, try logging out and back in."}');
}
else
{

1
classes/String.php
View file

@ -264,4 +264,3 @@ class String
}
?>

23
tests/bootstrap.php
View file

@ -8,9 +8,32 @@ $root = org\bovigo\vfs\vfsStream::setup('site');
if (!defined('SITE_PATH'))
{
define('SECURITY_LEVEL_USER', 10);
define('SITE_PATH', org\bovigo\vfs\vfsStream::url('site/'));
// This isn't ideal but it helps a ton when testing the Browser class.
define('UNIT_TESTING', true);
}
require_once 'pickles.php';
if (!file_exists(SITE_MODULE_PATH))
{
mkdir(SITE_MODULE_PATH, 0644);
}
if (!file_exists(SITE_TEMPLATE_PATH))
{
mkdir(SITE_TEMPLATE_PATH, 0644);
}
$_SERVER['HTTP_HOST'] = 'testsite.com';
$_SERVER['SERVER_NAME'] = 'Test Server';
function setUpRequest($request, $method = 'GET')
{
$_SERVER['REQUEST_URI'] = '/' . $request;
$_SERVER['REQUEST_METHOD'] = $method;
$_REQUEST['request'] = $request;
}
?>

79
tests/classes/ControllerTest.php
View file

@ -9,18 +9,9 @@ class ControllerTest extends PHPUnit_Framework_TestCase
$this->config = Config::getInstance();
$this->config->data['pickles']['disabled'] = false;
$this->config->data['pickles']['profiler'] = false;
$_SERVER['REQUEST_URI'] = '';
$this->config->data['security']['levels'][10] = 'USER';
if (!file_exists(SITE_MODULE_PATH))
{
mkdir(SITE_MODULE_PATH, 0644);
}
unlink(SITE_MODULE_PATH . 'testing.php');
$_SERVER['HTTP_HOST'] = 'testsite.com';
$_SERVER['REQUEST_URI'] = '/home';
$_REQUEST['request'] = 'home';
setUpRequest('home');
$module = '<?php class home extends Module { } ?>';
@ -29,8 +20,6 @@ class ControllerTest extends PHPUnit_Framework_TestCase
public function testSiteDown()
{
$_SERVER['SERVER_NAME'] = 'Test Server';
$this->config->data['pickles']['disabled'] = true;
$this->expectOutputRegex('/Test Server is currently down for maintenance/');
@ -53,28 +42,18 @@ class ControllerTest extends PHPUnit_Framework_TestCase
public function testUpperCaseURI()
{
$_SERVER['REQUEST_URI'] = '/TESTING';
$_REQUEST['request'] = 'TESTING';
setUpRequest('TESTING');
new Controller();
$this->assertTrue(in_array('Location: /testing', xdebug_get_headers()));
}
/*
public function testForceSecure()
{
$_SERVER['REQUEST_URI'] = '/secure';
$_REQUEST['request'] = 'secure';
setUpRequest('secure');
$module = '
<?php
class secure extends Module
{
public $secure = true;
}
?>
';
$module = '<?php class secure extends Module { public $secure = true; } ?>';
file_put_contents(SITE_MODULE_PATH . 'secure.php', $module);
@ -85,18 +64,10 @@ class ControllerTest extends PHPUnit_Framework_TestCase
public function testForceInsecure()
{
setUpRequest('insecure');
$_SERVER['HTTPS'] = 'on';
$_SERVER['REQUEST_URI'] = '/insecure';
$_REQUEST['request'] = 'insecure';
$module = '
<?php
class insecure extends Module
{
public $secure = false;
}
?>
';
$module = '<?php class insecure extends Module { public $secure = false; } ?>';
file_put_contents(SITE_MODULE_PATH . 'insecure.php', $module);
@ -107,19 +78,49 @@ class ControllerTest extends PHPUnit_Framework_TestCase
public function testNotAuthenticated()
{
$this->fail();
setUpRequest('notauth');
$module = '<?php class notauth extends Module { public $security = SECURITY_LEVEL_USER; } ?>';
file_put_contents(SITE_MODULE_PATH . 'notauth.php', $module);
new Controller();
$this->assertTrue(in_array('Location: http://testsite.com/login', xdebug_get_headers()));
}
public function testNotAuthenticatedPOST()
{
$this->fail();
setUpRequest('notauthpost', 'POST');
$module = '<?php class notauthpost extends Module { public $security = SECURITY_LEVEL_USER; } ?>';
file_put_contents(SITE_MODULE_PATH . 'notauthpost.php', $module);
new Controller();
$this->expectOutputRegex('/You are not properly authenticated/');
}
public function testAuthenticated()
{
$this->fail();
setUpRequest('auth');
$module = '<?php class auth extends Module { '
. 'public $security = SECURITY_LEVEL_USER;'
. 'public function __default() { return ["foo" => "bar"]; }'
. '} ?>';
file_put_contents(SITE_MODULE_PATH . 'auth.php', $module);
session_start();
Security::login(1, 10, 'USER');
new Controller();
$this->expectOutputString('{"foo":"bar"}');
}
/*
public function testHasLevelAccess()
{
$this->fail();