merged with 2.0

Author: DavertMik

.travis.yml

@@ -27,38 +27,44 @@ install:
   - wget http://selenium-release.storage.googleapis.com/2.42/selenium-server-standalone-2.42.2.jar
   - composer global require "fxp/composer-asset-plugin:1.0.0"
   - composer self-update
-  - composer install
+  - composer install --prefer-dist
+  - ulimit -c unlimited || true
   # Queue (Beanstalkd)
   - sudo apt-get update -qq
   - sudo apt-get install -qq beanstalkd
   # Yii2
   - composer create-project yiisoft/yii2-app-basic frameworks-yii-basic
   # Phalcon
-  - 'git clone -q --depth=1 https://github.com/phalcon/cphalcon.git -b 1.2.4'
-  - '[[ "$TRAVIS_PHP_VERSION" == "hhvm" ]] || [[ "$TRAVIS_PHP_VERSION" == "5.6" ]] || (cd cphalcon/ext; export CFLAGS="-g3 -O1 -fno-delete-null-pointer-checks -Wall"; phpize &> /dev/null && ./configure --enable-phalcon  &> /dev/null && make -j4 && sudo make install && phpenv config-add ../unit-tests/ci/phalcon.ini &> /dev/null && cd ../..;)'
+  - 'git clone -q --depth=1 https://github.com/phalcon/cphalcon.git -b 1.3.5'
+  - '[[ "$TRAVIS_PHP_VERSION" == "hhvm" ]] || (cd cphalcon/ext; export CFLAGS="-g3 -O1 -std=gnu90 -Wall -Werror -Wno-error=uninitialized"; phpize &> /dev/null && ./configure --silent --enable-phalcon  &> /dev/null && make --silent -j4 > /dev/null && sudo make --silent install && phpenv config-add ../unit-tests/ci/phalcon.ini &> /dev/null && cd ../..;)'
   - 'git clone -q --depth=1 https://github.com/DavertMik/forum.git frameworks-phalcon'
   # Laravel 4
   - git clone -q https://github.com/Codeception/sample-l4-app.git frameworks-laravel
-  - composer install -d frameworks-laravel --no-dev
+  - composer install -d frameworks-laravel --no-dev  --prefer-dist
   # Laravel 5
   - git clone -q https://github.com/janhenkgerritsen/codeception-laravel5-sample.git frameworks-l5
-  - composer install -d frameworks-l5 --no-dev
+  - composer install -d frameworks-l5 --no-dev  --prefer-dist
   # Symfony
-  - git clone https://github.com/DavertMik/SymfonyCodeceptionApp.git frameworks-symfony
-  - composer install -d frameworks-symfony --no-dev
-
+  - git clone -q https://github.com/DavertMik/SymfonyCodeceptionApp.git frameworks-symfony
+  - composer install -d frameworks-symfony --no-dev  --prefer-dist
+  # ZF1
+  - git clone -q --recursive https://github.com/Naktibalda/codeception-zf1-tests frameworks-zf1
+  - composer install -d frameworks-zf1 --no-dev  --prefer-dist
+  # ZF2
+  - git clone -q --recursive https://github.com/Naktibalda/codeception-zf2-tests frameworks-zf2
+  - composer install -d frameworks-zf2 --no-dev  --prefer-dist
 
 before_script:
   - beanstalkd -d -l 127.0.0.1 -p 11300
   - export DISPLAY=:99.0
   - sh -e /etc/init.d/xvfb start
   - echo "extension = mongo.so" >> ~/.phpenv/versions/$(phpenv version-name)/etc/php.ini
   - java -jar selenium-server-standalone-2.42.2.jar -port 4444 & > /dev/null
+  - sleep 5  
   - "mysql -e 'create database codeception_test;'"
   - psql -c 'create database codeception_test;' -U postgres
-  - sleep 5
-  - php -S localhost:8000 -t tests/data/app &
-  - php -S localhost:8010 -t tests/data &
+  - php -S localhost:8000 -t tests/data/app  > /dev/null &
+  - php -S localhost:8010 -t tests/data  > /dev/null &
   # Phalcon
   - "mysql -e 'CREATE DATABASE forum;'"
   - cat frameworks-phalcon/schemas/forum.sql | mysql forum
@@ -73,6 +79,11 @@ before_script:
   - frameworks-symfony/app/console doctrine:schema:create
   - php codecept build -c frameworks-yii-basic/tests
   - php codecept build -c frameworks-phalcon
