Skip to content

armgit / wger

Public Imported from GitHub
0

Self hosted FLOSS fitness/workout, nutrition and weight tracker

Update tests

Tom Bowyer99a748948c2a
diff --git a/wger/core/tests/base_testcase.py b/wger/core/tests/base_testcase.py
index 8528b5f7c..a3b6aba76 100644
--- a/wger/core/tests/base_testcase.py
+++ b/wger/core/tests/base_testcase.py
@@ -198,7 +198,7 @@ class WgerTestCase(BaseTestCase, TestCase):
current_field_class = field.__class__.__name__
# Standard types, simply compare
- if current_field_class in ('unicode', 'str', 'int', 'float', 'time', 'date'):
+ if current_field_class in ('unicode', 'str', 'int', 'float', 'time', 'date', 'datetime'):
self.assertEqual(field, value)
# boolean, convert
diff --git a/wger/nutrition/forms.py b/wger/nutrition/forms.py
index c3390886c..be06c8fa5 100644
--- a/wger/nutrition/forms.py
+++ b/wger/nutrition/forms.py
@@ -274,8 +274,7 @@ class MealLogItemForm(MealItemForm):
attrs={
'type': 'datetime-local',
'class': 'form-control',
- 'value': datetime.now().strftime(now),
- 'max': datetime.now().strftime(now)
+ 'value': now
},
format=datetime_format,
)
@@ -291,15 +290,15 @@ class MealLogItemForm(MealItemForm):
]
def __init__(self, *args, **kwargs):
- super(MealItemForm, self).__init__(*args, **kwargs)
+ super(MealLogItemForm, self).__init__(*args, **kwargs)
- self.helper = FormHelper()
self.helper.layout = Layout(
- 'ingredient', 'ingredient_searchfield', HTML(
- '<div id="ingredient_name"></div>'),
+ 'ingredient', 'ingredient_searchfield',
Row(
Column('amount', css_class='form-group col-6 mb-0'),
Column('weight_unit', css_class='form-group col-6 mb-0'),
+ ),
+ Row(
Column('datetime', css_class='form-group col-6 mb-0'),
css_class='form-row'
)
diff --git a/wger/nutrition/tests/test_nutrition_diary.py b/wger/nutrition/tests/test_nutrition_diary.py
index bc1403615..bc1694f9b 100644
--- a/wger/nutrition/tests/test_nutrition_diary.py
+++ b/wger/nutrition/tests/test_nutrition_diary.py
@@ -240,6 +240,7 @@ class AddMealItemUnitTestCase(WgerAddTestCase):
'amount': 1,
'ingredient': 1,
'weight_unit': 1,
+ 'datetime': datetime.datetime(2022, 2, 2, tzinfo=datetime.timezone.utc)
}