Self hosted FLOSS fitness/workout, nutrition and weight tracker
Fix some tests for mobile
Roland Geider53c8bc30b7df
diff --git a/wger/exercises/templates/mobile/exercise/overview.html b/wger/exercises/templates/mobile/exercise/overview.htmlindex a9c3de1f1..00029e250 100644--- a/wger/exercises/templates/mobile/exercise/overview.html+++ b/wger/exercises/templates/mobile/exercise/overview.html@@ -34,6 +34,8 @@{% endfor %}</ul></div>+ {% empty %}+ <li>{% trans "No categories." %} {% trans "Use link to create one" %}</li>{% endfor %}</div>{% endcache %}diff --git a/wger/exercises/tests/test_exercise.py b/wger/exercises/tests/test_exercise.pyindex 59ce82e64..9add1baa0 100644--- a/wger/exercises/tests/test_exercise.py+++ b/wger/exercises/tests/test_exercise.py@@ -69,9 +69,10 @@ class ExerciseIndexTestCase(WorkoutManagerTestCase):# Only authorized users see the edit linksif admin:self.assertNotContains(response, 'Only registered users can do this')- self.assertContains(response, 'Edit category')- self.assertContains(response, 'Delete category')- self.assertContains(response, 'Add category')+ if not self.is_mobile:+ self.assertContains(response, 'Edit category')+ self.assertContains(response, 'Delete category')+ self.assertContains(response, 'Add category')else:self.assertNotContains(response, 'Edit category')self.assertNotContains(response, 'Delete category')@@ -392,21 +393,28 @@ class ExercisesCacheTestCase(WorkoutManagerTestCase):'''Test the exercise overview cache is correctly generated on visit'''-- self.assertFalse(cache.get(get_template_cache_name('exercise-overview', 2)))- self.client.get(reverse('exercise-overview'))- self.assertTrue(cache.get(get_template_cache_name('exercise-overview', 2)))+ if self.is_mobile:+ self.assertFalse(cache.get(get_template_cache_name('exercise-overview-mobile', 2)))+ self.assertFalse(cache.get(get_template_cache_name('exercise-overview-search', 2)))+ self.client.get(reverse('exercise-overview'))+ self.assertTrue(cache.get(get_template_cache_name('exercise-overview-mobile', 2)))+ self.assertTrue(cache.get(get_template_cache_name('exercise-overview-search', 2)))+ else:+ self.assertFalse(cache.get(get_template_cache_name('exercise-overview', 2)))+ self.client.get(reverse('exercise-overview'))+ self.assertTrue(cache.get(get_template_cache_name('exercise-overview', 2)))def test_exercise_detail(self):'''Test that the exercise detail cache is correctly generated on visit'''- self.assertFalse(cache.get(get_template_cache_name('exercise-detail-header', 2, 2)))- self.assertFalse(cache.get(get_template_cache_name('exercise-detail-muscles', 2, 2)))- self.client.get(reverse('exercise-view', kwargs={'id': 2}))- self.assertTrue(cache.get(get_template_cache_name('exercise-detail-header', 2, 2)))- self.assertTrue(cache.get(get_template_cache_name('exercise-detail-muscles', 2, 2)))+ if not self.is_mobile:+ self.assertFalse(cache.get(get_template_cache_name('exercise-detail-header', 2, 2)))+ self.assertFalse(cache.get(get_template_cache_name('exercise-detail-muscles', 2, 2)))+ self.client.get(reverse('exercise-view', kwargs={'id': 2}))+ self.assertTrue(cache.get(get_template_cache_name('exercise-detail-header', 2, 2)))+ self.assertTrue(cache.get(get_template_cache_name('exercise-detail-muscles', 2, 2)))def test_overview_cache_update(self):'''@@ -416,6 +424,8 @@ class ExercisesCacheTestCase(WorkoutManagerTestCase):self.assertFalse(cache.get(cache_mapper.get_exercise_key(2)))self.assertFalse(cache.get(cache_mapper.get_exercise_muscle_bg_key(2)))self.assertFalse(cache.get(get_template_cache_name('muscle-overview', 2)))+ self.assertFalse(cache.get(get_template_cache_name('muscle-overview-mobile', 2)))+ self.assertFalse(cache.get(get_template_cache_name('muscle-overview-search', 2)))self.assertFalse(cache.get(get_template_cache_name('exercise-overview', 2)))self.assertFalse(cache.get(get_template_cache_name('exercise-detail-header', 2, 2)))self.assertFalse(cache.get(get_template_cache_name('exercise-detail-muscles', 2, 2)))@@ -427,6 +437,10 @@ class ExercisesCacheTestCase(WorkoutManagerTestCase):old_exercise_bg = cache.get(cache_mapper.get_exercise_muscle_bg_key(2))old_muscle_overview = cache.get(get_template_cache_name('muscle-overview', 2))old_exercise_overview = cache.get(get_template_cache_name('exercise-overview', 2))+ old_exercise_overview_mobile = cache.get(get_template_cache_name('exercise-overview-mobile',+ 2))+ old_exercise_overview_search = cache.get(get_template_cache_name('exercise-overview-search',+ 2))old_detail_header = cache.get(get_template_cache_name('exercise-detail-header', 2, 2))old_detail_muscles = cache.get(get_template_cache_name('exercise-detail-muscles', 2, 2))@@ -440,6 +454,8 @@ class ExercisesCacheTestCase(WorkoutManagerTestCase):self.assertFalse(cache.get(cache_mapper.get_exercise_muscle_bg_key(2)))self.assertFalse(cache.get(get_template_cache_name('muscle-overview', 2)))self.assertFalse(cache.get(get_template_cache_name('exercise-overview', 2)))+ self.assertFalse(cache.get(get_template_cache_name('exercise-overview-mobile', 2)))+ self.assertFalse(cache.get(get_template_cache_name('exercise-overview-search', 2)))self.assertFalse(cache.get(get_template_cache_name('exercise-detail-header', 2, 2)))self.assertFalse(cache.get(get_template_cache_name('exercise-detail-muscles', 2, 2)))@@ -451,15 +467,23 @@ class ExercisesCacheTestCase(WorkoutManagerTestCase):new_exercise_bg = cache.get(cache_mapper.get_exercise_muscle_bg_key(2))new_muscle_overview = cache.get(get_template_cache_name('muscle-overview', 2))new_exercise_overview = cache.get(get_template_cache_name('exercise-overview', 2))+ new_exercise_overview_mobile = cache.get(get_template_cache_name('exercise-overview-mobile',+ 2))+ new_exercise_overview_search = cache.get(get_template_cache_name('exercise-overview-search',+ 2))new_detail_header = cache.get(get_template_cache_name('exercise-detail-header', 2, 2))new_detail_muscles = cache.get(get_template_cache_name('exercise-detail-muscles', 2, 2))self.assertNotEqual(old_exercise.name, new_exercise.name)- self.assertNotEqual(old_exercise_bg, new_exercise_bg)- self.assertNotEqual(old_muscle_overview, new_muscle_overview)- self.assertNotEqual(old_exercise_overview, new_exercise_overview)- self.assertNotEqual(old_detail_header, new_detail_header)- self.assertNotEqual(old_detail_muscles, new_detail_muscles)+ if not self.is_mobile:+ self.assertNotEqual(old_exercise_bg, new_exercise_bg)+ self.assertNotEqual(old_exercise_overview, new_exercise_overview)+ self.assertNotEqual(old_muscle_overview, new_muscle_overview)+ self.assertNotEqual(old_detail_header, new_detail_header)+ self.assertNotEqual(old_detail_muscles, new_detail_muscles)+ else:+ self.assertNotEqual(old_exercise_overview_mobile, new_exercise_overview_mobile)+ self.assertNotEqual(old_exercise_overview_search, new_exercise_overview_search)class WorkoutCacheTestCase(WorkoutManagerTestCase):diff --git a/wger/exercises/tests/test_muscles.py b/wger/exercises/tests/test_muscles.pyindex 2c25bdad7..e71da7e85 100644--- a/wger/exercises/tests/test_muscles.py+++ b/wger/exercises/tests/test_muscles.py@@ -70,10 +70,10 @@ class MuscleCacheTestCase(WorkoutManagerTestCase):Test the muscle overview cache is correctly generated on visit'''- # No cache for overview for language 2- self.assertFalse(cache.get(get_template_cache_name('muscle-overview', 2)))- self.client.get(reverse('muscle-overview'))- self.assertTrue(cache.get(get_template_cache_name('muscle-overview', 2)))+ if not self.is_mobile:+ self.assertFalse(cache.get(get_template_cache_name('muscle-overview', 2)))+ self.client.get(reverse('muscle-overview'))+ self.assertTrue(cache.get(get_template_cache_name('muscle-overview', 2)))class MuscleOverviewTestCase(WorkoutManagerTestCase):diff --git a/wger/exercises/views/exercises.py b/wger/exercises/views/exercises.pyindex 748ee74b7..b9c8dc63e 100644--- a/wger/exercises/views/exercises.py+++ b/wger/exercises/views/exercises.py@@ -39,6 +39,7 @@ from django.views.generic import ListViewfrom django.views.generic import DeleteViewfrom django.views.generic import CreateViewfrom django.views.generic import UpdateView+import django_mobilefrom easy_thumbnails.files import get_thumbnailerfrom easy_thumbnails.alias import aliasesdiff --git a/wger/manager/tests/test_schedule.py b/wger/manager/tests/test_schedule.pyindex ea7f53404..fb77b2ae8 100644--- a/wger/manager/tests/test_schedule.py+++ b/wger/manager/tests/test_schedule.py@@ -124,7 +124,10 @@ class ScheduleTestCase(WorkoutManagerTestCase):response = self.client.get(reverse('schedule-overview'))self.assertEqual(response.status_code, 200)self.assertEqual(len(response.context['schedules']), 3)- self.assertContains(response, '<span class="label label-info">active</span>')+ if self.is_mobile:+ self.assertContains(response, '<p class="ui-li-aside"><em>active</em></p>')+ else:+ self.assertContains(response, '<span class="label label-info">active</span>')schedule = Schedule.objects.get(pk=4)schedule.is_active = Falseschedule.save()@@ -132,7 +135,10 @@ class ScheduleTestCase(WorkoutManagerTestCase):response = self.client.get(reverse('schedule-overview'))self.assertEqual(response.status_code, 200)self.assertEqual(len(response.context['schedules']), 3)- self.assertNotContains(response, '<span class="label label-info">active</span>')+ if self.is_mobile:+ self.assertNotContains(response, '<p class="ui-li-aside"><em>active</em></p>')+ else:+ self.assertNotContains(response, '<span class="label label-info">active</span>')def test_schedule_active(self):'''diff --git a/wger/manager/tests/test_set.py b/wger/manager/tests/test_set.pyindex e93521a33..e2a57ffb6 100644--- a/wger/manager/tests/test_set.py+++ b/wger/manager/tests/test_set.py@@ -44,13 +44,15 @@ class SetAddTestCase(WorkoutManagerAddTestCase):user_success = 'test'user_fail = 'admin'data = {'exercises': [1, ],+ 'exercise_list': 1, # Only for mobile version'sets': 4,'exercise1-TOTAL_FORMS': 4,'exercise1-INITIAL_FORMS': 0,'exercise1-MAX_NUM_FORMS': 1000}data_ignore = ('exercise1-TOTAL_FORMS','exercise1-INITIAL_FORMS',- 'exercise1-MAX_NUM_FORMS')+ 'exercise1-MAX_NUM_FORMS',+ 'exercise_list')def test_add_set(self, fail=False):'''@@ -61,6 +63,7 @@ class SetAddTestCase(WorkoutManagerAddTestCase):self.user_login('test')exercises_id = [1, 2]post_data = {'exercises': exercises_id,+ 'exercise_list': 1, # Only for mobile version'sets': 4,'exercise1-TOTAL_FORMS': 4,'exercise1-INITIAL_FORMS': 0,@@ -150,7 +153,9 @@ class TestSetOrderTestCase(WorkoutManagerTestCase):Helper function that adds a set to a day'''nr_sets = 4- post_data = {'exercises': exercises_id, 'sets': nr_sets}+ post_data = {'exercises': exercises_id,+ 'exercise_list': exercises_id[0], # Only for mobile version+ 'sets': nr_sets}for exercise_id in exercises_id:post_data['exercise{0}-TOTAL_FORMS'.format(exercise_id)] = nr_setspost_data['exercise{0}-INITIAL_FORMS'.format(exercise_id)] = 0@@ -176,10 +181,9 @@ class TestSetOrderTestCase(WorkoutManagerTestCase):def test_set_order(self, logged_in=False):'''- Helper function to test creating workouts+ Helper function that add some sets and checks the order'''- # Add some sets and check the orderself.user_login('test')orig = self.get_order()exercises = (1, 2, 3, 81, 84, 91, 111)diff --git a/wger/manager/tests/testcase.py b/wger/manager/tests/testcase.pyindex d5d6897dd..b29c260d9 100644--- a/wger/manager/tests/testcase.py+++ b/wger/manager/tests/testcase.py@@ -79,7 +79,7 @@ class BaseTestCase(object):# Test the mobile templatesif os.environ.get('TEST_MOBILE') == 'True':- django_mobile.set_flavour('mobile')+ settings.FLAVOURS = ('mobile',)self.is_mobile = True# Set logging level