Browse Source

include some tests again

euromark 11 years ago
parent
commit
b16cc8bbe8

+ 1 - 1
Controller/Component/CommonComponent.php

@@ -558,7 +558,7 @@ class CommonComponent extends Component {
 		if (!$ref) {
 		if (!$ref) {
 			return false;
 			return false;
 		}
 		}
-		$base = Configure::read('App.fullBaseUrl') . $this->Controller->webroot;
+		$base = Configure::read('App.fullBaseUrl') . '/';
 		if (strpos($ref, $base) === 0) {
 		if (strpos($ref, $base) === 0) {
 			return false;
 			return false;
 		}
 		}

+ 2 - 7
Test/Case/Controller/Component/CommonComponentTest.php

@@ -1,6 +1,7 @@
 <?php
 <?php
 
 
 App::uses('CommonComponent', 'Tools.Controller/Component');
 App::uses('CommonComponent', 'Tools.Controller/Component');
+App::uses('Component', 'Controller');
 App::uses('CakeSession', 'Model/Datasource');
 App::uses('CakeSession', 'Model/Datasource');
 App::uses('Controller', 'Controller');
 App::uses('Controller', 'Controller');
 App::uses('AppModel', 'Model');
 App::uses('AppModel', 'Model');
@@ -115,8 +116,6 @@ class CommonComponentTest extends CakeTestCase {
 	 * @return void
 	 * @return void
 	 */
 	 */
 	public function testCurrentUrl() {
 	public function testCurrentUrl() {
-		$this->skipIf(php_sapi_name() === 'cli', 'Cannot test session in CLI');
-
 		$is = $this->Controller->Common->currentUrl();
 		$is = $this->Controller->Common->currentUrl();
 		$this->assertTrue(is_array($is) && !empty($is));
 		$this->assertTrue(is_array($is) && !empty($is));
 
 
@@ -130,13 +129,11 @@ class CommonComponentTest extends CakeTestCase {
 	 * @return void
 	 * @return void
 	 */
 	 */
 	public function testIsForeignReferer() {
 	public function testIsForeignReferer() {
-		$this->skipIf(php_sapi_name() === 'cli', 'Cannot test session in CLI');
-
 		$ref = 'http://www.spiegel.de';
 		$ref = 'http://www.spiegel.de';
 		$is = $this->Controller->Common->isForeignReferer($ref);
 		$is = $this->Controller->Common->isForeignReferer($ref);
 		$this->assertTrue($is);
 		$this->assertTrue($is);
 
 
-		$ref = HTTP_BASE . '/some/controller/action';
+		$ref = Configure::read('App.fullBaseUrl') . '/some/controller/action';
 		$is = $this->Controller->Common->isForeignReferer($ref);
 		$is = $this->Controller->Common->isForeignReferer($ref);
 		$this->assertFalse($is);
 		$this->assertFalse($is);
 
 
@@ -166,8 +163,6 @@ class CommonComponentTest extends CakeTestCase {
 	 * @return void
 	 * @return void
 	 */
 	 */
 	public function testFlashMessage() {
 	public function testFlashMessage() {
-		$this->skipIf(php_sapi_name() === 'cli', 'Cannot test session in CLI');
-
 		$this->Controller->Session->delete('messages');
 		$this->Controller->Session->delete('messages');
 		$is = $this->Controller->Common->flashMessage('efg');
 		$is = $this->Controller->Common->flashMessage('efg');
 
 

+ 0 - 2
Test/Case/Lib/AuthTest.php

@@ -12,8 +12,6 @@ class AuthTest extends MyCakeTestCase {
 		parent::setUp();
 		parent::setUp();
 
 
 		ClassRegistry::init(array('table' => 'cake_sessions', 'class' => 'Session', 'alias' => 'Session'));
 		ClassRegistry::init(array('table' => 'cake_sessions', 'class' => 'Session', 'alias' => 'Session'));
-
-		$this->skipIf(php_sapi_name() === 'cli', 'Cannot test session in CLI');
 	}
 	}
 
 
 	public function tearDown() {
 	public function tearDown() {

+ 0 - 2
Test/Case/Model/Behavior/SluggedBehaviorTest.php

@@ -103,8 +103,6 @@ class SluggedBehaviorTest extends CakeTestCase {
 	public function setUp() {
 	public function setUp() {
 		parent::setUp();
 		parent::setUp();
 
 
-		$this->skipIf(php_sapi_name() === 'cli', 'Might not work with this PCRE version in CLI - try webtest suite');
-
 		$this->Model = new MessageSlugged();
 		$this->Model = new MessageSlugged();
 
 
 		Configure::write('Config.language', 'eng');
 		Configure::write('Config.language', 'eng');