Skip to content

armgit / wger

Public Imported from GitHub
0

Self hosted FLOSS fitness/workout, nutrition and weight tracker

Add status code to fix tests

Roland Geiderc43e4949e0de
diff --git a/wger/nutrition/tests/test_copy_plan.py b/wger/nutrition/tests/test_copy_plan.py
index 27c2a5d23..efb8ba563 100644
--- a/wger/nutrition/tests/test_copy_plan.py
+++ b/wger/nutrition/tests/test_copy_plan.py
@@ -32,7 +32,7 @@ class CopyPlanTestCase(WorkoutManagerTestCase):
# Open the copy nutritional plan form
response = self.client.get(reverse('nutrition:plan:copy', kwargs={'pk': 4}))
if fail:
- self.assertIn(response.status_code, (404, 302))
+ self.assertIn(response.status_code, (302, 403, 404))
else:
self.assertEqual(response.status_code, 302)
@@ -52,7 +52,7 @@ class CopyPlanTestCase(WorkoutManagerTestCase):
response = self.client.get(reverse('nutrition:plan:view', kwargs={'id': 4}))
if fail:
- self.assertIn(response.status_code, (404, 302))
+ self.assertIn(response.status_code, (302, 403, 404))
else:
self.assertEqual(response.status_code, 200)
diff --git a/wger/nutrition/tests/test_meal.py b/wger/nutrition/tests/test_meal.py
index 0a223f43e..01cc3afea 100644
--- a/wger/nutrition/tests/test_meal.py
+++ b/wger/nutrition/tests/test_meal.py
@@ -87,7 +87,7 @@ class PlanDetailTestCase(WorkoutManagerTestCase):
# Page exists
if fail:
- self.assertIn(response.status_code, (302, 404))
+ self.assertIn(response.status_code, (302, 403, 404))
else:
self.assertEqual(response.status_code, 200)
plan = NutritionPlan.objects.get(pk=1)
diff --git a/wger/nutrition/tests/test_plan.py.orig b/wger/nutrition/tests/test_plan.py.orig
new file mode 100644
index 000000000..d562d7a31
--- /dev/null
+++ b/wger/nutrition/tests/test_plan.py.orig
@@ -0,0 +1,108 @@
+# This file is part of wger Workout Manager.
+#
+# wger Workout Manager is free software: you can redistribute it and/or modify
+# it under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# wger Workout Manager is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with Workout Manager. If not, see <http://www.gnu.org/licenses/>.
+
+from django.core.urlresolvers import reverse
+from wger.core.tests import api_base_test
+
+from wger.nutrition.models import NutritionPlan
+from wger.manager.tests.testcase import WorkoutManagerDeleteTestCase
+from wger.manager.tests.testcase import WorkoutManagerEditTestCase
+from wger.manager.tests.testcase import WorkoutManagerTestCase
+
+
+class PlanRepresentationTestCase(WorkoutManagerTestCase):
+ '''
+ Test the representation of a model
+ '''
+
+ def test_representation(self):
+ '''
+ Test that the representation of an object is correct
+ '''
+ p = NutritionPlan.objects.get(pk=5)
+ self.assertEqual("{0}".format(p), 'Description 1')
+
+ p.description = ''
+ p.save()
+ self.assertEqual("{0}".format(p), 'Nutrition plan')
+
+
+class DeletePlanTestCase(WorkoutManagerDeleteTestCase):
+ '''
+ Tests deleting a nutritional plan
+ '''
+
+ object_class = NutritionPlan
+ url = 'nutrition:plan:delete'
+ pk = 2
+
+
+class EditPlanTestCase(WorkoutManagerEditTestCase):
+ '''
+ Tests editing an ingredient
+ '''
+
+ object_class = NutritionPlan
+ url = 'nutrition:plan:edit'
+ pk = 2
+ data = {'description': 'My new description'}
+
+
+class PlanDailyCaloriesTestCase(WorkoutManagerTestCase):
+ '''
+ Tests the handling of the daily calories in the plan page
+ '''
+ def test_overview_no_calories(self):
+ '''
+ Tests the overview page with no daily calories set
+ '''
+
+ self.user_login('test')
+
+ # Can't find goal calories text
+ response = self.client.get(reverse('nutrition:plan:view', kwargs={'id': 1}))
+ self.assertFalse(response.context['plan'].has_goal_calories)
+
+ self.assertEqual(response.status_code, 200)
+ self.assertNotContains(response, 'goal amount of calories')
+
+ def test_overview_calories(self):
+ '''
+ Tests the overview page with no daily calories set
+ '''
+
+ # Plan has daily calories goal
+ self.user_login('test')
+ plan = NutritionPlan.objects.get(pk=1)
+ plan.has_goal_calories = True
+ plan.save()
+
+ # Can find goal calories text
+ response = self.client.get(reverse('nutrition:plan:view', kwargs={'id': 1}))
+ self.assertTrue(response.context['plan'].has_goal_calories)
+ self.assertEqual(response.status_code, 200)
+ self.assertContains(response, 'goal amount of calories')
+
+
+class PlanApiTestCase(api_base_test.ApiBaseResourceTestCase):
+ '''
+ Tests the nutritional plan overview resource
+ '''
+ pk = 4
+ resource = NutritionPlan
+ private_resource = True
+ special_endpoints = ('nutritional_values',)
+ data = {'description': 'The description',
+ 'language': 1}