Skip to content

Commit

Permalink
Update module manager tests for API change
Browse files Browse the repository at this point in the history
  • Loading branch information
EvanDotPro committed Nov 14, 2011
1 parent 6418a56 commit f3fa13e
Showing 1 changed file with 4 additions and 4 deletions.
8 changes: 4 additions & 4 deletions tests/Zend/Module/ManagerTest.php
Original file line number Diff line number Diff line change
Expand Up @@ -76,7 +76,7 @@ public function testCanLoadSomeModule()
$moduleManager->loadModules();
$loadedModules = $moduleManager->getLoadedModules();
$this->assertInstanceOf('SomeModule\Module', $loadedModules['SomeModule']);
$config = $moduleManager->getMergedConfig();
$config = $moduleManager->getConfigListener()->getMergedConfig();
$this->assertSame($config->some, 'thing');
}

Expand All @@ -87,7 +87,7 @@ public function testCanLoadMultipleModules()
$loadedModules = $moduleManager->getLoadedModules();
$this->assertInstanceOf('BarModule\Module', $loadedModules['BarModule']);
$this->assertInstanceOf('BazModule\Module', $loadedModules['BazModule']);
$config = $moduleManager->getMergedConfig();
$config = $moduleManager->getConfigListener()->getMergedConfig();
$this->assertSame('foo', $config->bar);
$this->assertSame('bar', $config->baz);
}
Expand All @@ -103,14 +103,14 @@ public function testCanCacheMergedConfig()

// build the cache
$moduleManager->loadModules();
$config = $moduleManager->getMergedConfig();
$config = $moduleManager->getConfigListener()->getMergedConfig();
$this->assertSame('foo', $config->bar);
$this->assertSame('bar', $config->baz);

// use the cache
$moduleManager = new Manager(array('BarModule', 'BazModule'), $options);
$moduleManager->loadModules();
$config = $moduleManager->getMergedConfig();
$config = $moduleManager->getConfigListener()->getMergedConfig();
$this->assertSame('foo', $config->bar);
$this->assertSame('bar', $config->baz);
}
Expand Down

0 comments on commit f3fa13e

Please sign in to comment.