From 9d9d69d1942750623cf0fa6c76cea991768b5d21 Mon Sep 17 00:00:00 2001 From: phpnut Date: Thu, 15 May 2008 05:13:44 +0000 Subject: [PATCH] Fixing svn props on files. Renamed sessionHelper.ctp Fixed test case with proper layout name git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@6880 3807eeeb-6ff5-0310-8944-8be069107fe0 --- cake/console/libs/testsuite.php | 8 +++---- .../cases/libs/view/helpers/session.test.php | 22 +++++++++---------- cake/tests/fixtures/callback_fixture.php | 8 +++---- cake/tests/fixtures/data_test_fixture.php | 8 +++---- cake/tests/fixtures/flag_tree_fixture.php | 8 +++---- cake/tests/fixtures/join_thing_fixture.php | 8 +++---- .../tests/fixtures/something_else_fixture.php | 8 +++---- cake/tests/fixtures/something_fixture.php | 8 +++---- .../fixtures/the_paper_monkies_fixture.php | 8 +++---- .../fixtures/underscore_field_fixture.php | 6 ++--- cake/tests/fixtures/uuid_fixture.php | 8 +++---- cake/tests/lib/code_coverage_manager.php | 8 +++---- cake/tests/lib/xdebug.php | 8 +++---- .../{sessionHelper.ctp => session_helper.ctp} | 0 14 files changed, 58 insertions(+), 58 deletions(-) rename cake/tests/test_app/views/layouts/{sessionHelper.ctp => session_helper.ctp} (100%) diff --git a/cake/console/libs/testsuite.php b/cake/console/libs/testsuite.php index 953b7a8ea..3d028afbb 100644 --- a/cake/console/libs/testsuite.php +++ b/cake/console/libs/testsuite.php @@ -1,5 +1,5 @@ Session = new SessionHelper(); $this->Session->__start(); @@ -54,7 +54,7 @@ class SessionHelperTest extends CakeTestCase { 'message' => 'This is a calling' ), 'notification' => array( - 'layout' => 'sessionHelper', + 'layout' => 'session_helper', 'params' => array('title' => 'Notice!', 'name' => 'Alert!'), 'message' => 'This is a test of the emergency broadcasting system', ), @@ -69,10 +69,10 @@ class SessionHelperTest extends CakeTestCase { } function tearDown() { - $_SESSION = array(); + $_SESSION = array(); unset($this->Session); } - + function testRead() { $result = $this->Session->read('Deeply.nested.key'); $this->assertEqual($result, 'value'); @@ -80,7 +80,7 @@ class SessionHelperTest extends CakeTestCase { $result = $this->Session->read('test'); $this->assertEqual($result, 'info'); } - + function testCheck() { $this->assertTrue($this->Session->check('test')); @@ -90,26 +90,26 @@ class SessionHelperTest extends CakeTestCase { $this->assertFalse($this->Session->check('Nope')); } - + function testWrite() { $this->expectError(); $this->Session->write('NoWay', 'AccessDenied'); } - + function testFlash() { ob_start(); $this->Session->flash(); $result = ob_get_contents(); ob_clean(); - + $expected = '
This is a calling
'; - $this->assertEqual($result, $expected); + $this->assertEqual($result, $expected); $this->assertFalse($this->Session->check('Message.flash')); - + Configure::write('viewPaths', array(TEST_CAKE_CORE_INCLUDE_PATH . 'tests' . DS . 'test_app' . DS . 'views'. DS)); $controller = new Controller(); $this->Session->view = new View($controller); - + ob_start(); $this->Session->flash('notification'); $result = ob_get_contents(); diff --git a/cake/tests/fixtures/callback_fixture.php b/cake/tests/fixtures/callback_fixture.php index d62a3da5f..9310141d8 100644 --- a/cake/tests/fixtures/callback_fixture.php +++ b/cake/tests/fixtures/callback_fixture.php @@ -1,5 +1,5 @@ diff --git a/cake/tests/test_app/views/layouts/sessionHelper.ctp b/cake/tests/test_app/views/layouts/session_helper.ctp similarity index 100% rename from cake/tests/test_app/views/layouts/sessionHelper.ctp rename to cake/tests/test_app/views/layouts/session_helper.ctp