youssef/GOLEM
2
0
Fork 0
forked from Yaltik/golem
Code Issues Pull Requests Releases Wiki Activity

mise à jours du test avec date_start et date_stop

Browse Source
This commit is contained in:
eloyoussef 2018-03-12 15:34:43 +01:00
parent 41876e19c0
commit 0dda362d78
2 changed files with 27 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
golem_resource/models/golem_resource_reservation.py
View File

@ -217,7 +217,7 @@ class GolemResourceReservation(models.Model):
if is_day_allowed and (hour_start < timetable.time_start or \ if is_day_allowed and (hour_start < timetable.time_start or \
hour_stop > timetable.time_stop): hour_stop > timetable.time_stop):
verr = _('Not allowed, the resource is not available ' verr = _('Not allowed, the resource is not available '
'during this schedule, please choose another ' 'during this period, please choose another '
'time before confirming.') 'time before confirming.')
raise ValidationError(verr) raise ValidationError(verr)
if not is_day_allowed: if not is_day_allowed:

31
golem_resource/tests/test_golem_resource_reservation.py
View File

@ -138,7 +138,7 @@ class TestGolemResourceReservation(TransactionCase):
self.env.user.groups_id = [(2, group_manager.id, False)] self.env.user.groups_id = [(2, group_manager.id, False)]
with self.assertRaises(ValidationError) as err: with self.assertRaises(ValidationError) as err:
reservation.state_validated() reservation.state_validated()
self.assertIn(u'autorisations nécessaires pour valider', err.exception.args[0]) self.assertIn(u'autorisations nécessaires pour valider', err.exception.args[0])
def test_confirmed_period(self): def test_confirmed_period(self):
""" Test allowed period """ """ Test allowed period """
@ -146,7 +146,7 @@ class TestGolemResourceReservation(TransactionCase):
reservation = self.res_obj.create(self.data) reservation = self.res_obj.create(self.data)
with self.assertRaises(ValidationError) as err: with self.assertRaises(ValidationError) as err:
reservation.state_confirm() reservation.state_confirm()
self.assertIn(u'pas disponible durant cette période', err.exception.args[0]) self.assertIn(u'pas disponible durant cette période', err.exception.args[0])
def test_confirmed_allowed_day(self): def test_confirmed_allowed_day(self):
""" Test allowed day """ """ Test allowed day """
@ -154,7 +154,7 @@ class TestGolemResourceReservation(TransactionCase):
reservation = self.res_obj.create(self.data) reservation = self.res_obj.create(self.data)
with self.assertRaises(ValidationError) as err: with self.assertRaises(ValidationError) as err:
reservation.state_confirm() reservation.state_confirm()
self.assertIn('pas disponible ce jour', err.exception.args[0]) self.assertIn('pas disponible ce jour', err.exception.args[0])
def test_confirmed_allowed_hours(self): def test_confirmed_allowed_hours(self):
""" Test allowed hours """ """ Test allowed hours """
@ -162,11 +162,32 @@ class TestGolemResourceReservation(TransactionCase):
reservation = self.res_obj.create(self.data) reservation = self.res_obj.create(self.data)
with self.assertRaises(ValidationError) as err: with self.assertRaises(ValidationError) as err:
reservation.state_confirm() reservation.state_confirm()
self.assertIn(u'merci de choisir d\'autres horaires', err.exception.args[0]) self.assertIn(u'merci de choisir d\'autres horaires', err.exception.args[0])
reservation = self.res_obj.create({'resource_id': self.resource.id, reservation = self.res_obj.create({'resource_id': self.resource.id,
'date_start': '2018-02-05 05:00:00',# Out of range start hour 'date_start': '2018-02-05 05:00:00',# Out of range start hour
'date_stop': '2018-02-05 12:00:00', 'date_stop': '2018-02-05 12:00:00',
'partner_id': self.partner.id}) 'partner_id': self.partner.id})
with self.assertRaises(ValidationError) as err: with self.assertRaises(ValidationError) as err:
reservation.state_confirm() reservation.state_confirm()
self.assertIn(u'merci de choisir d\'autres horaires', err.exception.args[0]) self.assertIn(u'merci de choisir d\'autres horaires', err.exception.args[0])
def test_confirmed_other_res(self):
""" Test if there are other reservations in conflict """
reservation = self.res_obj.create(self.data)
reservation.state_confirm()
reservation2 = self.res_obj.create({
'resource_id': self.resource.id,
'date_start': '2018-02-05 10:00:00',
'date_stop': '2018-02-05 11:00:00',
'partner_id': self.partner.id
})
reservation2.state_confirm()
reservation3 = self.res_obj.create({
'resource_id': self.resource.id,
'date_start': '2018-02-05 11:20:00',
'date_stop': '2018-02-05 11:40:00',# Conflict with 2nd res
'partner_id': self.partner.id
})
with self.assertRaises(ValidationError) as err:
reservation3.state_confirm()
self.assertIn(u'déjà réservée durant cette période', err.exception.args[0])