trivial: reapply black
This commit is contained in:
parent
1f9aa7b373
commit
f330a22438
|
@ -5,8 +5,7 @@ import os
|
||||||
|
|
||||||
from django.utils.safestring import mark_safe
|
from django.utils.safestring import mark_safe
|
||||||
|
|
||||||
from combo_plugin_gnm.templatetags.gnm import (
|
from combo_plugin_gnm.templatetags.gnm import as_opening_hours_badge, EN_FULL_WEEKDAYS_LIST, FR_WEEKDAYS
|
||||||
as_opening_hours_badge, EN_FULL_WEEKDAYS_LIST, FR_WEEKDAYS)
|
|
||||||
|
|
||||||
|
|
||||||
BASE_DIR = os.path.dirname(os.path.dirname(__file__))
|
BASE_DIR = os.path.dirname(os.path.dirname(__file__))
|
||||||
|
@ -298,8 +297,7 @@ def test_mairie_having_both_formats():
|
||||||
}
|
}
|
||||||
"""
|
"""
|
||||||
html = as_opening_hours_badge(json.loads(geojson))
|
html = as_opening_hours_badge(json.loads(geojson))
|
||||||
assert html == '<div class="badge %s"><span>%s</span></div>' % (
|
assert html == '<div class="badge %s"><span>%s</span></div>' % ('closed', 'Réouvre lundi à 9h30')
|
||||||
'closed', 'Réouvre lundi à 9h30')
|
|
||||||
|
|
||||||
|
|
||||||
@pytest.mark.freeze_time("2021-01-21 15:37:00")
|
@pytest.mark.freeze_time("2021-01-21 15:37:00")
|
||||||
|
@ -313,27 +311,33 @@ def test_mairie_saint_genis_lavak():
|
||||||
|
|
||||||
@pytest.mark.freeze_time('2018-01-04 14:59:00')
|
@pytest.mark.freeze_time('2018-01-04 14:59:00')
|
||||||
@pytest.mark.parametrize(
|
@pytest.mark.parametrize(
|
||||||
'validFrom, validTrought, badge, message', [
|
'validFrom, validTrought, badge, message',
|
||||||
|
[
|
||||||
('2017-12-01', '2018-02-01', 'closed', 'Fermé'),
|
('2017-12-01', '2018-02-01', 'closed', 'Fermé'),
|
||||||
('2018-01-04', '2018-01-04', 'closed', 'Réouvre demain à 8h30'),
|
('2018-01-04', '2018-01-04', 'closed', 'Réouvre demain à 8h30'),
|
||||||
('2018-01-04', '2018-01-09', 'closed', "Réouvre mercredi à 8h30"),
|
('2018-01-04', '2018-01-09', 'closed', "Réouvre mercredi à 8h30"),
|
||||||
('2018-01-04', '2018-01-11', 'closed', "Fermé"),
|
('2018-01-04', '2018-01-11', 'closed', "Fermé"),
|
||||||
('2018-01-05', '2018-01-11', 'open', "Ouvert jusqu'à 17h30"),
|
('2018-01-05', '2018-01-11', 'open', "Ouvert jusqu'à 17h30"),
|
||||||
])
|
],
|
||||||
|
)
|
||||||
def test_mairie_holiday_period(validFrom, validTrought, badge, message):
|
def test_mairie_holiday_period(validFrom, validTrought, badge, message):
|
||||||
ohs = []
|
ohs = []
|
||||||
for weekday in EN_FULL_WEEKDAYS_LIST:
|
for weekday in EN_FULL_WEEKDAYS_LIST:
|
||||||
ohs.append({
|
ohs.append(
|
||||||
'opens': '08:30',
|
{
|
||||||
'closes': '17:30',
|
'opens': '08:30',
|
||||||
'dayOfWeek': 'http://schema.org/%s' % weekday,
|
'closes': '17:30',
|
||||||
'validFrom': '2018-01-01T00:00:00+01:00',
|
'dayOfWeek': 'http://schema.org/%s' % weekday,
|
||||||
'validThrough': '2018-06-30T23:59:59+01:00'
|
'validFrom': '2018-01-01T00:00:00+01:00',
|
||||||
})
|
'validThrough': '2018-06-30T23:59:59+01:00',
|
||||||
ohs.append({
|
}
|
||||||
'validFrom': '%sT00:00:00+01:00' % validFrom,
|
)
|
||||||
'validThrough': '%sT23:59:59+01:00' % validTrought,
|
ohs.append(
|
||||||
})
|
{
|
||||||
|
'validFrom': '%sT00:00:00+01:00' % validFrom,
|
||||||
|
'validThrough': '%sT23:59:59+01:00' % validTrought,
|
||||||
|
}
|
||||||
|
)
|
||||||
data = {'properties': {'openinghoursspecification': ohs}}
|
data = {'properties': {'openinghoursspecification': ohs}}
|
||||||
html = as_opening_hours_badge(data)
|
html = as_opening_hours_badge(data)
|
||||||
assert html == '<div class="badge %s"><span>%s</span></div>' % (badge, message)
|
assert html == '<div class="badge %s"><span>%s</span></div>' % (badge, message)
|
||||||
|
|
|
@ -4,8 +4,7 @@ import pytest
|
||||||
import json
|
import json
|
||||||
import os
|
import os
|
||||||
|
|
||||||
from combo_plugin_gnm.templatetags.gnm import (
|
from combo_plugin_gnm.templatetags.gnm import get_mairie_opening_hours, EN_FULL_WEEKDAYS_LIST, FR_WEEKDAYS
|
||||||
get_mairie_opening_hours, EN_FULL_WEEKDAYS_LIST, FR_WEEKDAYS)
|
|
||||||
|
|
||||||
|
|
||||||
BASE_DIR = os.path.dirname(os.path.dirname(__file__))
|
BASE_DIR = os.path.dirname(os.path.dirname(__file__))
|
||||||
|
@ -249,7 +248,7 @@ def test_mairie_saint_genis_lavak():
|
||||||
('mercredi', {'am': '08h30-12h00', 'pm': None}),
|
('mercredi', {'am': '08h30-12h00', 'pm': None}),
|
||||||
('jeudi', {'am': '08h30-12h00', 'pm': '13h30-17h30'}),
|
('jeudi', {'am': '08h30-12h00', 'pm': '13h30-17h30'}),
|
||||||
('vendredi', {'am': '08h30-12h00', 'pm': '13h30-17h30'}),
|
('vendredi', {'am': '08h30-12h00', 'pm': '13h30-17h30'}),
|
||||||
('samedi', {'am': '09h00-12h00', 'pm': None})
|
('samedi', {'am': '09h00-12h00', 'pm': None}),
|
||||||
]
|
]
|
||||||
|
|
||||||
|
|
||||||
|
@ -265,7 +264,7 @@ def test_mairie_holiday_day():
|
||||||
('mercredi', {'am': '08h30-12h00', 'pm': '13h30-17h00'}),
|
('mercredi', {'am': '08h30-12h00', 'pm': '13h30-17h00'}),
|
||||||
('jeudi', {'am': '08h30-12h00', 'pm': '13h30-17h00'}),
|
('jeudi', {'am': '08h30-12h00', 'pm': '13h30-17h00'}),
|
||||||
('vendredi', {'am': '08h30-12h00', 'pm': '13h30-17h00'}),
|
('vendredi', {'am': '08h30-12h00', 'pm': '13h30-17h00'}),
|
||||||
('samedi', {'am': '08h30-12h00', 'pm': None})
|
('samedi', {'am': '08h30-12h00', 'pm': None}),
|
||||||
]
|
]
|
||||||
|
|
||||||
# Feyzin, using dates
|
# Feyzin, using dates
|
||||||
|
@ -277,19 +276,21 @@ def test_mairie_holiday_day():
|
||||||
('mardi', {'am': '08h30-12h00', 'pm': '13h30-17h30'}),
|
('mardi', {'am': '08h30-12h00', 'pm': '13h30-17h30'}),
|
||||||
('mercredi', {'am': '08h30-12h00', 'pm': '13h30-17h30'}),
|
('mercredi', {'am': '08h30-12h00', 'pm': '13h30-17h30'}),
|
||||||
('jeudi', {'am': '08h30-12h00', 'pm': '13h30-17h30'}),
|
('jeudi', {'am': '08h30-12h00', 'pm': '13h30-17h30'}),
|
||||||
('vendredi', {'am': '08h30-12h00', 'pm': '13h30-17h30'})
|
('vendredi', {'am': '08h30-12h00', 'pm': '13h30-17h30'}),
|
||||||
]
|
]
|
||||||
|
|
||||||
|
|
||||||
@pytest.mark.freeze_time('2018-01-04 14:59:00')
|
@pytest.mark.freeze_time('2018-01-04 14:59:00')
|
||||||
@pytest.mark.parametrize(
|
@pytest.mark.parametrize(
|
||||||
'validFrom, validTrought, is_open', [
|
'validFrom, validTrought, is_open',
|
||||||
|
[
|
||||||
('2017-12-01', '2018-02-01', [False, False, False, False, False, False, False]),
|
('2017-12-01', '2018-02-01', [False, False, False, False, False, False, False]),
|
||||||
('2018-01-04', '2018-01-04', [True, True, True, False, True, True, True]),
|
('2018-01-04', '2018-01-04', [True, True, True, False, True, True, True]),
|
||||||
('2018-01-05', '2018-01-07', [True, True, True, True, False, False, False]),
|
('2018-01-05', '2018-01-07', [True, True, True, True, False, False, False]),
|
||||||
('2018-01-05', '2018-01-09', [False, False, True, True, False, False, False]),
|
('2018-01-05', '2018-01-09', [False, False, True, True, False, False, False]),
|
||||||
('2018-01-05', '2018-01-11', [False, False, False, True, False, False, False]),
|
('2018-01-05', '2018-01-11', [False, False, False, True, False, False, False]),
|
||||||
])
|
],
|
||||||
|
)
|
||||||
def test_mairie_holiday_period(validFrom, validTrought, is_open):
|
def test_mairie_holiday_period(validFrom, validTrought, is_open):
|
||||||
# buid expected time table
|
# buid expected time table
|
||||||
open_day = {'am': '08h30-17h30', 'pm': ''}
|
open_day = {'am': '08h30-17h30', 'pm': ''}
|
||||||
|
@ -306,17 +307,21 @@ def test_mairie_holiday_period(validFrom, validTrought, is_open):
|
||||||
|
|
||||||
ohs = []
|
ohs = []
|
||||||
for weekday in EN_FULL_WEEKDAYS_LIST:
|
for weekday in EN_FULL_WEEKDAYS_LIST:
|
||||||
ohs.append({
|
ohs.append(
|
||||||
'opens': '08:30',
|
{
|
||||||
'closes': '17:30',
|
'opens': '08:30',
|
||||||
'dayOfWeek': 'http://schema.org/%s' % weekday,
|
'closes': '17:30',
|
||||||
'validFrom': '2018-01-01T00:00:00+01:00',
|
'dayOfWeek': 'http://schema.org/%s' % weekday,
|
||||||
'validThrough': '2018-06-30T23:59:59+01:00'
|
'validFrom': '2018-01-01T00:00:00+01:00',
|
||||||
})
|
'validThrough': '2018-06-30T23:59:59+01:00',
|
||||||
ohs.append({
|
}
|
||||||
'validFrom': '%sT00:00:00+01:00' % validFrom,
|
)
|
||||||
'validThrough': '%sT23:59:59+01:00' % validTrought,
|
ohs.append(
|
||||||
})
|
{
|
||||||
|
'validFrom': '%sT00:00:00+01:00' % validFrom,
|
||||||
|
'validThrough': '%sT23:59:59+01:00' % validTrought,
|
||||||
|
}
|
||||||
|
)
|
||||||
data = {'properties': {'openinghoursspecification': ohs}}
|
data = {'properties': {'openinghoursspecification': ohs}}
|
||||||
time_table = get_mairie_opening_hours(data)
|
time_table = get_mairie_opening_hours(data)
|
||||||
assert time_table == expected
|
assert time_table == expected
|
||||||
|
|
Loading…
Reference in New Issue