updated version, updated docs

Codeception · Jun 29, 2016 · d58d554 · d58d554
1 parent 68518dc
commit d58d554
Show file tree

Hide file tree

Showing 4 changed files with 31 additions and 5 deletions.
diff --git a/composer.json b/composer.json
@@ -1,5 +1,5 @@
 {
-    "name":"codeception/codeception",
+    "name":"codeception/base",
     "description":"BDD-style testing framework",
     "keywords":["BDD", "acceptance testing", "functional testing", "unit testing", "tdd"],
     "homepage":"http://codeception.com/",
@@ -20,8 +20,7 @@
         "ext-mbstring": "*",
         "phpunit/phpunit": ">4.8.20 <5.5",
         "phpunit/php-code-coverage": ">=2.1.3",
-        "facebook/webdriver": ">=1.0.1 <2.0",
-        "guzzlehttp/guzzle": ">=4.1.4 <7.0",
+
         "guzzlehttp/psr7": "~1.0",
         "symfony/finder": ">=2.7 <4.0",
         "symfony/console": ">=2.7 <4.0",

diff --git a/docs/modules/Yii1.md b/docs/modules/Yii1.md
@@ -79,6 +79,14 @@ Do not forget that after adding module in your functional.suite.yml you must run
 
 ### Parts
 
+If you ever encounter error message:
+
+```
+Yii1 module conflicts with WebDriver
+```
+
+you should include Yii module partially, with `init` part only
+
 * `init`: only initializes module and not provides any actions from it. Can be used for unit/acceptance tests to avoid conflicts.
 
 ### Acceptance Testing Example:

diff --git a/docs/modules/ZF2.md b/docs/modules/ZF2.md
@@ -16,12 +16,30 @@ Uses `tests/application.config.php` config file by default.
 
 * config: relative path to config file (default: `tests/application.config.php`)
 
-## API
+## Public Properties
 
 * application -  instance of `\Zend\Mvc\ApplicationInterface`
 * db - instance of `\Zend\Db\Adapter\AdapterInterface`
 * client - BrowserKit client
 
+## Parts
+
+* services - allows to use grabServiceFromContainer with WebDriver or PhpBrowser modules.
+
+Usage example:
+
+```yaml
+class_name: AcceptanceTester
+modules:
+    enabled:
+        - ZF2:
+            part: services
+        - Doctrine2:
+            depends: ZF2
+        - WebDriver:
+            url: http://your-url.com
+            browser: phantomjs
+```
 
 
 ## Actions
@@ -600,6 +618,7 @@ $em = $I->grabServiceFromContainer('Doctrine\ORM\EntityManager');
 ```
 
  * `param` $service
+ * `[Part]` services
 
 
 ### grabTextFrom

diff --git a/src/Codeception/Codecept.php b/src/Codeception/Codecept.php
@@ -7,7 +7,7 @@
 
 class Codecept
 {
-    const VERSION = "2.2.1";
+    const VERSION = "2.2.2";
 
     /**
      * @var \Codeception\PHPUnit\Runner