diff --git a/cake/tests/cases/libs/controller/components/auth.test.php b/cake/tests/cases/libs/controller/components/auth.test.php
index 318524411..f0bcb37da 100644
--- a/cake/tests/cases/libs/controller/components/auth.test.php
+++ b/cake/tests/cases/libs/controller/components/auth.test.php
@@ -558,6 +558,7 @@ class AuthTest extends CakeTestCase {
$this->assertFalse($result);
}
+
/**
* testAuthorizeCrud method
*
@@ -619,6 +620,7 @@ class AuthTest extends CakeTestCase {
$this->Controller->Auth->startup($this->Controller);
$this->assertTrue($this->Controller->Session->check('Message.auth'));
}
+
/**
* testLoginRedirect method
*
@@ -658,16 +660,34 @@ class AuthTest extends CakeTestCase {
$this->Controller->Session->del('Auth');
+ //empty referer no session
+ $_SERVER['HTTP_REFERER'] = false;
+ $_ENV['HTTP_REFERER'] = false;
+ putenv('HTTP_REFERER=');
+ $url = '/posts/view/1';
+
+ $this->Controller->Session->write('Auth', array('AuthUser' => array('id'=>'1', 'username'=>'nate')));
+ $this->Controller->testUrl = null;
+ $this->Controller->params = Router::parse($url);
+ $this->Controller->Auth->initialize($this->Controller);
+ $this->Controller->Auth->authorize = 'controller';
+ $this->Controller->params['testControllerAuth'] = true;
+
+ $this->Controller->Auth->loginAction = array('controller' => 'AuthTest', 'action' => 'login');
+ $this->Controller->Auth->userModel = 'AuthUser';
+ $this->Controller->Auth->startup($this->Controller);
+ $expected = Router::normalize('/');
+ $this->assertEqual($expected, $this->Controller->testUrl);
+
+
+ $this->Controller->Session->del('Auth');
$_SERVER['HTTP_REFERER'] = '/admin/';
$this->Controller->Session->write('Auth', array('AuthUser' => array('id'=>'1', 'username'=>'nate')));
-
+
$this->Controller->params['url']['url'] = 'auth_test/login';
-
$this->Controller->Auth->initialize($this->Controller);
-
$this->Controller->Auth->loginAction = 'auth_test/login';
-
$this->Controller->Auth->userModel = 'AuthUser';
$this->Controller->Auth->loginRedirect = false;
$this->Controller->Auth->startup($this->Controller);
@@ -697,7 +717,6 @@ class AuthTest extends CakeTestCase {
$expected = Router::normalize('posts/view/1');
$this->assertEqual($expected, $this->Controller->Session->read('Auth.redirect'));
-
$_SERVER['HTTP_REFERER'] = $backup;
$this->Controller->Session->del('Auth');
}
@@ -720,9 +739,7 @@ class AuthTest extends CakeTestCase {
$this->Controller->data['AuthUser']['password'] = '';
$this->Controller->params['url']['url'] = 'auth_test/login';
-
$this->Controller->Auth->initialize($this->Controller);
-
$this->Controller->Auth->loginAction = 'auth_test/login';
$this->Controller->Auth->userModel = 'AuthUser';
@@ -782,22 +799,22 @@ class AuthTest extends CakeTestCase {
**/
function testHashPasswords() {
$this->Controller->Auth->userModel = 'AuthUser';
-
+
$data['AuthUser']['password'] = 'superSecret';
$data['AuthUser']['username'] = 'superman@dailyplanet.com';
$return = $this->Controller->Auth->hashPasswords($data);
$expected = $data;
$expected['AuthUser']['password'] = Security::hash($expected['AuthUser']['password'], null, true);
$this->assertEqual($return, $expected);
-
+
$data['Wrong']['password'] = 'superSecret';
$data['Wrong']['username'] = 'superman@dailyplanet.com';
$data['AuthUser']['password'] = 'IcantTellYou';
$return = $this->Controller->Auth->hashPasswords($data);
- $expected = $data;
+ $expected = $data;
$expected['AuthUser']['password'] = Security::hash($expected['AuthUser']['password'], null, true);
$this->assertEqual($return, $expected);
-
+
$xml = array(
'User' => array(
'username' => 'batman@batcave.com',
@@ -806,7 +823,7 @@ class AuthTest extends CakeTestCase {
);
$data = new Xml($xml);
$return = $this->Controller->Auth->hashPasswords($data);
- $expected = $data;
+ $expected = $data;
$this->assertEqual($return, $expected);
}
/**
@@ -845,9 +862,9 @@ class AuthTest extends CakeTestCase {
* @return void
*/
function testAdminRoute() {
- Router::reload();
$admin = Configure::read('Routing.admin');
Configure::write('Routing.admin', 'admin');
+ Router::reload();
$url = '/admin/something';
$this->Controller->params = Router::parse($url);
@@ -900,9 +917,9 @@ class AuthTest extends CakeTestCase {
* @return void
*/
function testLoginActionRedirect() {
- Router::reload();
$admin = Configure::read('Routing.admin');
Configure::write('Routing.admin', 'admin');
+ Router::reload();
$url = '/admin/auth_test/login';
$this->Controller->params = Router::parse($url);
diff --git a/cake/tests/cases/libs/controller/scaffold.test.php b/cake/tests/cases/libs/controller/scaffold.test.php
index 37e0ba63e..c160de356 100644
--- a/cake/tests/cases/libs/controller/scaffold.test.php
+++ b/cake/tests/cases/libs/controller/scaffold.test.php
@@ -29,22 +29,22 @@
App::import('Core', 'Scaffold');
/**
* ScaffoldMockController class
- *
+ *
* @package cake
* @subpackage cake.tests.cases.libs.controller
*/
class ScaffoldMockController extends Controller {
/**
* name property
- *
+ *
* @var string 'ScaffoldMock'
* @access public
*/
var $name = 'ScaffoldMock';
/**
* scaffold property
- *
- * @var mixed
+ *
+ * @var mixed
* @access public
*/
var $scaffold;
@@ -77,24 +77,24 @@ class TestScaffoldMock extends Scaffold {
/**
* ScaffoldMock class
- *
+ *
* @package cake
* @subpackage cake.tests.cases.libs.controller
*/
class ScaffoldMock extends CakeTestModel {
/**
* useTable property
- *
+ *
* @var string 'posts'
* @access public
*/
var $useTable = 'articles';
/**
* belongsTo property
- *
- * @var array
+ *
+ * @var array
* @access public
- */
+ */
var $belongsTo = array(
'User' => array(
'className' => 'ScaffoldUser',
@@ -103,8 +103,8 @@ class ScaffoldMock extends CakeTestModel {
);
/**
* hasMany property
- *
- * @var array
+ *
+ * @var array
* @access public
*/
var $hasMany = array(
@@ -117,22 +117,22 @@ class ScaffoldMock extends CakeTestModel {
/**
* ScaffoldAuthor class
- *
+ *
* @package cake
* @subpackage cake.tests.cases.libs.controller
*/
class ScaffoldUser extends CakeTestModel {
/**
* useTable property
- *
+ *
* @var string 'posts'
* @access public
*/
var $useTable = 'users';
/**
* hasMany property
- *
- * @var array
+ *
+ * @var array
* @access public
*/
var $hasMany = array(
@@ -145,22 +145,22 @@ class ScaffoldUser extends CakeTestModel {
/**
* ScaffoldComment class
- *
+ *
* @package cake
* @subpackage cake.tests.cases.libs.controller
*/
class ScaffoldComment extends CakeTestModel {
/**
* useTable property
- *
+ *
* @var string 'posts'
* @access public
*/
var $useTable = 'comments';
/**
* belongsTo property
- *
- * @var array
+ *
+ * @var array
* @access public
*/
var $belongsTo = array(
@@ -173,15 +173,15 @@ class ScaffoldComment extends CakeTestModel {
/**
* TestScaffoldView class
- *
+ *
* @package cake
* @subpackage cake.tests.cases.libs.controller
*/
class TestScaffoldView extends ScaffoldView {
/**
* testGetFilename method
- *
- * @param mixed $action
+ *
+ * @param mixed $action
* @access public
* @return void
*/
@@ -198,14 +198,14 @@ class TestScaffoldView extends ScaffoldView {
class ScaffoldViewTest extends CakeTestCase {
/**
* fixtures property
- *
+ *
* @var array
* @access public
*/
var $fixtures = array('core.article', 'core.user', 'core.comment');
/**
* setUp method
- *
+ *
* @access public
* @return void
*/
@@ -214,11 +214,14 @@ class ScaffoldViewTest extends CakeTestCase {
}
/**
* testGetViewFilename method
- *
+ *
* @access public
* @return void
*/
function testGetViewFilename() {
+ $_admin = Configure::read('Routing.admin');
+ Configure::write('Routing.admin', 'admin');
+
$this->Controller->action = 'index';
$ScaffoldView =& new TestScaffoldView($this->Controller);
$result = $ScaffoldView->testGetFilename('index');
@@ -272,7 +275,7 @@ class ScaffoldViewTest extends CakeTestCase {
$result = $ScaffoldView->testGetFilename('admin_edit');
$expected = TEST_CAKE_CORE_INCLUDE_PATH . 'tests' . DS . 'test_app' .DS . 'views' . DS . 'posts' . DS . 'scaffold.edit.ctp';
$this->assertEqual($result, $expected);
-
+
$result = $ScaffoldView->testGetFilename('edit');
$expected = TEST_CAKE_CORE_INCLUDE_PATH . 'tests' . DS . 'test_app' .DS . 'views' . DS . 'posts' . DS . 'scaffold.edit.ctp';
$this->assertEqual($result, $expected);
@@ -287,14 +290,15 @@ class ScaffoldViewTest extends CakeTestCase {
$expected = TEST_CAKE_CORE_INCLUDE_PATH . 'tests' . DS . 'test_app' . DS . 'plugins'
. DS .'test_plugin' . DS . 'views' . DS . 'tests' . DS . 'scaffold.edit.ctp';
$this->assertEqual($result, $expected);
-
+
$result = $ScaffoldView->testGetFilename('add');
$expected = TEST_CAKE_CORE_INCLUDE_PATH . 'tests' . DS . 'test_app' . DS . 'plugins'
. DS .'test_plugin' . DS . 'views' . DS . 'tests' . DS . 'scaffold.edit.ctp';
$this->assertEqual($result, $expected);
-
+
Configure::write('viewPaths', $_back['viewPaths']);
Configure::write('pluginPaths', $_back['pluginPaths']);
+ Configure::write('Routing.admin', $_admin);
}
/**
@@ -326,7 +330,7 @@ class ScaffoldViewTest extends CakeTestCase {
ob_start();
new Scaffold($this->Controller, $params);
$result = ob_get_clean();
-
+
$this->assertPattern('#ScaffoldMock
#', $result);
$this->assertPattern('#