From 23408ffc571d9a5d665c44b860cf41dc90b9f460 Mon Sep 17 00:00:00 2001 From: David Taylor Date: Thu, 27 Aug 2015 01:35:27 +0100 Subject: [PATCH 1/4] Added data save check to registration (currently fails) --- RIGS/test_functional.py | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/RIGS/test_functional.py b/RIGS/test_functional.py index 514e030f..65f83252 100644 --- a/RIGS/test_functional.py +++ b/RIGS/test_functional.py @@ -134,6 +134,15 @@ class UserRegistrationTest(LiveServerTestCase): udd = self.browser.find_element_by_class_name('navbar').text self.assertIn('Hi John', udd) + # Check all the data actually got saved + profileObject = models.Profile.objects.all()[0] + self.assertEqual(profileObject.username, 'TestUsername') + self.assertEqual(profileObject.first_name, 'John') + self.assertEqual(profileObject.last_name, 'Smith') + self.assertEqual(profileObject.initials, 'JS') + self.assertEqual(profileObject.phone, '0123456789') + self.assertEqual(profileObject.email, 'test@example.com') + # All is well From 0436cbd8fbd66b699418466a7428879ed220da2c Mon Sep 17 00:00:00 2001 From: David Taylor Date: Thu, 27 Aug 2015 01:36:44 +0100 Subject: [PATCH 2/4] Added missing email field to registration form --- RIGS/forms.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/RIGS/forms.py b/RIGS/forms.py index dd6015d1..faa57f76 100644 --- a/RIGS/forms.py +++ b/RIGS/forms.py @@ -21,7 +21,7 @@ class ProfileRegistrationFormUniqueEmail(RegistrationFormUniqueEmail): class Meta: model = models.Profile - fields = ('username','first_name','last_name','initials','phone') + fields = ('username','email','first_name','last_name','initials','phone') def clean_initials(self): """ From 5a2b15d91c0cf244164d0a04288f9d9e0153fa45 Mon Sep 17 00:00:00 2001 From: David Taylor Date: Thu, 27 Aug 2015 01:48:10 +0100 Subject: [PATCH 3/4] Removed unnecessary username field definition --- RIGS/forms.py | 1 - 1 file changed, 1 deletion(-) diff --git a/RIGS/forms.py b/RIGS/forms.py index faa57f76..0f019d18 100644 --- a/RIGS/forms.py +++ b/RIGS/forms.py @@ -12,7 +12,6 @@ from RIGS import models #Registration class ProfileRegistrationFormUniqueEmail(RegistrationFormUniqueEmail): - username = forms.CharField(required=True, max_length=30) first_name = forms.CharField(required=False, max_length=50) last_name = forms.CharField(required=False, max_length=50) initials = forms.CharField(required=True, max_length=5) From 1f14c53f78813b7fdb863e77f54de481a0905f8d Mon Sep 17 00:00:00 2001 From: Tom Price Date: Thu, 27 Aug 2015 22:46:50 +0100 Subject: [PATCH 4/4] Remove implicit fields as these are not needed in the form definition. Passes all tests. --- RIGS/forms.py | 4 ---- 1 file changed, 4 deletions(-) diff --git a/RIGS/forms.py b/RIGS/forms.py index 0f019d18..d3dfb39e 100644 --- a/RIGS/forms.py +++ b/RIGS/forms.py @@ -12,10 +12,6 @@ from RIGS import models #Registration class ProfileRegistrationFormUniqueEmail(RegistrationFormUniqueEmail): - first_name = forms.CharField(required=False, max_length=50) - last_name = forms.CharField(required=False, max_length=50) - initials = forms.CharField(required=True, max_length=5) - phone = forms.CharField(required=False, max_length=13) captcha = ReCaptchaField() class Meta: