Merge pull request #308 from joaoricardo000/master

Added djangorestframework-jwt as test requirement, and typo
This commit is contained in:
Maxim Kukhtenkov 2017-03-05 21:45:56 -08:00 committed by GitHub
commit 48dba428d8
4 changed files with 4 additions and 3 deletions

View File

@ -459,7 +459,7 @@ class APITestCase1(TestCase, BaseAPITestCase):
email_confirmation = new_user.emailaddress_set.get(email=self.EMAIL)\ email_confirmation = new_user.emailaddress_set.get(email=self.EMAIL)\
.emailconfirmation_set.order_by('-created')[0] .emailconfirmation_set.order_by('-created')[0]
self.post( self.post(
self.veirfy_email_url, self.verify_email_url,
data={"key": email_confirmation.key}, data={"key": email_confirmation.key},
status_code=status.HTTP_200_OK status_code=status.HTTP_200_OK
) )

View File

@ -97,7 +97,7 @@ class BaseAPITestCase(object):
self.register_url = reverse('rest_register') self.register_url = reverse('rest_register')
self.password_reset_url = reverse('rest_password_reset') self.password_reset_url = reverse('rest_password_reset')
self.user_url = reverse('rest_user_details') self.user_url = reverse('rest_user_details')
self.veirfy_email_url = reverse('rest_verify_email') self.verify_email_url = reverse('rest_verify_email')
self.fb_login_url = reverse('fb_login') self.fb_login_url = reverse('fb_login')
self.tw_login_url = reverse('tw_login') self.tw_login_url = reverse('tw_login')
self.tw_login_no_view_url = reverse('tw_login_no_view') self.tw_login_no_view_url = reverse('tw_login_no_view')

View File

@ -263,7 +263,7 @@ class TestSocialAuth(TestCase, BaseAPITestCase):
email_confirmation = new_user.emailaddress_set.get(email=self.EMAIL)\ email_confirmation = new_user.emailaddress_set.get(email=self.EMAIL)\
.emailconfirmation_set.order_by('-created')[0] .emailconfirmation_set.order_by('-created')[0]
self.post( self.post(
self.veirfy_email_url, self.verify_email_url,
data={"key": email_confirmation.key}, data={"key": email_confirmation.key},
status_code=status.HTTP_200_OK status_code=status.HTTP_200_OK
) )

View File

@ -38,6 +38,7 @@ setup(
tests_require=[ tests_require=[
'responses>=0.5.0', 'responses>=0.5.0',
'django-allauth>=0.25.0', 'django-allauth>=0.25.0',
'djangorestframework-jwt>=1.9.0',
], ],
test_suite='runtests.runtests', test_suite='runtests.runtests',
include_package_data=True, include_package_data=True,