Fix failing unit tests.

joomla · Sep 9, 2012 · 175e5cc · 175e5cc
1 parent a374103
commit 175e5cc
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/libraries/cms/toolbar/button/slider.php b/libraries/cms/toolbar/button/slider.php
@@ -40,7 +40,7 @@ class JToolbarButtonSlider extends JToolbarButton
 	 *
 	 * @since   3.0
 	 */
-	public function fetchButton($type = 'Popup', $name = '', $text = '', $url = '', $width = 640, $height = 480, $onClose = '')
+	public function fetchButton($type = 'Slider', $name = '', $text = '', $url = '', $width = 640, $height = 480, $onClose = '')
 	{
 		JHtml::script('jui/cms.js', false, true);
 
@@ -71,7 +71,7 @@ public function fetchButton($type = 'Popup', $name = '', $text = '', $url = '',
 	 */
 	public function fetchId($type, $name)
 	{
-		return $this->_parent->getName() . '-' . "popup-$name";
+		return $this->_parent->getName() . '-' . 'slider-' . $name;
 	}
 
 	/**

diff --git a/tests/unit/suites/libraries/html/JHtmlBootstrapTest.php b/tests/unit/suites/libraries/html/JHtmlBootstrapTest.php
@@ -136,7 +136,7 @@ public function testEndAccordion()
 	{
 		$this->assertThat(
 			JHtml::_('bootstrap.endAccordion'),
-			$this->equalTo('</div></div>')
+			$this->equalTo('</div>')
 		);
 	}