|
@@ -79,6 +79,8 @@ class Zend_Application_Resource_NavigationTest extends PHPUnit_Framework_TestCas
|
|
|
|
|
|
|
|
// Reset autoloader instance so it doesn't affect other tests
|
|
// Reset autoloader instance so it doesn't affect other tests
|
|
|
Zend_Loader_Autoloader::resetInstance();
|
|
Zend_Loader_Autoloader::resetInstance();
|
|
|
|
|
+
|
|
|
|
|
+ Zend_Navigation_Page::setDefaultPageType();
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
public function testInitializationInitializesNavigationObject()
|
|
public function testInitializationInitializesNavigationObject()
|
|
@@ -148,7 +150,7 @@ class Zend_Application_Resource_NavigationTest extends PHPUnit_Framework_TestCas
|
|
|
|
|
|
|
|
$this->assertEquals($view->setInMethodByTest,true);
|
|
$this->assertEquals($view->setInMethodByTest,true);
|
|
|
}
|
|
}
|
|
|
-
|
|
|
|
|
|
|
+
|
|
|
/**
|
|
/**
|
|
|
* @group ZF-10959
|
|
* @group ZF-10959
|
|
|
*/
|
|
*/
|
|
@@ -164,14 +166,14 @@ class Zend_Application_Resource_NavigationTest extends PHPUnit_Framework_TestCas
|
|
|
|
|
|
|
|
$results = array();
|
|
$results = array();
|
|
|
$resource = new Zend_Application_Resource_Navigation($options);
|
|
$resource = new Zend_Application_Resource_Navigation($options);
|
|
|
-
|
|
|
|
|
|
|
+
|
|
|
try {
|
|
try {
|
|
|
$resource->setBootstrap($this->bootstrap)->init();
|
|
$resource->setBootstrap($this->bootstrap)->init();
|
|
|
$this->fail('An exception should have been thrown but wasn\'t');
|
|
$this->fail('An exception should have been thrown but wasn\'t');
|
|
|
} catch(Zend_Exception $e) {
|
|
} catch(Zend_Exception $e) {
|
|
|
$this->assertTrue(true);
|
|
$this->assertTrue(true);
|
|
|
}
|
|
}
|
|
|
-
|
|
|
|
|
|
|
+
|
|
|
$this->bootstrap->unregisterPluginResource('view');
|
|
$this->bootstrap->unregisterPluginResource('view');
|
|
|
}
|
|
}
|
|
|
|
|
|