Defered container initialization to fix the amOnPage method

Author: enumag

src/Codeception/Module/Nette.php

@@ -9,7 +9,6 @@
 use Nette\DI\Container;
 use Nette\DI\MissingServiceException;
 use Nette\Diagnostics\Debugger;
-use Nette\Environment;
 use Nette\InvalidStateException;
 use Nette\Loaders\RobotLoader;
 use Nette\Utils\Validators;
@@ -85,6 +84,10 @@ public function _beforeSuite($settings = array())
 			$this->robotLoader->addDirectory($dir);
 		}
 		$this->robotLoader->register();
+
+		// Generates and loads the container class.
+		// The actual container is created later.
+		$this->configurator->createContainer();
 	}
 
 	public function _afterSuite()
@@ -95,13 +98,7 @@ public function _afterSuite()
 	public function _before(TestCase $test)
 	{
 		$class = $this->getContainerClass();
-		if (!class_exists($class, FALSE)) {
-			$this->container = $this->configurator->createContainer();
-		} else {
-			$this->container = new $class;
-			$this->container->initialize();
-			Environment::setContext($this->container);
-		}
+		$this->container = new $class;
 		$this->client = new NetteConnector();
 		$this->client->setContainer($this->container);
 		parent::_before($test);

src/Codeception/Util/Connector/Nette.php

@@ -4,6 +4,7 @@
 
 use Nette\DI\Container;
 use Nette\Diagnostics\Debugger;
+use Nette\Environment;
 use Symfony\Component\BrowserKit\Client;
 use Symfony\Component\BrowserKit\Request;
 use Symfony\Component\BrowserKit\Response;
@@ -37,6 +38,9 @@ public function doRequest($request)
 		$_SERVER['REQUEST_METHOD'] = strtoupper($request->getMethod());
 		$_SERVER['REQUEST_URI'] = $uri;
 
+		$this->container->initialize();
+		Environment::setContext($this->container);
+
 		ob_start();
 		try {
 			$this->container->getByType('Nette\Application\Application')->run();