From 3c8ceebe27255b753764ba959c84b3d8a22a69e7 Mon Sep 17 00:00:00 2001
From: David Grudl <david@grudl.com>
Date: Tue, 13 May 2014 02:54:51 +0200
Subject: [PATCH] updated test support files

---
 composer.json       |  2 +-
 tests/bootstrap.php | 18 ++++++++++--------
 2 files changed, 11 insertions(+), 9 deletions(-)

diff --git a/composer.json b/composer.json
index 618d33c7..61ed5b6d 100644
--- a/composer.json
+++ b/composer.json
@@ -14,7 +14,7 @@
 		"php": ">=5.2.0"
 	},
 	"require-dev": {
-		"nette/tester": "@dev"
+		"nette/tester": "~1.1"
 	},
 	"replace": {
 		"dg/dibi": "self.version"
diff --git a/tests/bootstrap.php b/tests/bootstrap.php
index 4e291c2b..e774838d 100644
--- a/tests/bootstrap.php
+++ b/tests/bootstrap.php
@@ -1,18 +1,20 @@
 <?php
 
-/**
- * Test initialization and helpers.
- *
- * @author     David Grudl
- * @package    Nette\Test
- */
+// The Nette Tester command-line runner can be
+// invoked through the command: ../../vendor/bin/tester .
 
-require dirname(__FILE__) . '/../vendor/nette/tester/Tester/bootstrap.php';
-require dirname(__FILE__) . '/../dibi/dibi.php';
+if (@!include __DIR__ . '/../vendor/autoload.php') {
+	echo 'Install Nette Tester using `composer update --dev`';
+	exit(1);
+}
 
+
+// configure environment
+Tester\Environment::setup();
 date_default_timezone_set('Europe/Prague');
 class_alias('Tester\Assert', 'Assert');
 
+
 // load connections
 define('DIR', dirname(__FILE__));
 $config = parse_ini_file(dirname(__FILE__) . '/config.ini', TRUE);