Skip to content

Commit e5e07f3

Browse files
FilMarFilMar
authored
update requirements for unittest-xml (#656)
* update deprecated requirement for tests * Update main.yml * Update main.yml * fixed tests not working in python 3.12
1 parent 40d7f07 commit e5e07f3

File tree

3 files changed

+33
-33
lines changed

3 files changed

+33
-33
lines changed

‎.github/workflows/main.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ jobs:
5151
needs: [build]
5252
strategy:
5353
matrix:
54-
python-version: ['3.8', '3.9', '3.10', '3.11']
54+
python-version: ['3.8', '3.9', '3.10', '3.11', '3.12']
5555
django-version: ['3.2', '4.2', '5.0']
5656
exclude:
5757
- python-version: '3.8'

‎dj_rest_auth/tests/requirements.pip

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,4 +3,4 @@ django-allauth==0.61.1
33
djangorestframework-simplejwt>=5.3.1
44
flake8==3.8.4
55
responses==0.12.1
6-
unittest-xml-reporting==3.0.4
6+
unittest-xml-reporting==3.2.0

‎dj_rest_auth/tests/test_api.py

+31-31
Original file line numberDiff line numberDiff line change
@@ -731,7 +731,7 @@ def test_cookie_authentication(self):
731731
resp = self.post(self.login_url, data=payload, status_code=200)
732732
self.assertEqual(['jwt-auth'], list(resp.cookies.keys()))
733733
resp = self.get('/protected-view/')
734-
self.assertEquals(resp.status_code, 200)
734+
self.assertEqual(resp.status_code, 200)
735735

736736
@modify_settings(INSTALLED_APPS={'remove': ['rest_framework_simplejwt.token_blacklist']})
737737
@override_api_settings(USE_JWT=True)
@@ -794,9 +794,9 @@ def test_custom_jwt_claims(self):
794794
self.assertEqual('access' in self.response.json.keys(), True)
795795
self.token = self.response.json['access']
796796
claims = decode_jwt(self.token, settings.SECRET_KEY, algorithms='HS256')
797-
self.assertEquals(claims['user_id'], 1)
798-
self.assertEquals(claims['name'], 'person')
799-
self.assertEquals(claims['email'], 'person1@world.com')
797+
self.assertEqual(claims['user_id'], 1)
798+
self.assertEqual(claims['name'], 'person')
799+
self.assertEqual(claims['email'], 'person1@world.com')
800800

801801
@override_api_settings(USE_JWT=True)
802802
@override_api_settings(JWT_AUTH_COOKIE='jwt-auth')
@@ -819,11 +819,11 @@ def test_custom_jwt_claims_cookie_w_authentication(self):
819819
self.assertEqual(['jwt-auth'], list(resp.cookies.keys()))
820820
token = resp.cookies.get('jwt-auth').value
821821
claims = decode_jwt(token, settings.SECRET_KEY, algorithms='HS256')
822-
self.assertEquals(claims['user_id'], 1)
823-
self.assertEquals(claims['name'], 'person')
824-
self.assertEquals(claims['email'], 'person1@world.com')
822+
self.assertEqual(claims['user_id'], 1)
823+
self.assertEqual(claims['name'], 'person')
824+
self.assertEqual(claims['email'], 'person1@world.com')
825825
resp = self.get('/protected-view/')
826-
self.assertEquals(resp.status_code, 200)
826+
self.assertEqual(resp.status_code, 200)
827827

828828
@override_api_settings(USE_JWT=True)
829829
@override_api_settings(JWT_AUTH_COOKIE='jwt-auth')
@@ -850,22 +850,22 @@ def test_wo_csrf_enforcement(self):
850850

851851
resp = client.post(self.login_url, payload)
852852
self.assertTrue('jwt-auth' in list(client.cookies.keys()))
853-
self.assertEquals(resp.status_code, 200)
853+
self.assertEqual(resp.status_code, 200)
854854

855855
# TEST WITH JWT AUTH HEADER
856856
jwtclient = APIClient(enforce_csrf_checks=True)
857857
token = resp.data['access']
858858
resp = jwtclient.get('/protected-view/', HTTP_AUTHORIZATION='Bearer ' + token)
859-
self.assertEquals(resp.status_code, 200)
859+
self.assertEqual(resp.status_code, 200)
860860
resp = jwtclient.post('/protected-view/', {}, HTTP_AUTHORIZATION='Bearer ' + token)
861-
self.assertEquals(resp.status_code, 200)
861+
self.assertEqual(resp.status_code, 200)
862862

863863
# TEST WITH COOKIES
864864
resp = client.get('/protected-view/')
865-
self.assertEquals(resp.status_code, 200)
865+
self.assertEqual(resp.status_code, 200)
866866

867867
resp = client.post('/protected-view/', {})
868-
self.assertEquals(resp.status_code, 200)
868+
self.assertEqual(resp.status_code, 200)
869869

870870
@override_api_settings(USE_JWT=True)
871871
@override_api_settings(JWT_AUTH_COOKIE='jwt-auth')
@@ -896,30 +896,30 @@ def test_csrf_wo_login_csrf_enforcement(self):
896896
resp = client.post(self.login_url, payload)
897897
self.assertTrue('jwt-auth' in list(client.cookies.keys()))
898898
self.assertTrue('csrftoken' in list(client.cookies.keys()))
899-
self.assertEquals(resp.status_code, 200)
899+
self.assertEqual(resp.status_code, 200)
900900

901901
# TEST WITH JWT AUTH HEADER
902902
jwtclient = APIClient(enforce_csrf_checks=True)
903903
token = resp.data['access']
904904
resp = jwtclient.get('/protected-view/')
905-
self.assertEquals(resp.status_code, 403)
905+
self.assertEqual(resp.status_code, 403)
906906
resp = jwtclient.get('/protected-view/', HTTP_AUTHORIZATION='Bearer ' + token)
907-
self.assertEquals(resp.status_code, 200)
907+
self.assertEqual(resp.status_code, 200)
908908
resp = jwtclient.post('/protected-view/', {})
909-
self.assertEquals(resp.status_code, 403)
909+
self.assertEqual(resp.status_code, 403)
910910
resp = jwtclient.post('/protected-view/', {}, HTTP_AUTHORIZATION='Bearer ' + token)
911-
self.assertEquals(resp.status_code, 200)
911+
self.assertEqual(resp.status_code, 200)
912912

913913
# TEST WITH COOKIES
914914
resp = client.get('/protected-view/')
915-
self.assertEquals(resp.status_code, 200)
915+
self.assertEqual(resp.status_code, 200)
916916
# fail w/o csrftoken in payload
917917
resp = client.post('/protected-view/', {})
918-
self.assertEquals(resp.status_code, 403)
918+
self.assertEqual(resp.status_code, 403)
919919

920920
csrfparam = {'csrfmiddlewaretoken': csrftoken}
921921
resp = client.post('/protected-view/', csrfparam)
922-
self.assertEquals(resp.status_code, 200)
922+
self.assertEqual(resp.status_code, 200)
923923

924924
@override_api_settings(USE_JWT=True)
925925
@override_api_settings(JWT_AUTH_COOKIE='jwt-auth')
@@ -949,26 +949,26 @@ def test_csrf_w_login_csrf_enforcement(self):
949949

950950
# fail w/o csrftoken in payload
951951
resp = client.post(self.login_url, payload)
952-
self.assertEquals(resp.status_code, 403)
952+
self.assertEqual(resp.status_code, 403)
953953

954954
payload['csrfmiddlewaretoken'] = csrftoken
955955
resp = client.post(self.login_url, payload)
956956
self.assertTrue('jwt-auth' in list(client.cookies.keys()))
957957
self.assertTrue('csrftoken' in list(client.cookies.keys()))
958-
self.assertEquals(resp.status_code, 200)
958+
self.assertEqual(resp.status_code, 200)
959959

960960
# TEST WITH JWT AUTH HEADER does not make sense
961961

962962
# TEST WITH COOKIES
963963
resp = client.get('/protected-view/')
964-
self.assertEquals(resp.status_code, 200)
964+
self.assertEqual(resp.status_code, 200)
965965
# fail w/o csrftoken in payload
966966
resp = client.post('/protected-view/', {})
967-
self.assertEquals(resp.status_code, 403)
967+
self.assertEqual(resp.status_code, 403)
968968

969969
csrfparam = {'csrfmiddlewaretoken': csrftoken}
970970
resp = client.post('/protected-view/', csrfparam)
971-
self.assertEquals(resp.status_code, 200)
971+
self.assertEqual(resp.status_code, 200)
972972

973973
@override_api_settings(USE_JWT=True)
974974
@override_api_settings(JWT_AUTH_COOKIE='jwt-auth')
@@ -998,26 +998,26 @@ def test_csrf_w_login_csrf_enforcement_2(self):
998998

999999
# fail w/o csrftoken in payload
10001000
resp = client.post(self.login_url, payload)
1001-
self.assertEquals(resp.status_code, 403)
1001+
self.assertEqual(resp.status_code, 403)
10021002

10031003
payload['csrfmiddlewaretoken'] = csrftoken
10041004
resp = client.post(self.login_url, payload)
10051005
self.assertTrue('jwt-auth' in list(client.cookies.keys()))
10061006
self.assertTrue('csrftoken' in list(client.cookies.keys()))
1007-
self.assertEquals(resp.status_code, 200)
1007+
self.assertEqual(resp.status_code, 200)
10081008

10091009
# TEST WITH JWT AUTH HEADER does not make sense
10101010

10111011
# TEST WITH COOKIES
10121012
resp = client.get('/protected-view/')
1013-
self.assertEquals(resp.status_code, 200)
1013+
self.assertEqual(resp.status_code, 200)
10141014
# fail w/o csrftoken in payload
10151015
resp = client.post('/protected-view/', {})
1016-
self.assertEquals(resp.status_code, 403)
1016+
self.assertEqual(resp.status_code, 403)
10171017

10181018
csrfparam = {'csrfmiddlewaretoken': csrftoken}
10191019
resp = client.post('/protected-view/', csrfparam)
1020-
self.assertEquals(resp.status_code, 200)
1020+
self.assertEqual(resp.status_code, 200)
10211021

10221022
@override_api_settings(JWT_AUTH_RETURN_EXPIRATION=True)
10231023
@override_api_settings(USE_JWT=True)

0 commit comments

Comments
 (0)