From 90f1638675303e361a145693c85a131624e3b2e5 Mon Sep 17 00:00:00 2001 From: Sander Roosendaal Date: Thu, 14 Feb 2019 22:33:07 +0100 Subject: [PATCH] passing 1 test --- rowers/models.py | 10 +++++++++- rowers/tests/test_permissions.py | 16 +++++++++++----- 2 files changed, 20 insertions(+), 6 deletions(-) diff --git a/rowers/models.py b/rowers/models.py index dceeb586..687bcaa6 100644 --- a/rowers/models.py +++ b/rowers/models.py @@ -334,7 +334,7 @@ class Team(models.Model): name = models.CharField(max_length=150,unique=True,verbose_name='Team Name') notes = models.CharField(blank=True,max_length=200,verbose_name='Team Purpose') - manager = models.ForeignKey(User, null=True, validators=[is_not_basic]) + manager = models.ForeignKey(User, null=True,) # validators=[is_not_basic]) private = models.CharField(max_length=30,choices=choices,default='open', verbose_name='Team Type') @@ -343,6 +343,14 @@ class Team(models.Model): def __unicode__(self): return self.name + def save(self, *args, **kwargs): + manager = self.manager + if manager.rower.rowerplan == 'basic': + raise ValidationError( + "Basic user cannot be team manager" + ) + + class TeamForm(ModelForm): class Meta: model = Team diff --git a/rowers/tests/test_permissions.py b/rowers/tests/test_permissions.py index 6ca94c97..88f64e22 100644 --- a/rowers/tests/test_permissions.py +++ b/rowers/tests/test_permissions.py @@ -10,7 +10,7 @@ import rowers.plannedsessions as plannedsessions @override_settings(TESTING=True) class PermissionsBasicsTests(TestCase): - def setUp: + def setUp(self): self.c = Client() ## Users - Pro, Basic, Coach & Self Coach @@ -32,11 +32,11 @@ class PermissionsBasicsTests(TestCase): gdproptin=True,gdproptindate=timezone.now(), rowerplan='plan') - self.uselfplan_workouts = WorkoutFactory.create_batch(5, user=self.rselfplan) + self.uplan_workouts = WorkoutFactory.create_batch(5, user=self.rplan) self.factory = RequestFactory() self.password = faker.word() - self.uselfplan.set_password(self.password) - self.uselfplan.save() + self.uplan.set_password(self.password) + self.uplan.save() self.upro = UserFactory(username='prouser') self.rpro = Rower.objects.create(user=self.upro, @@ -96,7 +96,13 @@ class PermissionsBasicsTests(TestCase): ## Basic cannot manage a group def test_basic_groupmanager(self): - self.assertRaises ... + with self.assertRaises(ValidationError): + team = Team.objects.create( + name = 'ThisTeamShouldNotExist', + notes = faker.text(), + manager = self.ubasic, + private = 'open', + viewing = 'allmembers') # View based