+  - php codecept build -c frameworks-laravel
+  - php codecept build -c frameworks-symfony
+  - php codecept build -c frameworks-l5
+  - php codecept build -c frameworks-zf1
+  - php codecept build -c frameworks-zf2
   #- php codecept build -c frameworks-laravel
   #- php codecept build -c frameworks-symfony
   #- php codecept build -c frameworks-l5
@@ -84,3 +95,9 @@ script:
   #- php codecept run -c frameworks-l5 # Laravel5 Tests
   - '[[ "$TRAVIS_PHP_VERSION" == "hhvm" ]] || [[ "$TRAVIS_PHP_VERSION" == "5.6" ]] || php codecept run functional -c frameworks-phalcon'
   #- php codecept run functional -c frameworks-symfony # Symfony Tests
+  - php codecept run -c frameworks-laravel functional,api,unit # Laravel4 Tests
+  - php codecept run -c frameworks-l5 # Laravel5 Tests
+  - '[[ "$TRAVIS_PHP_VERSION" == "hhvm" ]] || php codecept run functional -c frameworks-phalcon'
+  - php codecept run functional -c frameworks-symfony # Symfony Tests
+  - php codecept run functional -c frameworks-zf1 # ZF1 Tests
+  - php codecept run functional -c frameworks-zf2 # ZF2 Tests

CHANGELOG.md

@@ -1,5 +1,11 @@
 # Changelog
 
+#### 2.0.15
+
+* [REST] Fixed sending `JsonSerializable` object on POST by @Naktibalda and @andersonamuller. See #1988 #1994
+* [MongoDb] escaped filename shell argument for loading MongoDB by @christoph-hautzinger. #1998 *2015-06-03*
+* [Lumen] Module added by @janhenkgerritsen
+
 #### 2.1.0-beta
 
 * [PhpBrowser][Frameworks] Fixed cloning form nodes Codeception\Lib\InnerBrowser::getFormFromCrawler(): ID XXX already defined *2015-05-13*
@@ -26,7 +32,38 @@
 
 #### 2.0.14
 
