Projet

Général

Profil

0001-wip.patch

Emmanuel Cazenave, 27 novembre 2018 15:58

Télécharger (1,99 ko)

Voir les différences: 

Subject: [PATCH] wip


 chrono/agendas/models.py |  1 +
 tests/test_agendas.py    | 15 +++++++++++++++
 2 files changed, 16 insertions(+)
chrono/agendas/models.py
547 547 

  		




  548
  548
  
    
                if not vevent.rruleset:

  		




  549
  549
  
    
                    # classical event

  		




  
  550
  
    
                    kwargs['start_datetime'], kwargs['end_datetime'] = start_dt, end_dt

  		




  550
  551
  
    
                    obj, created = TimePeriodException.objects.update_or_create(defaults=event, **kwargs)

  		




  551
  552
  
    
                    if created:

  		




  552
  553
  
    
                        total_created += 1

  		












  

    
      tests/test_agendas.py
    
  





  1
  1
  
    
import pytest

  		




  2
  2
  
    
import datetime

  		




  3
  3
  
    
import mock

  		




  
  4
  
    
import pytz

  		




  4
  5
  
    
import re

  		




  5
  6
  
    
import requests

  		




  6
  7
  
    

  		




  ......




  202
  203
  
    
    assert exceptions_count == 2

  		




  203
  204
  
    
    assert TimePeriodException.objects.filter(desk=desk).count() == 2

  		




  204
  205
  
    

  		




  
  206
  
    

  		




  
  207
  
    
def test_timeperiodexception_creation_from_ics_already_exist():

  		




  
  208
  
    
    agenda = Agenda(label=u'Test 1 agenda')

  		




  
  209
  
    
    agenda.save()

  		




  
  210
  
    
    desk = Desk(label='Test 1 desk', agenda=agenda)

  		




  
  211
  
    
    desk.save()

  		




  
  212
  
    
    TimePeriodException.objects.create(

  		




  
  213
  
    
        desk=desk, start_datetime=make_aware(datetime.datetime(2017, 8, 31, 17, 8), pytz.UTC),

  		




  
  214
  
    
        end_datetime=make_aware(datetime.datetime(2017, 8, 31, 20, 34), pytz.UTC), label='Event 1')

  		




  
  215
  
    
    created = desk.create_timeperiod_exceptions_from_ics(ICS_SAMPLE)

  		




  
  216
  
    
    assert created == 1

  		




  
  217
  
    
    assert TimePeriodException.objects.filter(desk=desk).count() == 2

  		




  
  218
  
    

  		




  
  219
  
    

  		




  205
  220
  
    
def test_timeperiodexception_creation_from_ics_without_startdt():

  		




  206
  221
  
    
    agenda = Agenda(label=u'Test 2 agenda')

  		




  207
  222
  
    
    agenda.save()

  		




  208
  
  
    
-