From 4ed96e2ab6542f33dda8c94896b0b12483aa2c67 Mon Sep 17 00:00:00 2001 From: Benjamin Eberlei Date: Sat, 14 Dec 2013 11:29:07 +0100 Subject: [PATCH] Update CONTRIBUTING.md --- CONTRIBUTING.md | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index dc3fe054e38..bd1d74d03d5 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -8,7 +8,7 @@ unified and future proof. ## We only accept PRs to "master" -Our branching strategy is summed up with "everything to master first", even +Our branching strategy is "everything to master first", even bugfixes and we then merge them into the stable branches. You should only open pull requests against the master branch. Otherwise we cannot accept the PR. @@ -33,7 +33,7 @@ with some exceptions/differences: ## Unit-Tests -Always add a test for your pull-request. +Please try to add a test for your pull-request. * If you want to fix a bug or provide a reproduce case, create a test file in ``tests/Doctrine/Tests/ORM/Functional/Ticket`` with the name of the ticket, @@ -50,6 +50,12 @@ take a look at the ``tests/travis`` folder for some examples. Then run: phpunit -c mysql.phpunit.xml +Tips for creating unittests: + +1. If you put a test into the `Ticket` namespace as described above, put the testcase and all entities into the same class. + See `https://github.com/doctrine/doctrine2/tree/master/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC2306Test.php` for an + example. + ## Travis We automatically run your pull request through [Travis CI](http://www.travis-ci.org)