gnuviech/gva
1
0
Fork 0
Code Issues 6 Pull requests Releases Wiki Activity

Fix tests for Python 3

Browse source 
- drop Python 2 __future__ imports
- fix tests to handle new Django and Python 3 module names
- reformat changed files with black
This commit is contained in:
Jan Dittberner 2019-01-30 21:27:25 +01:00
parent ddec6b4184
commit 3d18392b67
32 changed files with 2707 additions and 2675 deletions
Download patch file Download diff file Expand all files Collapse all files

23
gnuviechadmin/gvawebcore/tests/test_forms.py
View file

@ -5,25 +5,26 @@ This module contains tests for :py:mod:`gvawebcore.forms`.
from unittest import TestCase
from gvawebcore.forms import PasswordModelFormMixin, PASSWORD_MISMATCH_ERROR
from gvawebcore.forms import PASSWORD_MISMATCH_ERROR, PasswordModelFormMixin
class PasswordModelFormMixinTest(TestCase):
def test_form_properties(self):
form = PasswordModelFormMixin()
self.assertIn('password1', form.fields)
self.assertIn('password2', form.fields)
self.assertIn("password1", form.fields)
self.assertIn("password2", form.fields)
def test_clean_password_same(self):
form = PasswordModelFormMixin(data={
'password1': 'secret', 'password2': 'secret'})
form = PasswordModelFormMixin(
data={"password1": "secret", "password2": "secret"}
)
self.assertTrue(form.is_valid())
self.assertEqual('secret', form.clean_password2())
self.assertEqual("secret", form.clean_password2())
def test_clean_password_different(self):
form = PasswordModelFormMixin(data={
'password1': 'onesecret', 'password2': 'other'})
form = PasswordModelFormMixin(
data={"password1": "onesecret", "password2": "other"}
)
self.assertFalse(form.is_valid())
self.assertIn('password2', form.errors)
self.assertIn(PASSWORD_MISMATCH_ERROR, form.errors['password2'])
self.assertIn("password2", form.errors)
self.assertIn(PASSWORD_MISMATCH_ERROR, form.errors["password2"])

22
gnuviechadmin/gvawebcore/tests/test_views.py
View file

@ -4,31 +4,29 @@ This model contains tests for :py:mod:`gvawebcore.views`.
"""
from unittest import TestCase
from mock import patch, Mock
from unittest.mock import Mock, patch
from gvawebcore.views import HostingPackageAndCustomerMixin
class HostingPackageAndCustomerMixinTest(TestCase):
class TestView(HostingPackageAndCustomerMixin):
kwargs = {'package': '1'}
kwargs = {"package": "1"}
@patch('gvawebcore.views.get_object_or_404')
@patch("gvawebcore.views.get_object_or_404")
def test_get_hosting_package(self, get_object_or_404):
get_object_or_404.return_value = 'A package'
get_object_or_404.return_value = "A package"
view = self.TestView()
self.assertEqual('A package', view.get_hosting_package())
self.assertEqual("A package", view.get_hosting_package())
def test_get_hosting_package_cached(self):
view = self.TestView()
view.hostingpackage = 'Cached package'
self.assertEqual('Cached package', view.get_hosting_package())
view.hostingpackage = "Cached package"
self.assertEqual("Cached package", view.get_hosting_package())
@patch('gvawebcore.views.get_object_or_404')
@patch("gvawebcore.views.get_object_or_404")
def test_get_customer_object(self, get_object_or_404):
get_object_or_404.return_value = Mock(customer='A customer')
get_object_or_404.return_value = Mock(customer="A customer")
view = self.TestView()
self.assertEqual('A customer', view.get_customer_object())
self.assertEqual("A customer", view.get_customer_object())