Skip to content

Commit

Permalink
Merge branch 'release/2.2.3' into bugfix/issue-816
Browse files Browse the repository at this point in the history
  • Loading branch information
tomwojcik authored May 3, 2024
2 parents 15d29fa + 9bf2c65 commit e82f60b
Show file tree
Hide file tree
Showing 5 changed files with 9 additions and 5 deletions.
3 changes: 2 additions & 1 deletion .github/workflows/test-suite.yml
Original file line number Diff line number Diff line change
Expand Up @@ -83,11 +83,12 @@ jobs:
- name: Run tests
run: make test
- name: Upload coverage to Codecov
uses: codecov/codecov-action@v3
uses: codecov/codecov-action@v4
with:
files: ./coverage.xml
fail_ci_if_error: true
verbose: true
token: ${{ secrets.CODECOV_TOKEN }}

code-quality:
strategy:
Expand Down
3 changes: 2 additions & 1 deletion CHANGELOG.rst
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ This document records all notable changes to djoser.
This project adheres to `Semantic Versioning <http://semver.org/>`_.

---------------------
`2.2.3`_ (2024-05-01)
`2.2.3`_ (2024-05-03)
---------------------

* add support for protocol, domain and site name customization in the email contents https://github.com/sunscrapers/djoser/issues/781
Expand Down Expand Up @@ -440,3 +440,4 @@ few bugfixes / documentation updates. List of changes:
.. _2.2.0: https://github.com/sunscrapers/djoser/compare/2.1.0...2.2.0
.. _2.2.1: https://github.com/sunscrapers/djoser/compare/2.2.0...2.2.1
.. _2.2.2: https://github.com/sunscrapers/djoser/compare/2.2.1...2.2.2
.. _2.2.3: https://github.com/sunscrapers/djoser/compare/2.2.2...2.2.3
3 changes: 3 additions & 0 deletions djoser/constants.py
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,9 @@

class Messages:
INVALID_CREDENTIALS_ERROR = _("Unable to log in with provided credentials.")
INACTIVE_ACCOUNT_ERROR = _(
"User account is disabled."
) # not in use since Django 1.10
INVALID_TOKEN_ERROR = _("Invalid token for given user.")
INVALID_UID_ERROR = _("Invalid user id or user doesn't exist.")
STALE_TOKEN_ERROR = _("Stale token for given user.")
Expand Down
3 changes: 1 addition & 2 deletions docs/source/getting_started.rst
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,6 @@ Available endpoints

* ``/users/``
* ``/users/me/``
* ``/users/confirm/``
* ``/users/resend_activation/``
* ``/users/set_password/``
* ``/users/reset_password/``
Expand Down Expand Up @@ -76,7 +75,7 @@ Configure ``urls.py``:
urlpatterns = [
(...),
url(r'^auth/', include('djoser.urls')),
re_path(r'^auth/', include('djoser.urls')),
]
HTTP Basic Auth strategy is assumed by default as Django Rest Framework does it.
Expand Down
2 changes: 1 addition & 1 deletion testproject/testapp/tests/test_token_create.py
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ def test_post_should_not_login_if_user_is_not_active(self):

self.assert_status_equal(response, status.HTTP_400_BAD_REQUEST)
self.assertEqual(
response.data["non_field_errors"],
response.data["non_field_errors"][0],
settings.CONSTANTS.messages.INVALID_CREDENTIALS_ERROR,
)
self.assertFalse(self.signal_sent)
Expand Down

0 comments on commit e82f60b

Please sign in to comment.