Skip to content

Commit 8045693

Browse files
committed
feature #6378 refs #5898 Fix updates of testing.rst for 3.0 (guilliamxavier)
This PR was merged into the 3.0 branch. Discussion ---------- refs #5898 Fix updates of testing.rst for 3.0 | Q | A | ------------- | --- | Doc fix? | yes | New docs? | no | Applies to | 3.0+ | Fixed tickets | part of #5898 As a consequence of the following changes: > - `app/phpunit.xml.dist` -> `phpunit.xml.dist` 1461bdc#diff-6e8b9a935e200194f4cdab04f31032a2 > - `src/AppBundle/Tests/...` -> `tests/AppBundle/...` 3083e90#diff-6e8b9a935e200194f4cdab04f31032a2 Commits ------- a6a90f7 refs #5898 Fix updates of testing.rst for 3.0
2 parents a1f8c3a + a6a90f7 commit 8045693

File tree

1 file changed

+8
-8
lines changed

1 file changed

+8
-8
lines changed

book/testing.rst

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@ called ``Calculator`` in the ``Util/`` directory of the app bundle::
6363
}
6464

6565
To test this, create a ``CalculatorTest`` file in the ``tests/AppBundle/Util`` directory
66-
of your bundle::
66+
of your application::
6767

6868
// tests/AppBundle/Util/CalculatorTest.php
6969
namespace Tests\AppBundle\Util;
@@ -84,13 +84,13 @@ of your bundle::
8484

8585
.. note::
8686

87-
By convention, the ``Tests/AppBundle`` directory should replicate the directory
87+
By convention, the ``tests/AppBundle`` directory should replicate the directory
8888
of your bundle for unit tests. So, if you're testing a class in the
89-
``AppBundle/Util/`` directory, put the test in the ``tests/AppBundle/Util/``
89+
``src/AppBundle/Util/`` directory, put the test in the ``tests/AppBundle/Util/``
9090
directory.
9191

9292
Just like in your real application - autoloading is automatically enabled
93-
via the ``autoload.php`` file (as configured by default in the
93+
via the ``app/autoload.php`` file (as configured by default in the
9494
``phpunit.xml.dist`` file).
9595

9696
Running tests for a given file or directory is also very easy:
@@ -835,7 +835,7 @@ PHPUnit Configuration
835835

836836
Each application has its own PHPUnit configuration, stored in the
837837
``phpunit.xml.dist`` file. You can edit this file to change the defaults or
838-
create an ``phpunit.xml`` file to set up a configuration for your local machine
838+
create a ``phpunit.xml`` file to set up a configuration for your local machine
839839
only.
840840

841841
.. tip::
@@ -870,7 +870,7 @@ configuration adds tests from a custom ``lib/tests`` directory:
870870
<testsuites>
871871
<testsuite name="Project Test Suite">
872872
<!-- ... --->
873-
<directory>../lib/tests</directory>
873+
<directory>lib/tests</directory>
874874
</testsuite>
875875
</testsuites>
876876
<!-- ... --->
@@ -887,10 +887,10 @@ section:
887887
<filter>
888888
<whitelist>
889889
<!-- ... -->
890-
<directory>../lib</directory>
890+
<directory>lib</directory>
891891
<exclude>
892892
<!-- ... -->
893-
<directory>../lib/tests</directory>
893+
<directory>lib/tests</directory>
894894
</exclude>
895895
</whitelist>
896896
</filter>

0 commit comments

Comments
 (0)