From eb9877030496925740458b25cc50080f1eced681 Mon Sep 17 00:00:00 2001 From: euromark Date: Fri, 4 Oct 2013 00:35:56 +0200 Subject: [PATCH] Remove leftover of pageTitle. --- .../Test/Case/Controller/ControllerTest.php | 1 - .../Test/Case/View/Helper/RssHelperTest.php | 27 ++----------------- lib/Cake/Test/Case/View/ViewTest.php | 13 --------- lib/Cake/View/Helper/RssHelper.php | 6 ++--- 4 files changed, 5 insertions(+), 42 deletions(-) diff --git a/lib/Cake/Test/Case/Controller/ControllerTest.php b/lib/Cake/Test/Case/Controller/ControllerTest.php index 071a1f85e..8b52f417e 100644 --- a/lib/Cake/Test/Case/Controller/ControllerTest.php +++ b/lib/Cake/Test/Case/Controller/ControllerTest.php @@ -605,7 +605,6 @@ class ControllerTest extends CakeTestCase { $Controller->set('title', 'someTitle'); $this->assertSame($Controller->viewVars['title'], 'someTitle'); - $this->assertTrue(empty($Controller->pageTitle)); $Controller->viewVars = array(); $expected = array('ModelName' => 'name', 'ModelName2' => 'name2'); diff --git a/lib/Cake/Test/Case/View/Helper/RssHelperTest.php b/lib/Cake/Test/Case/View/Helper/RssHelperTest.php index 4f1e142a5..0abd24499 100644 --- a/lib/Cake/Test/Case/View/Helper/RssHelperTest.php +++ b/lib/Cake/Test/Case/View/Helper/RssHelperTest.php @@ -93,7 +93,7 @@ class RssHelperTest extends CakeTestCase { */ public function testChannel() { $attrib = array('a' => '1', 'b' => '2'); - $elements = array('title' => 'title'); + $elements = array('title' => 'Title'); $content = 'content'; $result = $this->Rss->channel($attrib, $elements, $content); @@ -103,30 +103,7 @@ class RssHelperTest extends CakeTestCase { 'b' => '2' ), 'Rss->url('/', true), - '/link', - 'assertTags($result, $expected); - - $this->View->pageTitle = 'title'; - $attrib = array('a' => '1', 'b' => '2'); - $elements = array(); - $content = 'content'; - - $result = $this->Rss->channel($attrib, $elements, $content); - $expected = array( - 'channel' => array( - 'a' => '1', - 'b' => '2' - ), - 'Rss->url('/', true), diff --git a/lib/Cake/Test/Case/View/ViewTest.php b/lib/Cake/Test/Case/View/ViewTest.php index e068964b6..a7189cf9b 100644 --- a/lib/Cake/Test/Case/View/ViewTest.php +++ b/lib/Cake/Test/Case/View/ViewTest.php @@ -1610,19 +1610,6 @@ TEXT; $this->assertEquals($expected, $result); } -/** - * Test that setting arbitrary properties still works. - * - * @return void - */ - public function testPropertySetting() { - $this->assertFalse(isset($this->View->pageTitle)); - $this->View->pageTitle = 'test'; - $this->assertTrue(isset($this->View->pageTitle)); - $this->assertTrue(!empty($this->View->pageTitle)); - $this->assertEquals('test', $this->View->pageTitle); - } - /** * Test that setting arbitrary properties still works. * diff --git a/lib/Cake/View/Helper/RssHelper.php b/lib/Cake/View/Helper/RssHelper.php index ac0592442..348b9ace5 100644 --- a/lib/Cake/View/Helper/RssHelper.php +++ b/lib/Cake/View/Helper/RssHelper.php @@ -123,12 +123,12 @@ class RssHelper extends AppHelper { * @link http://book.cakephp.org/2.0/en/core-libraries/helpers/rss.html#RssHelper::channel */ public function channel($attrib = array(), $elements = array(), $content = null) { - if (!isset($elements['title']) && !empty($this->_View->pageTitle)) { - $elements['title'] = $this->_View->pageTitle; - } if (!isset($elements['link'])) { $elements['link'] = '/'; } + if (!isset($elements['title'])) { + $elements['title'] = ''; + } if (!isset($elements['description'])) { $elements['description'] = ''; }