Codeception
diff --git a/‎docs/03-AcceptanceTests.md
Lines changed: 12 additions & 32 deletions b/‎docs/03-AcceptanceTests.md
Lines changed: 12 additions & 32 deletions
diff --git a/‎src/Codeception/Module/WebDriver.php
Lines changed: 18 additions & 9 deletions b/‎src/Codeception/Module/WebDriver.php
Lines changed: 18 additions & 9 deletions
@@ -313,11 +313,12 @@ $user_id = $I->grabFromCurrentUrl('~$/user/(\d+)/~');
 
 ## Selenium WebDriver
 
-A nice feature of Codeception is that most scenarios can be easily ported between the testing backends.
-The PhpBrowser tests we wrote previously can be executed inside a real browser (or PhantomJS) with Selenium WebDriver.
+A nice feature of Codeception is that most scenarios are similar no matter of how they are executed.
+PhpBrowser was emulating browser requests but how to execute such test in a real browser like Chrome or Firefox? 
+Selenium WebDriver can drive them so in our acceptance tests we can automate scenarios we used to test manually.
+Such tests we should concentrate more on **testing the UI** than on testing functionality.
 
-The only thing we need to change is to reconfigure and rebuild the AcceptanceTester class,
-and to use **WebDriver** instead of PhpBrowser.
+To execute test in a browser we need to change suite configuration to use **WebDriver** instead of PhpBrowser.
 
 Modify your `acceptance.suite.yml` file:
 
@@ -327,24 +328,24 @@ modules:
     enabled:
         - WebDriver:
             url: {{your site URL}}
-            browser: firefox
+            browser: chrome
         - \Helper\Acceptance
 ```
 
-In order to run Selenium tests you need to [download Selenium Server](http://seleniumhq.org/download/)
-and get it running. Alternatively you may use [PhantomJS](http://phantomjs.org/) headless browser in `ghostdriver` mode.
+In order to run browser tests you will need Selenium Server or PhantomJS. 
+WebDriver module contains a manual on [how to start them](http://codeception.com/docs/modules/WebDriver#Local-Testing).
 
-If you run your acceptance tests with Selenium, Firefox will be started
-and all the actions will be performed step by step using the browser engine.
-
-In this case `seeElement` won't just check that the element exists on a page,
+Please note that actions executed in a browser will behave differently. For instance, `seeElement` won't just check that the element exists on a page,
 but it will also check that element is actually visible to the user:
 
 ```php
 <?php
 $I->seeElement('#modal');
 ```
 
+While WebDriver duplicate the functionality of PhpBrowser it has its limitations: it can't check headers, perform HTTP requests, as browsers don't provide APIs for that. 
+WebDriver also adds browser-specific functionality which will be listed in next sections.
+
 #### Wait
 
 While testing web application, you may need to wait for JavaScript events to occur. Due to its asynchronous nature,
@@ -472,27 +473,6 @@ before the previous actions are completed and uses the AngularJS API to check th
 
 The AngularJS module extends WebDriver so that all the configuration options from it are available.
 
-### Cleaning Things Up
-
-While testing, your actions may change the data on the site. Tests will fail if trying to create
-or update the same data twice. To avoid this problem, your database should be repopulated for each test.
-Codeception provides a `Db` module for that purpose. It will load a database dump after each passed test.
-To make repopulation work, create an SQL dump of your database and put it into the `tests/_data` directory.
-Set the database connection and path to the dump in the global Codeception config.
-
-```yaml
-# in codeception.yml:
-modules:
-    config:
-        Db:
-            dsn: '[set PDO DSN here]'
-            user: '[set user]'
-            password: '[set password]'
-            dump: tests/_data/dump.sql
-```
-
-After we have configured the Db module, we should have it enabled in the `acceptance.suite.yml` configuration file.
-
 ### Debugging
 
 Codeception modules can print valuable information while running.
 
@@ -56,16 +56,19 @@
  *
  * ### Selenium
  *
+ * To run Selenium Server you will need Java and Chrome or Firefox browser installed.
+ *
  * 1. Download [Selenium Server](http://docs.seleniumhq.org/download/)
- * 2. Launch the daemon: `java -jar selenium-server-standalone-2.xx.xxx.jar`
- * 3. Configure this module (in acceptance.suite.yml) by setting url and browser:
+ * 2. For Chrome browser install [ChromeDriver](https://sites.google.com/a/chromium.org/chromedriver/getting-started), for Firefox browser install [GeckoDriver](https://github.com/mozilla/geckodriver).
+ * 3. Launch the server: `java -jar selenium-server-standalone-3.xx.xxx.jar`. To locate Chromedriver binary use `-Dwebdriver.chrome.driver=./chromedriver` option. For Geckodriver use `-Dwebdriver.gecko.driver=`.
+ * 4. Configure this module (in acceptance.suite.yml) by setting url and browser:
  *
  * ```yaml
  *     modules:
  *        enabled:
  *           - WebDriver:
  *              url: 'http://localhost/'
- *              browser: firefox
+ *              browser: chrome
  * ```
  *
  * ### PhantomJS
@@ -86,6 +89,17 @@
  *              browser: phantomjs
  * ```
  *
+ * #### Headless Selenium in Docker
+ *
+ * Docker can ship Selenium Server with all its dependencies and browsers inside a single container.
+ * Running tests inside Docker is as easy as pulling [official selenium image](https://github.com/SeleniumHQ/docker-selenium) and starting a container with Chrome:
+ *
+ * ```
+ * docker run --net=host selenium/standalone-chrome
+ * ```
+ *
+ * By using `--net=host` we allow selenium to access local websites.
+ *
  * ## Cloud Testing
  *
  * Cloud Testing services can run your WebDriver tests in the cloud.
@@ -160,7 +174,7 @@
  * * `window_size` - Initial window size. Set to `maximize` or a dimension in the format `640x480`.
  * * `clear_cookies` - Set to false to keep cookies, or set to true (default) to delete all cookies between tests.
  * * `wait` - Implicit wait (default 0 seconds).
- * * `capabilities` - Sets Selenium2 [desired capabilities](https://github.com/SeleniumHQ/selenium/wiki/DesiredCapabilities). Should be a key-value array.
+ * * `capabilities` - Sets Selenium [desired capabilities](https://github.com/SeleniumHQ/selenium/wiki/DesiredCapabilities). Should be a key-value array.
  * * `connection_timeout` - timeout for opening a connection to remote selenium server (30 seconds by default).
  * * `request_timeout` - timeout for a request to return something from remote selenium server (30 seconds by default).
  * * `pageload_timeout` - amount of time to wait for a page load to complete before throwing an error (default 0 seconds).
@@ -183,11 +197,6 @@
  *                  firefox_profile: '~/firefox-profiles/codeception-profile.zip.b64'
  * ```
  *
- * ### Status
- *
- * Stability: **stable**
- * Based on [facebook php-webdriver](https://github.com/facebook/php-webdriver)
- *
  * ## Usage
  *
  * ### Locating Elements