0002-manager-change-semantics-of-exceptions-sources-manag.patch

Valentin Deniaud, 20 février 2020 17:53

Voir les différences: en ligne côte à côte

Subject: [PATCH 2/2] manager: change semantics of exceptions sources
 management (#18904)

 chrono/manager/static/css/style.scss          |  4 +-
 .../manager_meetings_agenda_settings.html     |  2 +-
 tests/test_manager.py                         | 54 +++++++++----------
 3 files changed, 30 insertions(+), 30 deletions(-)

chrono/manager/static/css/style.scss
70	70	font-style: italic;
71	71	}
72	72
73		.link-action-icon.upload::before {
74		content: "\f093"; /* upload-sign */
	73	.link-action-icon.settings::before {
	74	content: "\f0ad"; /* wrench */
75	75	}
76	76
77	77	.dayview h2 a,

                     <li><a class="add" rel="popup" href="{{add_time_period_url}}">{% trans 'Add a time period' %}</a></li>
                     {% if desk.timeperiod_set.count %}
                     {% url 'chrono-manager-agenda-add-time-period-exception' agenda_pk=object.pk pk=desk.pk as add_time_period_exception_url %}
                         <li><a><strong>{% trans 'Exceptions' %}</strong></a><a class="link-action-icon upload" rel="popup" href="{% url 'chrono-manager-desk-add-import-time-period-exceptions' pk=desk.pk %}" title="{% trans 'Import exceptions from .ics' %}">{% trans 'upload' %}</a></li>
                         <li><a><strong>{% trans 'Exceptions' %}</strong></a><a class="link-action-icon settings" rel="popup" href="{% url 'chrono-manager-desk-add-import-time-period-exceptions' pk=desk.pk %}" title="{% trans 'Manage exception sources' %}">{% trans 'manage exceptions' %}</a></li>
                         {% for exception in desk.get_exceptions_within_two_weeks %}
                              <li><a rel="popup" href="{% url 'chrono-manager-time-period-exception-edit' pk=exception.pk %}">
                             {{ exception }}

         login(app)
         resp = app.get('/manage/agendas/%d/' % agenda.pk).follow()
         resp = resp.click('Settings')
         assert 'Import exceptions from .ics' not in resp.text
         assert 'Manage exception sources' not in resp.text
         TimePeriod.objects.create(
             weekday=1, desk=desk, start_time=datetime.time(10, 0), end_time=datetime.time(12, 0)
-...
         resp = app.get('/manage/agendas/%d/' % agenda.pk).follow()
         resp = resp.click('Settings')
         assert 'Import exceptions from .ics' in resp.text
         resp = resp.click('upload')
         assert 'Manage exception sources' in resp.text
         resp = resp.click('manage exceptions')
         assert "To add new exceptions, you can upload a file or specify an address to a remote calendar." in resp
         resp = resp.form.submit(status=200)
         assert 'Please provide an ICS File or an URL.' in resp.text
         resp = app.get('/manage/agendas/%d/' % agenda.pk).follow()
         resp = resp.click('Settings')
         resp = resp.click('upload')
         resp = resp.click('manage exceptions')
         resp.form['ics_file'] = Upload('exceptions.ics', b'invalid content', 'text/calendar')
         resp = resp.form.submit(status=200)
         assert 'File format is invalid' in resp.text
-...
     END:VCALENDAR"""
         resp = app.get('/manage/agendas/%d/' % agenda.pk).follow()
         resp = resp.click('Settings')
         resp = resp.click('upload')
         resp = resp.click('manage exceptions')
         resp.form['ics_file'] = Upload('exceptions.ics', ics_with_exceptions, 'text/calendar')
         resp = resp.form.submit(status=302)
         assert TimePeriodException.objects.filter(desk=desk).count() == 1
-...
         login(app)
         resp = app.get('/manage/agendas/%d/' % agenda.pk).follow()
         resp = resp.click('Settings')
         resp = resp.click('upload')
         resp = resp.click('manage exceptions')
         ics_with_recurrent_exceptions = b"""BEGIN:VCALENDAR
     VERSION:2.0
     PRODID:-//foo.bar//EN
-...
         login(app)
         resp = app.get('/manage/agendas/%d/' % agenda.pk).follow()
         resp = resp.click('Settings')
         assert 'Import exceptions from .ics' not in resp.text
         assert 'Manage exception sources' not in resp.text
         TimePeriod.objects.create(
             weekday=1, desk=desk, start_time=datetime.time(10, 0), end_time=datetime.time(12, 0)
-...
         resp = app.get('/manage/agendas/%d/' % agenda.pk).follow()
         resp = resp.click('Settings')
         resp = resp.click('upload')
         resp = resp.click('manage exceptions')
         assert 'ics_file' in resp.form.fields
         assert 'ics_url' in resp.form.fields
-...
         login(app)
         resp = app.get('/manage/agendas/%d/' % agenda.pk).follow()
         resp = resp.click('Settings')
         assert 'Import exceptions from .ics' not in resp.text
         assert 'Manage exception sources' not in resp.text
         TimePeriod.objects.create(
             weekday=1, desk=desk, start_time=datetime.time(10, 0), end_time=datetime.time(12, 0)
-...
         resp = app.get('/manage/agendas/%d/' % agenda.pk).follow()
         resp = resp.click('Settings')
         resp = resp.click('upload')
         resp = resp.click('manage exceptions')
         resp.form['ics_url'] = 'http://example.com/foo.ics'
         mocked_response = mock.Mock()
         mocked_response.text = """BEGIN:VCALENDAR
-...
         login(app)
         resp = app.get('/manage/agendas/%d/' % agenda.pk).follow()
         resp = resp.click('Settings')
         assert 'Import exceptions from .ics' not in resp.text
         assert 'Manage exception sources' not in resp.text
         TimePeriod.objects.create(
             weekday=1, desk=desk, start_time=datetime.time(10, 0), end_time=datetime.time(12, 0)
-...
         resp = app.get('/manage/agendas/%d/' % agenda.pk).follow()
         resp = resp.click('Settings')
         resp = resp.click('upload')
         resp = resp.click('manage exceptions')
         assert 'ics_file' in resp.form.fields
         assert 'ics_url' in resp.form.fields
-...
         login(app)
         resp = app.get('/manage/agendas/%d/' % agenda.pk).follow()
         resp = resp.click('Settings')
         assert 'Import exceptions from .ics' not in resp.text
         assert 'Manage exception sources' not in resp.text
         TimePeriod.objects.create(
             weekday=1, desk=desk, start_time=datetime.time(10, 0), end_time=datetime.time(12, 0)
-...
         resp = app.get('/manage/agendas/%d/' % agenda.pk).follow()
         resp = resp.click('Settings')
         resp = resp.click('upload')
         resp = resp.click('manage exceptions')
         resp.form['ics_url'] = 'http://example.com/foo.ics'
         mocked_response = mock.Mock()
         mocked_response.status_code = 403
-...
         login(app)
         resp = app.get('/manage/agendas/%d/' % agenda.pk).follow()
         resp = resp.click('Settings')
         assert 'Import exceptions from .ics' not in resp.text
         assert 'Manage exception sources' not in resp.text
         TimePeriod.objects.create(
             weekday=1, desk=desk, start_time=datetime.time(10, 0), end_time=datetime.time(12, 0)
+        )
         resp = app.get('/manage/agendas/%d/' % agenda.pk).follow()
         resp = resp.click('Settings')
         resp = resp.click('upload')
         resp = resp.click('manage exceptions')
         resp.form['ics_url'] = 'https://example.com/foo.ics'
         mocked_response = mock.Mock()
         mocked_get.return_value = mocked_response
-...
         # import a source
         resp = app.get('/manage/agendas/%d/' % agenda.pk).follow()
         resp = resp.click('Settings')
         resp = resp.click('upload')
         resp = resp.click('manage exceptions')
         ics_with_recurrent_exceptions = b"""BEGIN:VCALENDAR
     VERSION:2.0
     PRODID:-//foo.bar//EN
-...
         # import another one
         resp = app.get('/manage/agendas/%d/' % agenda.pk).follow()
         resp = resp.click('Settings')
         resp = resp.click('upload')
         resp = resp.click('manage exceptions')
         resp.form['ics_file'] = Upload('exceptions.ics', ics_with_recurrent_exceptions, 'text/calendar')
         resp = resp.form.submit(status=302).follow()
         assert TimePeriodException.objects.filter(desk=desk).count() == 4
-...
         # delete the second one
         resp = app.get('/manage/agendas/%d/' % agenda.pk).follow()
         resp = resp.click('Settings')
         resp = resp.click('upload')
         resp = resp.click('manage exceptions')
         resp = resp.click(href='/manage/time-period-exceptions-source/%d/delete' % source2.pk)
         resp = resp.form.submit().follow()
         assert TimePeriodException.objects.count() == 2
-...
         # delete the first one
         resp = app.get('/manage/agendas/%d/' % agenda.pk).follow()
         resp = resp.click('Settings')
         resp = resp.click('upload')
         resp = resp.click('manage exceptions')
         resp = resp.click(href='/manage/time-period-exceptions-source/%d/delete' % source1.pk)
         resp = resp.form.submit().follow()
         assert TimePeriodException.objects.count() == 0
-...
         # import a source from a file
         resp = app.get('/manage/agendas/%d/' % agenda.pk).follow()
         resp = resp.click('Settings')
         resp = resp.click('upload')
         resp = resp.click('manage exceptions')
         resp.form['ics_file'] = Upload('exceptions.ics', ics_file_content, 'text/calendar')
         resp = resp.form.submit(status=302).follow()
         assert TimePeriodException.objects.filter(desk=desk).count() == 2
-...
         # replace the source
         resp = app.get('/manage/agendas/%d/' % agenda.pk).follow()
         resp = resp.click('Settings')
         resp = resp.click('upload')
         resp = resp.click('manage exceptions')
         resp = resp.click(href='/manage/time-period-exceptions-source/%d/replace' % source.pk)
         resp.form['ics_newfile'] = Upload('exceptions.ics', ics_file_content, 'text/calendar')
         resp = resp.form.submit().follow()
-...
         # import a source from an url
         resp = app.get('/manage/agendas/%d/' % agenda.pk).follow()
         resp = resp.click('Settings')
         resp = resp.click('upload')
         resp = resp.click('manage exceptions')
         resp.form['ics_url'] = 'http://example.com/foo.ics'
         mocked_response = mock.Mock()
         mocked_response.text = ics_url_content
-...
         # refresh the source
         resp = app.get('/manage/agendas/%d/' % agenda.pk).follow()
         resp = resp.click('Settings')
         resp = resp.click('upload')
         resp = resp.click('manage exceptions')
         mocked_response = mock.Mock()
         mocked_response.text = ics_url_content
         mocked_get.return_value = mocked_response
-...
         login(app)
         resp = app.get('/manage/agendas/%d/' % agenda.pk).follow()
         resp = resp.click('Settings')
         resp = resp.click('upload')  # TODO this view name is now incorrect, change it
         resp = resp.click('manage exceptions')
         assert 'Holidays' in resp.text
         assert 'disabled' not in resp.text
         assert 'refresh' not in resp.text
-...
         resp = resp.form.submit().follow()
         assert not TimePeriodException.objects.exists()
         resp = resp.click('upload')
         resp = resp.click('manage exceptions')
         assert 'Holidays' in resp.text
         assert 'disabled' in resp.text
         assert 'remove' not in resp.text
-...
         resp = resp.click('enable').follow()
         assert TimePeriodException.objects.exists()
         resp = resp.click('upload')
         resp = resp.click('manage exceptions')
         assert 'disabled' not in resp.text
     def test_agenda_day_view(app, admin_user, manager_user, api_user):
+    -

Projet

Général

Profil

Produits Entr'ouvert » Chrono

0002-manager-change-semantics-of-exceptions-sources-manag.patch