-* fixed stderr tput messages in PHPStorm console *2015-04-26*
+* Improved output *2015-05-22*
+  * data providers print simplified
+  * output respects console size with `tput` and tries to fit area
+  * non-interactive environments for `tput` are ignored
+* [Frameworks][PhpBrowser][Symfony2] Fields are passed as PHP-array on form submission the same way as `Symfony\Component\DomCrawler\Form->getPhpValues()` does. Fixes fails of Symfony form tests  *2015-05-22*
+* [Laravel4] Fixed bug with filters. See #1810. *2015-05-21*
+* [PhpBrowser][Frameworks] Fixed working associative array form fields (like `FooBar[bar]`). Fixes regression #1923 by @davertmik and @zbateson.
+* [PhpBrowser][Frameworks] Fixed cloning form nodes Codeception\Lib\InnerBrowser::getFormFromCrawler(): ID XXX already defined *2015-05-13*
+* [Laravel4] [Laravel5] Improved error message for `amOnRoute` and `amOnAction` methods if route or action does not exist *2015-05-04*
+* [Laravel4] Fixed issue with session configuration *2015-05-01*
+* [Laravel4] Partial rewrite of module *2015-05-01*
+  * Added `getApplication()` method
+  * Added `seeFormHasErrors()`, `seeFormErrorMessages(array $bindings)` and `seeFormErrorMessage($key, $errorMessage)` methods
+  * Deprecated `seeSessionHasErrors()` and `seeSessionErrorMessage(array $bindings)` methods.
+* fixed stderr output messages in PHPStorm console *2015-04-26*
+* Allow following symlinks when searching for tests by @nechutny
+* Fixed `g:scenarios --single-file` missing linebreaks between scenarios by @Zifius Parially fixes #1866
+* [Frameworks][PhpBrowser] Fixed errors like `[ErrorException] Array to string conversion` when using strict locators. Fix by @neochief #1881
+* [Frameworks][PhpBrowser] Fix for URLs with query parameters not properly constructed for GET form submissions by @zbateson Fixes #1891
+* [Facebook] Updated Facebook SDK to 4.0 by @enginvardar. See #1896.
+* [DB] Quote table name in `Db::getPrimaryKeyColumn` and `Db::deleteQueryMethods` by @Naktibalda. See #1912
+* [Silex] Can be used for API functional testing. Improvement by @arduanov See #1945
+* [Doctrine2] Added new config option `symfony_em_service` to specify service name for Doctrine entity manager in Symfony DIC by @danieltuwien #1915
+* [Db] Reversed order of removing records with foreign keys created by `haveInDatabase`. Fixes #1942 by @satahippy
+* [Db] Quote names in PostgreSQL queries. Fix #1916 by @satahippy
+* [ZF1] Various improvements by @Naktibalda See #1924
+* [ZF2][ZF2] Improved passing request headers by @Naktibalda
+* [Phalcon1] Improved dependency injector container check by @sergeyklay #1967
+* [Yii2] Enabled logging by @TriAnMan #1539
+* Attribute `feature` added to xml reports in `Codeception\TestCase\Test` test report by @tankist. See #1964
+* Fixed #1779 by @Naktibalda
+* ...special thanks to @Naktibalda for creating demo [ZF1](https://github.com/Naktibalda/codeception-zf1-tests) and [ZF2](https://github.com/Naktibalda/codeception-zf2-tests) applications with api tests examples.
 
 #### 2.0.13
 

CONTRIBUTING.md

@@ -4,4 +4,20 @@ At Codeception we are glad to receive contributions and patches from the communi
 
 Please check the guide for sending your contributions with Github at https://github.com/Codeception/Codeception/wiki/Git-workflow-for-Codeception-contributors
 
+## Coding Standards
 All contributions must follow the coding standards described at: https://github.com/Codeception/Codeception/wiki/Codeception-coding-style-standard
+
+## Code
+**Bugfixes should be sent to to current stable branch, which is the same as major version number.**
+
+Breaking features and major improvements should be sent into `master`. When you send PRs to master, they will be added to release cycle only when the next stable branch is started.
+
+Check also the "tests/README.md" to learn more about the available internal Codeception tests.
+
+## Documentation
+
+### Guides
+If you want to contribute documentation to the guides you are asked to send your changes to the /docs/ folder: https://github.com/Codeception/Codeception/tree/2.0/docs. This files are the source for the codeception website guides: http://codeception.com/docs/01-Introduction. Remind to send your documentation improvements to the right "repository branch" depending on the Codeception version you are working with: 2.0, master,...
+
+### Modules Documentation
+The documentation for each module is directly generated from the corresponding docblock which can be found in each module (src/Module/Codeception/*.php).

RoboFile.php

@@ -174,6 +174,7 @@ public function buildPhar()
             ->name('*.ttf')
             ->name('*.wof')
             ->name('*.woff')
+            ->name('*.woff2')
             ->name('*.png')
             ->name('*.tpl.dist')
             ->name('*.html.dist')
@@ -518,6 +519,8 @@ public function clean()
         $this->taskCleanDir([
             'tests/log',
             'tests/data/claypit/tests/_output',
+            'tests/data/claypit/tests/_log',
+            'tests/data/claypit/tests/_output',
             'tests/data/included/_log',
             'tests/data/included/jazz/tests/_log',
             'tests/data/included/shire/tests/_log',

appveyor.yml

@@ -0,0 +1,45 @@
+build: false
+shallow_clone: true
+platform: 'x86'
+branches:
+  except:
+    - gh-pages
+
+services:
+  - mysql56
+  - postgresql93
+
+install:
+  # databases setup
+  - SET PATH=C:\Program Files\MySql\MySQL Server 5.6\bin\;%PATH%
+  - SET PGUSER=postgres
+  - SET PGPASSWORD=Password12!
+  - SET PATH=C:\Program Files\PostgreSQL\9.3\bin\;%PATH%
+  # php setup
+  - cinst -y OpenSSL.Light
+  - SET PATH=C:\Program Files\OpenSSL;%PATH%
+  - cinst -y curl
+  - SET PATH=C:\Program Files\curl;%PATH%
+  - cinst -y php
+  - cd c:\tools\php
+  - copy php.ini-production php.ini
+  - echo extension_dir=ext >> php.ini
+  - echo extension=php_openssl.dll >> php.ini
+  - echo date.timezone="UTC" >> php.ini
+  - echo extension=php_mbstring.dll >> php.ini
+  - echo extension=php_curl.dll >> php.ini
+  - echo extension=php_pdo_mysql.dll >> php.ini
+  - echo extension=php_pdo_pgsql.dll >> php.ini
+  - echo extension=php_pgsql.dll >> php.ini
+  - SET PATH=C:\tools\php;%PATH%
+  - cd %APPVEYOR_BUILD_FOLDER%
+  - php -r "readfile('http://getcomposer.org/installer');" | php
+  - php composer.phar install --prefer-dist -n --no-ansi
+
+before_test:
+  - createdb codeception_test
+  - mysql -uroot -pPassword12! -e "CREATE DATABASE codeception_test"
+
+test_script:
+  - php codecept run cli --no-colors -n --skip-group coverage
+  - php codecept run unit -g core -g appveyor --no-colors -n

docs/04-FunctionalTests.md

@@ -226,8 +226,8 @@ Check also all available *Public Properties* of used modules to get full access
 
 By default Codeception uses `E_ALL & ~E_STRICT & ~E_DEPRECATED` error reporting level. 
 In functional tests you might want to change this level depending on framework's error policy.
-The error reporting level can be set in the suite configuraion file:
-
+The error reporting level can be set in the suite configuration file:
+    
 ```yaml
 class_name: FunctionalTester
 modules:

docs/08-Customization.md

@@ -80,6 +80,13 @@ extensions:
 
 But what are extensions, anyway? Basically speaking, Extensions are nothing more then event listeners based on [Symfony Event Dispatcher](http://symfony.com/doc/current/components/event_dispatcher/introduction.html) component.
 
+<div class="alert">This section requires advanced PHP skills and some knowlegde of Codeception and PHPUnit internals.</div>
+
+Codeception has limited capabilities to extend its core features.
+Extensions are not supposed to override current functionality, but are pretty useful if you are experienced developer and you want to hook into testing flow.
+
+Basically speaking, Extensions are nothing more then event listeners based on [Symfony Event Dispatcher](http://symfony.com/doc/current/components/event_dispatcher/introduction.html) component.
+
 Here are the events and event classes. The events are listed in order they happen during execution. Each event has a corresponding class, which is passed to listener, and contains specific objects.
 
 ### Events

docs/12-ParallelExecution.md

@@ -277,7 +277,7 @@ $ robo parallel:run
 
 ### Step 3: Merge Results
 
-We should not rely on console output when running our tests. In case of `parallelExec` task, some text can be missed. We recommmend to save results as JUnit XML, which can be merged and plugged into Continous Integration server.
+We should not rely on console output when running our tests. In case of `parallelExec` task, some text can be missed. We recommmend to save results as JUnit XML, which can be merged and plugged into Continuous Integration server.
 
 ```php
 <?php

docs/modules/Asserts.md

@@ -44,7 +44,7 @@ Checks that condition is negative.
 
 ### assertGreaterThan
 
-Checks that expected is greater than actual
+Checks that actual is greater than expected
 
  * `param`        $expected
  * `param`        $actual
@@ -53,7 +53,7 @@ Checks that expected is greater than actual
 
 ### assertGreaterThanOrEqual
 
-Checks that expected is greater or equal than actual
+Checks that actual is greater or equal than expected
 
  * `param`        $expected
  * `param`        $actual
@@ -72,7 +72,7 @@ Checks that expected is greater or equal than actual
 
 ### assertLessThan
 
-Checks that expected is less than actual
+Checks that actual is less than expected
 
  * `param`        $expected
  * `param`        $actual
@@ -81,7 +81,7 @@ Checks that expected is less than actual
 
 ### assertLessThanOrEqual
 
-Checks that expected is less or equal than actual
+Checks that actual is less or equal than expected
 
  * `param`        $expected
  * `param`        $actual

docs/modules/Doctrine2.md

@@ -26,6 +26,7 @@ It can be done in bootstrap file, by setting static $em property:
 
 * auto_connect: true - tries to get EntityManager through connected frameworks. If none found expects the $em values specified as described above.
 * cleanup: true - all doctrine queries will be run in transaction, which will be rolled back at the end of test.
+* symfony_em_service: 'doctrine.orm.entity_manager' - use the stated EntityManager (optional).
 * connection_callback: - callable that will return an instance of EntityManager. This is a must if you run Doctrine without Zend2 or Symfony2 frameworks
 
  ### Example (`functional.suite.yml`)