Zend\View\Helper\Navigation - fix Windows newline issues

abutme · Jul 5, 2012 · fc2e11e · fc2e11e
1 parent 0162748
commit fc2e11e
Show file tree

Hide file tree

Showing 4 changed files with 31 additions and 1 deletion.
diff --git a/tests/Zend/View/Helper/Navigation/AbstractTest.php b/tests/Zend/View/Helper/Navigation/AbstractTest.php
@@ -153,7 +153,7 @@ protected function setUp()
     }
 
     /**
-     * Returns the contens of the exepcted $file
+     * Returns the contens of the expected $file
      * @param  string $file
      * @return string
      */

diff --git a/tests/Zend/View/Helper/Navigation/LinksTest.php b/tests/Zend/View/Helper/Navigation/LinksTest.php
@@ -729,4 +729,14 @@ public function testSetMinDepth()
 
         $this->assertEquals($expected, $actual);
     }
+
+    /**
+     * Returns the contens of the expected $file, normalizes newlines
+     * @param  string $file
+     * @return string
+     */
+    protected function _getExpected($file)
+    {
+        return str_replace("\n", PHP_EOL, parent::_getExpected($file));
+    }
 }
diff --git a/tests/Zend/View/Helper/Navigation/MenuTest.php b/tests/Zend/View/Helper/Navigation/MenuTest.php
@@ -496,4 +496,14 @@ public function testOptionOnlyActiveBranchNoParentsAndBothDepthsSpecified()
 
         $this->assertEquals($expected, $actual);
     }
+
+    /**
+     * Returns the contens of the expected $file, normalizes newlines
+     * @param  string $file
+     * @return string
+     */
+    protected function _getExpected($file)
+    {
+        return str_replace("\n", PHP_EOL, parent::_getExpected($file));
+    }
 }
diff --git a/tests/Zend/View/Helper/Navigation/NavigationTest.php b/tests/Zend/View/Helper/Navigation/NavigationTest.php
@@ -420,4 +420,14 @@ public function testRenderInvisibleItem()
 
         $this->assertTrue(strpos($render, 'p2') !== false);
     }
+
+    /**
+     * Returns the contens of the expected $file, normalizes newlines
+     * @param  string $file
+     * @return string
+     */
+    protected function _getExpected($file)
+    {
+        return str_replace("\n", PHP_EOL, parent::_getExpected($file));
+    }
 }