From 2f198d890974a9c5c377bbfcb285ec8539e47594 Mon Sep 17 00:00:00 2001 From: Ana Sustic Date: Mar 12 2019 18:46:31 +0000 Subject: [PATCH 1/4] Merge branch 'master' of ssh://pagure.io/forks/anasustic/fedora-commops/fedora-happiness-packets --- diff --git a/docs/setup/development_windows.rst b/docs/setup/development_windows.rst index d28647b..5f95903 100644 --- a/docs/setup/development_windows.rst +++ b/docs/setup/development_windows.rst @@ -18,7 +18,7 @@ You will need the following programs installed on your system before proceeding Setting up the development environment ======================================== -#. Fork the `current repository `_ to your profile . +#. Fork the `current repository `_ to your profile. #. Clone this forked repository to your system using Git with the following command:: git clone "https://pagure.io/forks//fedora-commops/fedora-happiness-packets.git" @@ -74,11 +74,12 @@ In order to run tests, make sure to execute ``docker-compose up`` command. Now i docker-compose exec web sh Then the terminal will show a ``#`` symbol. -Simply type in ``t`` to initiate the test suite. +Simply type in ``./t`` (or ``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:: - manage.py test -v 2 -p integration_test*.py --settings=happinesspackets.settings.tsting + docker-compose exec web ./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. From a7896d86d61f068b7e35b9c8c8696a2f348592f4 Mon Sep 17 00:00:00 2001 From: Ana Sustic Date: Mar 12 2019 22:27:19 +0000 Subject: [PATCH 2/4] Register models to Django Admin --- diff --git a/happinesspackets/messaging/admin.py b/happinesspackets/messaging/admin.py new file mode 100755 index 0000000..45e2ad3 --- /dev/null +++ b/happinesspackets/messaging/admin.py @@ -0,0 +1,5 @@ +from django.contrib import admin +from happinesspackets.messaging.models import Message, BlacklistedEmail + +admin.site.register(Message) +admin.site.register(BlacklistedEmail) \ No newline at end of file From a60c3fc24b745dc5ec44d2881636622df2747d57 Mon Sep 17 00:00:00 2001 From: Ana Sustic Date: Mar 12 2019 22:42:46 +0000 Subject: [PATCH 3/4] Revert "Merge branch 'master' of ssh://pagure.io/forks/anasustic/fedora-commops/fedora-happiness-packets" This reverts commit 2f198d890974a9c5c377bbfcb285ec8539e47594, reversing changes made to 5e3403fef50cc75bc5bfdd815d06e647caa745a7. --- diff --git a/docs/setup/development_windows.rst b/docs/setup/development_windows.rst index 5f95903..d28647b 100644 --- a/docs/setup/development_windows.rst +++ b/docs/setup/development_windows.rst @@ -18,7 +18,7 @@ You will need the following programs installed on your system before proceeding Setting up the development environment ======================================== -#. Fork the `current repository `_ to your profile. +#. Fork the `current repository `_ to your profile . #. Clone this forked repository to your system using Git with the following command:: git clone "https://pagure.io/forks//fedora-commops/fedora-happiness-packets.git" @@ -74,12 +74,11 @@ In order to run tests, make sure to execute ``docker-compose up`` command. Now i 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. From 4821749af12e8565868160a03964f6f7ccdfa302 Mon Sep 17 00:00:00 2001 From: Ana Sustic Date: Mar 13 2019 09:57:03 +0000 Subject: [PATCH 4/4] Add new line at the eof --- diff --git a/happinesspackets/messaging/admin.py b/happinesspackets/messaging/admin.py index 45e2ad3..d7d13cd 100755 --- a/happinesspackets/messaging/admin.py +++ b/happinesspackets/messaging/admin.py @@ -2,4 +2,4 @@ from django.contrib import admin from happinesspackets.messaging.models import Message, BlacklistedEmail admin.site.register(Message) -admin.site.register(BlacklistedEmail) \ No newline at end of file +admin.site.register(BlacklistedEmail)