| |
@@ -23,8 +23,13 @@
|
| |
Setting up the development environment
|
| |
========================================
|
| |
|
| |
+ <<<<<<< HEAD
|
| |
#. Fork the `current repository <https://pagure.io/fedora-commops/fedora-happiness-packets>`_ to your profile.
|
| |
#. Clone this forked repository (ssh method is recommended, the steps can be found `here <https://docs.pagure.org/pagure/usage/first_steps.html>`_) to your system using Git with the following command::
|
| |
+ =======
|
| |
+ #. Fork the `current repository <https://pagure.io/fedora-commops/fedora-happiness-packets>`_ to your profile .
|
| |
+ #. Clone this forked repository to your system using Git with the following command::
|
| |
+ >>>>>>> Revert "Merge branch 'master' of ssh://pagure.io/forks/anasustic/fedora-commops/fedora-happiness-packets"
|
| |
|
| |
git clone "https://pagure.io/forks/<user_name>/fedora-commops/fedora-happiness-packets.git"
|
| |
|
| |
@@ -78,12 +83,11 @@
|
| |
docker-compose exec web sh
|
| |
|
| |
Then the terminal will show a ``#`` symbol.
|
| |
- Simply type in ``./t`` (or ``t``) to initiate the test suite.
|
| |
+ Simply type in ``t`` to initiate the test suite.
|
| |
|
| |
- (The test suite are run by running the ``./t`` script, which runs the tests with the appropriate testing settings and provides a coverage report.)
|
| |
+ (The test suite are run by running the ``t`` script, which runs the tests with the appropriate testing settings and provides a coverage report.)
|
| |
|
| |
Integration tests are run via the following command::
|
| |
|
| |
- docker-compose exec web ./manage.py test -v 2 -p integration_test*.py --settings=happinesspackets.settings.tsting
|
| |
+ manage.py test -v 2 -p integration_test*.py --settings=happinesspackets.settings.tsting
|
| |
|
| |
- If a ``file not found`` error occurs, try removing the ``./`` from the command and try again.
|
| |
Register models for Message and BlacklistedEmail in Django Admin. This is first part of #157.