Merge branch 'master' of github.com:Codeception/codeception.github.com

DavertMik · DavertMik · commit 871c8193222c · 2017-01-17T22:48:21.000+02:00
diff --git a/changelog.markdown b/changelog.markdown
@@ -7,6 +7,10 @@ title: Codeception Changelog
 
 # Changelog
 
+#### 2.2.8
+
+* **[Laravel5]** Added `seeNumRecords` and `grabNumRecords` methods. See [#3816](https://github.com/Codeception/Codeception/issues/3816). By **[dmoreno](https://github.com/dmoreno)**
+
 #### 2.2.7
 
 * **Config validation** with `codecept config:validate` command. Use it:
@@ -20,17 +24,18 @@ This should help you next time you get messed with YAML formatting.
 
 * Gherkin improvements:
   * multiple step definitions per method allowed (Fixes [#3670](https://github.com/Codeception/Codeception/issues/3670)).  
-  * regex validation for Gherkin steps; throws exception if invalid regex passed. Fixes [#3676](https://github.com/Codeception/Codeception/issues/3676)
-  * escaped strings can now be passed into placeholders. Fixes [#3676](https://github.com/Codeception/Codeception/issues/3676).
+  * regex validation for Gherkin steps; throws exception if invalid regex passed. Fixes [#3676](https://github.com/Codeception/Codeception/issues/3676)  
   * currency chars supported in placeholders:
-  
+
   $,€,£ and other signs can be used before or after a number inside Gherkin scenario. This char will be ignored inside a PHP variable, so you receive only number.
 
 ```gherkin
 When I have 100$ => $num === 100
 And I have $100 => $num === 100
 ```
 
+  * escaped strings can now be passed into placeholders. Fixes [#3676](https://github.com/Codeception/Codeception/issues/3676).
+
 * Codeception is tested with latest verision of HHVM
 * Extensions loader refactored:
   * Extensions can be **enabled for suite** in suite config.
diff --git a/docs/07-AdvancedUsage.md b/docs/07-AdvancedUsage.md
@@ -212,7 +212,7 @@ Data is defined via the `@example` annotation, using JSON or Doctrine-style nota
 
 <div class="alert alert-notice">
 If you use JSON notation please keep in mind that all string keys
-and values should be enclosed in doble quotes " according to JSON standard.
+and values should be enclosed in double quotes " according to JSON standard.
 </div>
 
 You can pass key-value data as an example and use it in tests as well:
@@ -254,6 +254,7 @@ These examples can be written using Doctrine-style annotation syntax as well:
 {% endhighlight %}
 
 You can also use the `@dataprovider` annotation for creating dynamic examples, using a protected method for providing example data:
+
 {% highlight php %}
 
 <?php
@@ -286,6 +287,7 @@ Alternatively, the `@dataprovider` can also be a public method starting with `_`
 
 {% highlight php %}
 
+<?php
    /**
     * @dataprovider _pageProvider
     */
@@ -693,28 +695,36 @@ Feature: Admin area
 ### Group Files
 
 Groups can be defined in global or suite configuration files.
-Tests for groups can be specified as an array or as a path to a file containing a list of groups:
+Tests for groups can be specified as an array of file names or directories containing them:
 
 {% highlight yaml %}
 
 groups:
   # add 2 tests to db group
   db: [tests/unit/PersistTest.php, tests/unit/DataTest.php]
-
-  # add list of tests to slow group
-  slow: tests/_data/slow
+  
+  # add all tests from a directory to api group
+  api: [tests/functional/api]
 
 {% endhighlight %}
 
-For instance, you can create a file with the list of the slowest tests, and run them inside their own group.
-Group file is a plain text file with test names on separate lines:
+A list of tests for the group can be passed from a Group file. It should be defined in plain text with test names on separate lines:
 
 {% highlight bash %}
 
 tests/unit/DbTest.php
 tests/unit/UserTest.php:create
 tests/unit/UserTest.php:update
 
+{% endhighlight %}
+A group file can be included by its relative filename:
+
+{% highlight yaml %}
+
+groups:
+  # requiring a group file
+  slow: tests/_data/slow.txt
+
 {% endhighlight %}
 
 You can create group files manually or generate them from third party applications.
@@ -729,7 +739,8 @@ groups:
 
 {% endhighlight %}
 
-This will load all found `p*` files in `tests/_data` as groups.
+This will load all found `p*` files in `tests/_data` as groups. Group names will be as follows p1,p2,...,pN.
+
 
 ## Conclusion
 
diff --git a/docs/12-ContinuousIntegration.md b/docs/12-ContinuousIntegration.md
@@ -132,13 +132,43 @@ Travis doesn't provide visualization for XML or HTML reports so you can't view r
 
 ## GitLab
 
-[Work In Progress]
+If a file {% highlight yaml %}
+.gitlab-ci.yml
+{% endhighlight %} exists in the root of the git repository, gitlab will run a pipeline each time you push to the gitlab server. The file configures the docker image that will be called. Below is a sample which loads a php7 docker image, clones your files, installs composer dependencies, runs the built-in php webserver and finally runs codeception:
+
+{% highlight yaml %}
+
+# Select image from https://hub.docker.com/_/php/
+image: php:7.0
+
+# Select what we should cache
+cache:
+  paths:
+  - vendor/
+
+before_script:
+# Install git and unzip (composer will need them)
+- apt-get update && apt-get install -qqy git unzip
+# Install composer
+- curl -sS https://getcomposer.org/installer | php -- --install-dir=/usr/local/bin --filename=composer
+# Install all project dependencies
+- composer install
+# Run webserver
+- php -S localhost:8085 --docroot public &>/dev/null&
+
+# Test
+test:
+  script:
+  - vendor/bin/codecept run
+
+{% endhighlight %}
 
 ## Conclusion
 
 It is tringly recommended to use Continuous Integration system in development. Codeception is easy to install and run in any CI systems. However, each of them has their differences you should take into account. You can use different repoters to provide output in format expected by CI system.
 
 
 
+
 * **Next Chapter: [ParallelExecution >](/docs/12-ParallelExecution)**
 * **Previous Chapter: [< Codecoverage](/docs/11-Codecoverage)**
diff --git a/docs/modules/WebDriver.md b/docs/modules/WebDriver.md
@@ -133,6 +133,7 @@ you should use a tunnel application provided by a service.
 * `capabilities` - Sets Selenium2 [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).
 * `http_proxy` - sets http proxy server url for testing a remote server.
 * `http_proxy_port` - sets http proxy server port
 * `debug_log_entries` - how many selenium entries to print with `debugWebDriverLogs` or on fail (15 by default).
