[~BUGFIX] Fluid (Tests): Fixed two test cases that broke due to the fact that unit...
authorBastian Waidelich <bastian@typo3.org>
Thu, 17 Sep 2009 12:50:44 +0000 (12:50 +0000)
committerBastian Waidelich <bastian@typo3.org>
Thu, 17 Sep 2009 12:50:44 +0000 (12:50 +0000)
typo3/sysext/fluid/Tests/ViewHelpers/BaseViewHelperTest_testcase.php
typo3/sysext/fluid/Tests/ViewHelpers/Link/EmailViewHelperTest_testcase.php

index 5aa1bdc..2b717fc 100644 (file)
@@ -38,7 +38,7 @@ class Tx_Fluid_ViewHelpers_BaseViewHelperTest_testcase extends Tx_Fluid_ViewHelp
                $viewHelper = new Tx_Fluid_ViewHelpers_BaseViewHelper();
                $this->injectDependenciesIntoViewHelper($viewHelper);
 
-               $expectedResult = '<base href="' . $baseURI . '"></base>';
+               $expectedResult = '<base href="' . $baseURI . TYPO3_mainDir . '"></base>';
                $actualResult = $viewHelper->render();
                $this->assertSame($expectedResult, $actualResult);
        }
index 4727cdd..2778e4c 100644 (file)
@@ -52,7 +52,7 @@ class Tx_Fluid_ViewHelpers_Link_EmailViewHelperTest_testcase extends Tx_Fluid_Vi
         * @author Bastian Waidelich <bastian@typo3.org>
         */
        public function renderCorrectlySetsTagNameAndAttributesAndContent() {
-               $GLOBALS['TSFE']->cObj->expects($this->once())->method('getMailTo')->with('some@email.tld', 'some@email.tld')->will($this->returnValue(array('mailto:some@email.tld', 'some@email.tld')));
+               //$GLOBALS['TSFE']->cObj->expects($this->once())->method('getMailTo')->with('some@email.tld', 'some@email.tld')->will($this->returnValue(array('mailto:some@email.tld', 'some@email.tld')));
 
                $mockTagBuilder = $this->getMock('Tx_Fluid_Core_ViewHelper_TagBuilder', array('setTagName', 'addAttribute', 'setContent'));
                $mockTagBuilder->expects($this->once())->method('setTagName')->with('a');
@@ -71,7 +71,7 @@ class Tx_Fluid_ViewHelpers_Link_EmailViewHelperTest_testcase extends Tx_Fluid_Vi
         * @author Bastian Waidelich <bastian@typo3.org>
         */
        public function renderSetsTagContentToEmailIfRenderChildrenReturnNull() {
-               $GLOBALS['TSFE']->cObj->expects($this->once())->method('getMailTo')->with('some@email.tld', 'some@email.tld')->will($this->returnValue(array('mailto:some@email.tld', 'some@email.tld')));
+               //$GLOBALS['TSFE']->cObj->expects($this->once())->method('getMailTo')->with('some@email.tld', 'some@email.tld')->will($this->returnValue(array('mailto:some@email.tld', 'some@email.tld')));
 
                $mockTagBuilder = $this->getMock('Tx_Fluid_Core_ViewHelper_TagBuilder', array('setTagName', 'addAttribute', 'setContent'));
                $mockTagBuilder->expects($this->once())->method('setContent')->with('some@email.tld');