Self hosted FLOSS fitness/workout, nutrition and weight tracker
Move testcase file to core
Roland Geider52ae72ff493f
diff --git a/wger/config/tests/test_gym_config.py b/wger/config/tests/test_gym_config.pyindex 866c4e841..0e4ac191f 100644--- a/wger/config/tests/test_gym_config.py+++ b/wger/config/tests/test_gym_config.py@@ -20,8 +20,8 @@ from django.core.urlresolvers import reversefrom wger.config.models import GymConfigfrom wger.core.models import UserProfile+from wger.core.tests.base_testcase import WorkoutManagerTestCasefrom wger.gym.models import Gym, GymUserConfig-from wger.manager.tests.testcase import WorkoutManagerTestCaseclass GymConfigTestCase(WorkoutManagerTestCase):diff --git a/wger/config/tests/test_language_config.py b/wger/config/tests/test_language_config.pyindex 971b88065..0c5119c70 100644--- a/wger/config/tests/test_language_config.py+++ b/wger/config/tests/test_language_config.py@@ -17,7 +17,7 @@from wger.config.models import LanguageConfig-from wger.manager.tests.testcase import WorkoutManagerEditTestCase+from wger.core.tests.base_testcase import WorkoutManagerEditTestCaseclass EditLanguageConfigTestCase(WorkoutManagerEditTestCase):diff --git a/wger/core/tests/api_base_test.py b/wger/core/tests/api_base_test.pyindex 1563083b5..2cb18753d 100644--- a/wger/core/tests/api_base_test.py+++ b/wger/core/tests/api_base_test.py@@ -17,7 +17,7 @@ from django.contrib.auth.models import Userfrom rest_framework import statusfrom rest_framework.test import APITestCase-from wger.manager.tests.testcase import BaseTestCase+from wger.core.tests.base_testcase import BaseTestCaseclass ApiBaseTestCase(APITestCase):diff --git a/wger/manager/tests/testcase.py b/wger/core/tests/base_testcase.pysimilarity index 100%rename from wger/manager/tests/testcase.pyrename to wger/core/tests/base_testcase.pydiff --git a/wger/core/tests/test_apikey.py b/wger/core/tests/test_apikey.pyindex d619f1747..d7a376531 100644--- a/wger/core/tests/test_apikey.py+++ b/wger/core/tests/test_apikey.py@@ -14,12 +14,11 @@import logging-from django.core.urlresolvers import reversefrom django.contrib.auth.models import User-+from django.core.urlresolvers import reversefrom rest_framework.authtoken.models import Token-from wger.manager.tests.testcase import WorkoutManagerTestCase+from wger.core.tests.base_testcase import WorkoutManagerTestCaselogger = logging.getLogger(__name__)diff --git a/wger/core/tests/test_change_password.py b/wger/core/tests/test_change_password.pyindex 41101e2bb..1e08ed703 100644--- a/wger/core/tests/test_change_password.py+++ b/wger/core/tests/test_change_password.py@@ -14,10 +14,10 @@import logging-from django.core.urlresolvers import reversefrom django.contrib.auth.models import User+from django.core.urlresolvers import reverse-from wger.manager.tests.testcase import WorkoutManagerTestCase+from wger.core.tests.base_testcase import WorkoutManagerTestCaselogger = logging.getLogger(__name__)diff --git a/wger/core/tests/test_daysofweek.py b/wger/core/tests/test_daysofweek.pyindex c4daaad11..22d3e8673 100644--- a/wger/core/tests/test_daysofweek.py+++ b/wger/core/tests/test_daysofweek.py@@ -15,7 +15,7 @@from wger.core.models import DaysOfWeekfrom wger.core.tests import api_base_test-from wger.manager.tests.testcase import WorkoutManagerTestCase+from wger.core.tests.base_testcase import WorkoutManagerTestCaseclass DaysOfWeekRepresentationTestCase(WorkoutManagerTestCase):diff --git a/wger/core/tests/test_delete_user.py b/wger/core/tests/test_delete_user.pyindex f6db78e88..bf9a0dc82 100644--- a/wger/core/tests/test_delete_user.py+++ b/wger/core/tests/test_delete_user.py@@ -14,10 +14,10 @@import logging-from django.core.urlresolvers import reversefrom django.contrib.auth.models import User+from django.core.urlresolvers import reverse-from wger.manager.tests.testcase import WorkoutManagerTestCase+from wger.core.tests.base_testcase import WorkoutManagerTestCaselogger = logging.getLogger(__name__)diff --git a/wger/core/tests/test_feedback.py b/wger/core/tests/test_feedback.pyindex 107e7192a..55a083a51 100644--- a/wger/core/tests/test_feedback.py+++ b/wger/core/tests/test_feedback.py@@ -12,11 +12,10 @@## You should have received a copy of the GNU Affero General Public License-from django.core.urlresolvers import reversefrom django.core import mail+from django.core.urlresolvers import reverse--from wger.manager.tests.testcase import WorkoutManagerTestCase+from wger.core.tests.base_testcase import WorkoutManagerTestCaseclass FeedbackTestCase(WorkoutManagerTestCase):diff --git a/wger/core/tests/test_index.py b/wger/core/tests/test_index.pyindex bf2818959..ca92f6e95 100644--- a/wger/core/tests/test_index.py+++ b/wger/core/tests/test_index.py@@ -15,12 +15,11 @@from django.core.urlresolvers import reverse-from wger.nutrition.models import NutritionPlan+from wger.core.tests.base_testcase import WorkoutManagerTestCasefrom wger.manager.models import Workout+from wger.nutrition.models import NutritionPlanfrom wger.weight.models import WeightEntry-from wger.manager.tests.testcase import WorkoutManagerTestCase-class DashboardTestCase(WorkoutManagerTestCase):'''diff --git a/wger/core/tests/test_language.py b/wger/core/tests/test_language.pyindex 1c2f6848e..d2e2b3bda 100644--- a/wger/core/tests/test_language.py+++ b/wger/core/tests/test_language.py@@ -16,13 +16,13 @@# along with Workout Manager. If not, see <http://www.gnu.org/licenses/>.from django.core.urlresolvers import reverse_lazy+from wger.core.models import Languagefrom wger.core.tests import api_base_test--from wger.manager.tests.testcase import WorkoutManagerDeleteTestCase, WorkoutManagerTestCase-from wger.manager.tests.testcase import WorkoutManagerEditTestCase-from wger.manager.tests.testcase import WorkoutManagerAddTestCase-from wger.manager.tests.testcase import WorkoutManagerAccessTestCase+from wger.core.tests.base_testcase import WorkoutManagerAccessTestCase+from wger.core.tests.base_testcase import WorkoutManagerAddTestCase+from wger.core.tests.base_testcase import WorkoutManagerDeleteTestCase, WorkoutManagerTestCase+from wger.core.tests.base_testcase import WorkoutManagerEditTestCaseclass LanguageRepresentationTestCase(WorkoutManagerTestCase):diff --git a/wger/core/tests/test_license.py b/wger/core/tests/test_license.pyindex 6fc06bc0e..5780cbb41 100644--- a/wger/core/tests/test_license.py+++ b/wger/core/tests/test_license.py@@ -15,11 +15,10 @@from wger.core.models import Licensefrom wger.core.tests import api_base_test--from wger.manager.tests.testcase import WorkoutManagerAccessTestCase, WorkoutManagerTestCase-from wger.manager.tests.testcase import WorkoutManagerDeleteTestCase-from wger.manager.tests.testcase import WorkoutManagerEditTestCase-from wger.manager.tests.testcase import WorkoutManagerAddTestCase+from wger.core.tests.base_testcase import WorkoutManagerAccessTestCase, WorkoutManagerTestCase+from wger.core.tests.base_testcase import WorkoutManagerAddTestCase+from wger.core.tests.base_testcase import WorkoutManagerDeleteTestCase+from wger.core.tests.base_testcase import WorkoutManagerEditTestCaseclass LicenseRepresentationTestCase(WorkoutManagerTestCase):diff --git a/wger/core/tests/test_preferences.py b/wger/core/tests/test_preferences.pyindex b7eeffc34..f44e545a2 100644--- a/wger/core/tests/test_preferences.py+++ b/wger/core/tests/test_preferences.py@@ -12,16 +12,16 @@## You should have received a copy of the GNU Affero General Public License-import loggingimport datetimeimport decimal+import logging-from django.core.urlresolvers import reversefrom django.contrib.auth.models import User+from django.core.urlresolvers import reverse+from wger.core.tests.base_testcase import WorkoutManagerTestCasefrom wger.utils.constants import TWOPLACESfrom wger.weight.models import WeightEntry-from wger.manager.tests.testcase import WorkoutManagerTestCaselogger = logging.getLogger(__name__)diff --git a/wger/core/tests/test_registration.py b/wger/core/tests/test_registration.pyindex eec53efc1..9f2ed89b8 100644--- a/wger/core/tests/test_registration.py+++ b/wger/core/tests/test_registration.py@@ -14,12 +14,12 @@import logging-from django.core.urlresolvers import reversefrom django.contrib.auth.models import User+from django.core.urlresolvers import reverse+from wger.core.forms import RegistrationFormfrom wger.core.forms import RegistrationFormNoCaptcha--from wger.manager.tests.testcase import WorkoutManagerTestCase+from wger.core.tests.base_testcase import WorkoutManagerTestCaselogger = logging.getLogger(__name__)diff --git a/wger/core/tests/test_repetition_unit.py b/wger/core/tests/test_repetition_unit.pyindex 883f83219..e144dfb16 100644--- a/wger/core/tests/test_repetition_unit.py+++ b/wger/core/tests/test_repetition_unit.py@@ -16,7 +16,7 @@from wger.core.models import RepetitionUnitfrom wger.core.tests import api_base_test-from wger.manager.tests.testcase import (+from wger.core.tests.base_testcase import (WorkoutManagerAccessTestCase,WorkoutManagerTestCase,WorkoutManagerDeleteTestCase,diff --git a/wger/core/tests/test_robots_txt.py b/wger/core/tests/test_robots_txt.pyindex 55d8f6544..4fb401971 100644--- a/wger/core/tests/test_robots_txt.py+++ b/wger/core/tests/test_robots_txt.py@@ -14,9 +14,9 @@import sixfrom django.core.urlresolvers import reverse-from wger.core.models import Language-from wger.manager.tests.testcase import WorkoutManagerTestCase+from wger.core.models import Language+from wger.core.tests.base_testcase import WorkoutManagerTestCaseclass RobotsTxtTestCase(WorkoutManagerTestCase):diff --git a/wger/core/tests/test_sitemap.py b/wger/core/tests/test_sitemap.pyindex faee58319..e0225f5f8 100644--- a/wger/core/tests/test_sitemap.py+++ b/wger/core/tests/test_sitemap.py@@ -14,7 +14,7 @@from django.core.urlresolvers import reverse-from wger.manager.tests.testcase import WorkoutManagerTestCase+from wger.core.tests.base_testcase import WorkoutManagerTestCaseclass SitemapTestCase(WorkoutManagerTestCase):diff --git a/wger/core/tests/test_spaceless.py b/wger/core/tests/test_spaceless.pyindex 6f7130e59..0bdbfd06d 100644--- a/wger/core/tests/test_spaceless.py+++ b/wger/core/tests/test_spaceless.py@@ -16,7 +16,7 @@ import loggingfrom django.template import Template, Context-from wger.manager.tests.testcase import WorkoutManagerTestCase+from wger.core.tests.base_testcase import WorkoutManagerTestCaselogger = logging.getLogger(__name__)diff --git a/wger/core/tests/test_temporary_users.py b/wger/core/tests/test_temporary_users.pyindex 31e8a4a73..56138a707 100644--- a/wger/core/tests/test_temporary_users.py+++ b/wger/core/tests/test_temporary_users.py@@ -15,21 +15,21 @@import datetimeimport random-from django.core.urlresolvers import reverse-from django.core.management import call_commandfrom django.contrib.auth.models import User+from django.core.management import call_command+from django.core.urlresolvers import reverse-from wger.manager.models import ScheduleStep+from wger.core.demo import create_demo_entries+from wger.core.demo import create_temporary_user+from wger.core.tests.base_testcase import WorkoutManagerTestCase+from wger.manager.models import Dayfrom wger.manager.models import Schedule+from wger.manager.models import ScheduleStepfrom wger.manager.models import Workout-from wger.manager.models import Dayfrom wger.manager.models import WorkoutLog-from wger.nutrition.models import NutritionPlanfrom wger.nutrition.models import Meal+from wger.nutrition.models import NutritionPlanfrom wger.weight.models import WeightEntry-from wger.manager.tests.testcase import WorkoutManagerTestCase-from wger.core.demo import create_temporary_user-from wger.core.demo import create_demo_entriesclass DemoUserTestCase(WorkoutManagerTestCase):diff --git a/wger/core/tests/test_user.py b/wger/core/tests/test_user.pyindex 744e8472c..d0b391931 100644--- a/wger/core/tests/test_user.py+++ b/wger/core/tests/test_user.py@@ -15,7 +15,7 @@from django.contrib.auth.models import Userfrom django.core.urlresolvers import reverse, reverse_lazy-from wger.manager.tests.testcase import (+from wger.core.tests.base_testcase import (WorkoutManagerTestCase,WorkoutManagerEditTestCase,WorkoutManagerAccessTestCasediff --git a/wger/core/tests/test_weight_unit.py b/wger/core/tests/test_weight_unit.pyindex e310cea93..a61347584 100644--- a/wger/core/tests/test_weight_unit.py+++ b/wger/core/tests/test_weight_unit.py@@ -16,7 +16,7 @@from wger.core.models import WeightUnitfrom wger.core.tests import api_base_test-from wger.manager.tests.testcase import (+from wger.core.tests.base_testcase import (WorkoutManagerAccessTestCase,WorkoutManagerTestCase,WorkoutManagerDeleteTestCase,diff --git a/wger/email/tests/test_gym_emails.py b/wger/email/tests/test_gym_emails.pyindex dbf968109..fc7be7e97 100644--- a/wger/email/tests/test_gym_emails.py+++ b/wger/email/tests/test_gym_emails.py@@ -14,11 +14,8 @@from django.core.urlresolvers import reverse-from wger.email.models import Log-from wger.manager.tests.testcase import (+from wger.core.tests.base_testcase import (WorkoutManagerAccessTestCase,- WorkoutManagerEditTestCase,- WorkoutManagerAddTestCase,)diff --git a/wger/exercises/tests/test_categories.py b/wger/exercises/tests/test_categories.pyindex 3d84cd8b4..ac8d3fb89 100644--- a/wger/exercises/tests/test_categories.py+++ b/wger/exercises/tests/test_categories.py@@ -14,17 +14,16 @@from django.core.cache import cachefrom django.core.urlresolvers import reverse-from wger.core.tests import api_base_test--from wger.exercises.models import ExerciseCategory-from wger.utils.cache import get_template_cache_name-from wger.manager.tests.testcase import (+from wger.core.tests import api_base_test+from wger.core.tests.base_testcase import (WorkoutManagerDeleteTestCase,WorkoutManagerTestCase,WorkoutManagerEditTestCase,WorkoutManagerAddTestCase,WorkoutManagerAccessTestCase)+from wger.exercises.models import ExerciseCategory+from wger.utils.cache import get_template_cache_nameclass ExerciseCategoryRepresentationTestCase(WorkoutManagerTestCase):diff --git a/wger/exercises/tests/test_corrected_exercise.py b/wger/exercises/tests/test_corrected_exercise.pyindex 3b8cf3957..bc43c2e12 100644--- a/wger/exercises/tests/test_corrected_exercise.py+++ b/wger/exercises/tests/test_corrected_exercise.py@@ -15,10 +15,9 @@from django.core import mailfrom django.core.urlresolvers import reverse+from wger.core.tests.base_testcase import WorkoutManagerTestCasefrom wger.exercises.models import Exercise-from wger.manager.tests.testcase import WorkoutManagerTestCase-class ExercisesCorrectionTestCase(WorkoutManagerTestCase):'''diff --git a/wger/exercises/tests/test_equipment.py b/wger/exercises/tests/test_equipment.pyindex 456dd03c9..7fa43725f 100644--- a/wger/exercises/tests/test_equipment.py+++ b/wger/exercises/tests/test_equipment.py@@ -13,19 +13,18 @@# 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 reversefrom django.core.cache import cache-from wger.core.tests import api_base_test--from wger.exercises.models import Equipment, Exercise+from django.core.urlresolvers import reverse-from wger.manager.tests.testcase import (+from wger.core.tests import api_base_test+from wger.core.tests.base_testcase import (WorkoutManagerTestCase,WorkoutManagerDeleteTestCase,WorkoutManagerEditTestCase,WorkoutManagerAddTestCase)-from wger.utils.cache import get_template_cache_name, cache_mapper+from wger.exercises.models import Equipment, Exercise+from wger.utils.cache import get_template_cache_namefrom wger.utils.constants import PAGINATION_OBJECTS_PER_PAGEdiff --git a/wger/exercises/tests/test_exercise.py b/wger/exercises/tests/test_exercise.pyindex 449961113..69fcb767e 100644--- a/wger/exercises/tests/test_exercise.py+++ b/wger/exercises/tests/test_exercise.py@@ -15,20 +15,19 @@import jsonfrom django.core import mail-from django.core.urlresolvers import reversefrom django.core.cache import cache-from wger.core.tests import api_base_test+from django.core.urlresolvers import reverse+from wger.core.tests.base_testcase import (+ STATUS_CODES_FAIL,+ WorkoutManagerTestCase,+ WorkoutManagerDeleteTestCase+)from wger.exercises.models import (Exercise,Muscle,ExerciseCategory,)-from wger.manager.tests.testcase import (- STATUS_CODES_FAIL,- WorkoutManagerTestCase,- WorkoutManagerDeleteTestCase-)from wger.utils.cache import get_template_cache_name, cache_mapperdiff --git a/wger/exercises/tests/test_exercise_comments.py b/wger/exercises/tests/test_exercise_comments.pyindex cd3bb4fe2..86385d18c 100644--- a/wger/exercises/tests/test_exercise_comments.py+++ b/wger/exercises/tests/test_exercise_comments.py@@ -13,17 +13,16 @@# You should have received a copy of the GNU Affero General Public License-from django.core.urlresolvers import reversefrom django.core.cache import cache-from wger.core.tests import api_base_test--from wger.exercises.models import Exercise, ExerciseComment+from django.core.urlresolvers import reverse-from wger.manager.tests.testcase import (+from wger.core.tests import api_base_test+from wger.core.tests.base_testcase import (WorkoutManagerTestCase,WorkoutManagerEditTestCase,WorkoutManagerAddTestCase)+from wger.exercises.models import Exercise, ExerciseCommentfrom wger.utils.cache import cache_mapperdiff --git a/wger/exercises/tests/test_exercise_images.py b/wger/exercises/tests/test_exercise_images.pyindex 8fa4248ae..f3db1b416 100644--- a/wger/exercises/tests/test_exercise_images.py+++ b/wger/exercises/tests/test_exercise_images.py@@ -12,18 +12,16 @@## You should have received a copy of the GNU Affero General Public License-from django.core.urlresolvers import reversefrom django.core.files import File-from wger.core.tests import api_base_test--from wger.exercises.models import Exercise, ExerciseImage+from django.core.urlresolvers import reverse-from wger.manager.tests.testcase import (+from wger.core.tests.base_testcase import (WorkoutManagerTestCase,WorkoutManagerEditTestCase,WorkoutManagerAddTestCase,WorkoutManagerDeleteTestCase)+from wger.exercises.models import Exercise, ExerciseImageclass MainImageTestCase(WorkoutManagerTestCase):diff --git a/wger/exercises/tests/test_muscles.py b/wger/exercises/tests/test_muscles.pyindex 7bec0e3bf..2c2c5a279 100644--- a/wger/exercises/tests/test_muscles.py+++ b/wger/exercises/tests/test_muscles.py@@ -13,18 +13,17 @@# You should have received a copy of the GNU Affero General Public License-from django.core.urlresolvers import reversefrom django.core.cache import cache-from wger.core.tests import api_base_test--from wger.exercises.models import Muscle+from django.core.urlresolvers import reverse-from wger.manager.tests.testcase import (+from wger.core.tests import api_base_test+from wger.core.tests.base_testcase import (WorkoutManagerTestCase,WorkoutManagerDeleteTestCase,WorkoutManagerEditTestCase,WorkoutManagerAddTestCase,WorkoutManagerAccessTestCase)+from wger.exercises.models import Musclefrom wger.utils.cache import get_template_cache_namediff --git a/wger/exercises/tests/test_submitted_exercise.py b/wger/exercises/tests/test_submitted_exercise.pyindex 36abeb271..f4da317d3 100644--- a/wger/exercises/tests/test_submitted_exercise.py+++ b/wger/exercises/tests/test_submitted_exercise.py@@ -15,10 +15,9 @@from django.core import mailfrom django.core.urlresolvers import reverse+from wger.core.tests.base_testcase import STATUS_CODES_FAIL, WorkoutManagerTestCasefrom wger.exercises.models import Exercise-from wger.manager.tests.testcase import STATUS_CODES_FAIL, WorkoutManagerTestCase-class ExercisesPendingTestCase(WorkoutManagerTestCase):'''diff --git a/wger/exercises/tests/test_submitted_image.py b/wger/exercises/tests/test_submitted_image.pyindex cad128740..77bef88a0 100644--- a/wger/exercises/tests/test_submitted_image.py+++ b/wger/exercises/tests/test_submitted_image.py@@ -15,10 +15,9 @@from django.core import mailfrom django.core.urlresolvers import reverse+from wger.core.tests.base_testcase import WorkoutManagerTestCasefrom wger.exercises.models import ExerciseImage-from wger.manager.tests.testcase import WorkoutManagerTestCase-class ImagePendingDetailTestCase(WorkoutManagerTestCase):'''diff --git a/wger/gym/tests/test_admin_config.py b/wger/gym/tests/test_admin_config.pyindex 3ece92ca8..a05f17570 100644--- a/wger/gym/tests/test_admin_config.py+++ b/wger/gym/tests/test_admin_config.py@@ -12,7 +12,7 @@## You should have received a copy of the GNU Affero General Public License-from wger.manager.tests.testcase import WorkoutManagerEditTestCase+from wger.core.tests.base_testcase import WorkoutManagerEditTestCasefrom wger.gym.models import GymAdminConfigdiff --git a/wger/gym/tests/test_admin_user_notes.py b/wger/gym/tests/test_admin_user_notes.pyindex 82807bc60..6fdc01869 100644--- a/wger/gym/tests/test_admin_user_notes.py+++ b/wger/gym/tests/test_admin_user_notes.py@@ -14,12 +14,11 @@from django.core.urlresolvers import reverse_lazy-from wger.manager.tests.testcase import delete_testcase_add_methods-from wger.manager.tests.testcase import WorkoutManagerAccessTestCase-from wger.manager.tests.testcase import WorkoutManagerAddTestCase-from wger.manager.tests.testcase import WorkoutManagerDeleteTestCase-from wger.manager.tests.testcase import WorkoutManagerEditTestCase-+from wger.core.tests.base_testcase import WorkoutManagerAccessTestCase+from wger.core.tests.base_testcase import WorkoutManagerAddTestCase+from wger.core.tests.base_testcase import WorkoutManagerDeleteTestCase+from wger.core.tests.base_testcase import WorkoutManagerEditTestCase+from wger.core.tests.base_testcase import delete_testcase_add_methodsfrom wger.gym.models import AdminUserNotediff --git a/wger/gym/tests/test_config.py b/wger/gym/tests/test_config.pyindex 2cc79c1cf..5d5fb4859 100644--- a/wger/gym/tests/test_config.py+++ b/wger/gym/tests/test_config.py@@ -13,10 +13,9 @@# 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 wger.core.tests.base_testcase import WorkoutManagerEditTestCasefrom wger.gym.models import GymConfig-from wger.manager.tests.testcase import WorkoutManagerEditTestCase-class EditGymConfigTestCase(WorkoutManagerEditTestCase):'''diff --git a/wger/gym/tests/test_contract_options.py b/wger/gym/tests/test_contract_options.pyindex 36fe079e7..4e20cd71d 100644--- a/wger/gym/tests/test_contract_options.py+++ b/wger/gym/tests/test_contract_options.py@@ -14,14 +14,13 @@from django.core.urlresolvers import reverse--from wger.gym.models import ContractOption-from wger.manager.tests.testcase import (+from wger.core.tests.base_testcase import (WorkoutManagerEditTestCase,WorkoutManagerAddTestCase,WorkoutManagerDeleteTestCase,WorkoutManagerAccessTestCase,delete_testcase_add_methods)+from wger.gym.models import ContractOptionclass AddContractOptionTestCase(WorkoutManagerAddTestCase):diff --git a/wger/gym/tests/test_contract_types.py b/wger/gym/tests/test_contract_types.pyindex 81239f510..4e7e48523 100644--- a/wger/gym/tests/test_contract_types.py+++ b/wger/gym/tests/test_contract_types.py@@ -14,14 +14,13 @@from django.core.urlresolvers import reverse--from wger.gym.models import ContractType-from wger.manager.tests.testcase import (+from wger.core.tests.base_testcase import (WorkoutManagerEditTestCase,WorkoutManagerAddTestCase,WorkoutManagerDeleteTestCase,WorkoutManagerAccessTestCase,delete_testcase_add_methods)+from wger.gym.models import ContractTypeclass AddContractTypeTestCase(WorkoutManagerAddTestCase):diff --git a/wger/gym/tests/test_contracts.py b/wger/gym/tests/test_contracts.pyindex b88bc36a3..3ecaf7464 100644--- a/wger/gym/tests/test_contracts.py+++ b/wger/gym/tests/test_contracts.py@@ -14,12 +14,12 @@from django.core.urlresolvers import reverse-from wger.gym.models import Contract-from wger.manager.tests.testcase import (+from wger.core.tests.base_testcase import (WorkoutManagerAccessTestCase,WorkoutManagerEditTestCase,WorkoutManagerAddTestCase,)+from wger.gym.models import Contractclass AddContractTestCase(WorkoutManagerAddTestCase):diff --git a/wger/gym/tests/test_export.py b/wger/gym/tests/test_export.pyindex 75bfa0efc..e9e755c6f 100644--- a/wger/gym/tests/test_export.py+++ b/wger/gym/tests/test_export.py@@ -16,7 +16,7 @@ import datetimefrom django.core.urlresolvers import reverse-from wger.manager.tests.testcase import WorkoutManagerTestCase+from wger.core.tests.base_testcase import WorkoutManagerTestCasefrom wger.gym.models import Gymdiff --git a/wger/gym/tests/test_gym.py b/wger/gym/tests/test_gym.pyindex ee359bcad..f4180f055 100644--- a/wger/gym/tests/test_gym.py+++ b/wger/gym/tests/test_gym.py@@ -15,13 +15,13 @@from django.core.urlresolvers import reverse_lazyfrom wger.core.models import UserProfile+from wger.core.tests.base_testcase import WorkoutManagerAccessTestCase+from wger.core.tests.base_testcase import WorkoutManagerAddTestCase+from wger.core.tests.base_testcase import WorkoutManagerDeleteTestCase+from wger.core.tests.base_testcase import WorkoutManagerEditTestCase+from wger.core.tests.base_testcase import WorkoutManagerTestCase+from wger.core.tests.base_testcase import delete_testcase_add_methodsfrom wger.gym.models import Gym-from wger.manager.tests.testcase import delete_testcase_add_methods-from wger.manager.tests.testcase import WorkoutManagerTestCase-from wger.manager.tests.testcase import WorkoutManagerAccessTestCase-from wger.manager.tests.testcase import WorkoutManagerDeleteTestCase-from wger.manager.tests.testcase import WorkoutManagerEditTestCase-from wger.manager.tests.testcase import WorkoutManagerAddTestCaseclass GymRepresentationTestCase(WorkoutManagerTestCase):diff --git a/wger/gym/tests/test_inactive_members.py b/wger/gym/tests/test_inactive_members.pyindex 79f621e79..07867cd8d 100644--- a/wger/gym/tests/test_inactive_members.py+++ b/wger/gym/tests/test_inactive_members.py@@ -12,10 +12,10 @@## You should have received a copy of the GNU Affero General Public License-from django.core.management import call_commandfrom django.core import mail+from django.core.management import call_command-from wger.manager.tests.testcase import WorkoutManagerTestCase+from wger.core.tests.base_testcase import WorkoutManagerTestCaseclass EmailInactiveUserTestCase(WorkoutManagerTestCase):diff --git a/wger/gym/tests/test_user.py b/wger/gym/tests/test_user.pyindex 76fbd3732..1157600b9 100644--- a/wger/gym/tests/test_user.py+++ b/wger/gym/tests/test_user.py@@ -14,15 +14,15 @@import datetime-from django.contrib.auth.models import Userfrom django.contrib.auth.models import Permission+from django.contrib.auth.models import Userfrom django.contrib.contenttypes.models import ContentTypefrom django.core.urlresolvers import reversefrom wger.core.models import UserProfile+from wger.core.tests.base_testcase import WorkoutManagerTestCasefrom wger.gym.models import Gymfrom wger.gym.models import GymAdminConfig-from wger.manager.tests.testcase import WorkoutManagerTestCaseclass GymAddUserTestCase(WorkoutManagerTestCase):diff --git a/wger/gym/tests/test_user_config.py b/wger/gym/tests/test_user_config.pyindex 25451af97..347a059c2 100644--- a/wger/gym/tests/test_user_config.py+++ b/wger/gym/tests/test_user_config.py@@ -12,7 +12,7 @@## You should have received a copy of the GNU Affero General Public License-from wger.manager.tests.testcase import WorkoutManagerEditTestCase+from wger.core.tests.base_testcase import WorkoutManagerEditTestCasefrom wger.gym.models import GymUserConfigdiff --git a/wger/gym/tests/test_user_documents.py b/wger/gym/tests/test_user_documents.pyindex ab6c25b76..6902f13a0 100644--- a/wger/gym/tests/test_user_documents.py+++ b/wger/gym/tests/test_user_documents.py@@ -13,12 +13,12 @@# You should have received a copy of the GNU Affero General Public Licensefrom django.core.urlresolvers import reverse-from wger.gym.models import UserDocument-from wger.manager.tests.testcase import WorkoutManagerAccessTestCase, delete_testcase_add_methods-from wger.manager.tests.testcase import WorkoutManagerEditTestCase-from wger.manager.tests.testcase import WorkoutManagerAddTestCase-from wger.manager.tests.testcase import WorkoutManagerDeleteTestCase+from wger.core.tests.base_testcase import WorkoutManagerAccessTestCase, delete_testcase_add_methods+from wger.core.tests.base_testcase import WorkoutManagerAddTestCase+from wger.core.tests.base_testcase import WorkoutManagerDeleteTestCase+from wger.core.tests.base_testcase import WorkoutManagerEditTestCase+from wger.gym.models import UserDocumentclass UserDocumentOverviewTest(WorkoutManagerAccessTestCase):diff --git a/wger/gym/tests/test_user_last_activity.py b/wger/gym/tests/test_user_last_activity.pyindex 6704645ee..69a06919b 100644--- a/wger/gym/tests/test_user_last_activity.py+++ b/wger/gym/tests/test_user_last_activity.py@@ -16,9 +16,9 @@ import datetimefrom django.contrib.auth.models import User+from wger.core.tests.base_testcase import WorkoutManagerTestCasefrom wger.gym.helpers import get_user_last_activityfrom wger.manager.models import WorkoutSession, WorkoutLog-from wger.manager.tests.testcase import WorkoutManagerTestCaseclass UserLastActivityTestCase(WorkoutManagerTestCase):diff --git a/wger/manager/tests/test_copy_workout.py b/wger/manager/tests/test_copy_workout.pyindex eb56538a0..75e38d077 100644--- a/wger/manager/tests/test_copy_workout.py+++ b/wger/manager/tests/test_copy_workout.py@@ -16,9 +16,9 @@ import loggingfrom django.core.urlresolvers import reverse-from wger.manager.models import Workoutfrom wger.core.models import UserProfile-from wger.manager.tests.testcase import WorkoutManagerTestCase+from wger.core.tests.base_testcase import WorkoutManagerTestCase+from wger.manager.models import Workoutlogger = logging.getLogger(__name__)diff --git a/wger/manager/tests/test_day.py b/wger/manager/tests/test_day.pyindex 6847bbd0f..74a99585b 100644--- a/wger/manager/tests/test_day.py+++ b/wger/manager/tests/test_day.py@@ -12,14 +12,13 @@## You should have received a copy of the GNU Affero General Public License-from django.core.urlresolvers import reversefrom django.core.cache import cache+from django.core.urlresolvers import reverse-from wger.core.tests import api_base_test+from wger.core.tests.base_testcase import WorkoutManagerAddTestCase+from wger.core.tests.base_testcase import WorkoutManagerEditTestCase+from wger.core.tests.base_testcase import WorkoutManagerTestCasefrom wger.manager.models import Day-from wger.manager.tests.testcase import WorkoutManagerTestCase-from wger.manager.tests.testcase import WorkoutManagerAddTestCase-from wger.manager.tests.testcase import WorkoutManagerEditTestCasefrom wger.utils.cache import cache_mapperdiff --git a/wger/manager/tests/test_email_reminder.py b/wger/manager/tests/test_email_reminder.pyindex a0fc2b70a..11f75a8b6 100644--- a/wger/manager/tests/test_email_reminder.py+++ b/wger/manager/tests/test_email_reminder.py@@ -14,12 +14,12 @@import datetime-from django.core.management import call_command-from django.core import mailfrom django.contrib.auth.models import User-from wger.core.models import UserProfile+from django.core import mail+from django.core.management import call_command-from wger.manager.tests.testcase import WorkoutManagerTestCase+from wger.core.models import UserProfile+from wger.core.tests.base_testcase import WorkoutManagerTestCasefrom wger.manager.models import Schedulefrom wger.manager.models import Workoutdiff --git a/wger/manager/tests/test_ical.py b/wger/manager/tests/test_ical.pyindex f93e29e8a..040326d30 100644--- a/wger/manager/tests/test_ical.py+++ b/wger/manager/tests/test_ical.py@@ -13,11 +13,11 @@# You should have received a copy of the GNU Affero General Public Licenseimport datetime-from django.contrib.auth.models import User+from django.contrib.auth.models import Userfrom django.core.urlresolvers import reverse-from wger.manager.tests.testcase import WorkoutManagerTestCase+from wger.core.tests.base_testcase import WorkoutManagerTestCasefrom wger.utils.helpers import next_weekday, make_tokendiff --git a/wger/manager/tests/test_pdf.py b/wger/manager/tests/test_pdf.pyindex 8141e36fb..dd3231417 100644--- a/wger/manager/tests/test_pdf.py+++ b/wger/manager/tests/test_pdf.py@@ -12,10 +12,9 @@## You should have received a copy of the GNU Affero General Public Licensefrom django.contrib.auth.models import User-from django.core.urlresolvers import reverse-from wger.manager.tests.testcase import WorkoutManagerTestCase+from wger.core.tests.base_testcase import WorkoutManagerTestCasefrom wger.utils.helpers import make_tokendiff --git a/wger/manager/tests/test_schedule.py b/wger/manager/tests/test_schedule.pyindex f1c7394a7..028f963bb 100644--- a/wger/manager/tests/test_schedule.py+++ b/wger/manager/tests/test_schedule.py@@ -12,22 +12,21 @@## You should have received a copy of the GNU Affero General Public License-import six-import loggingimport datetime+import logging-from django.core.urlresolvers import reversefrom django.contrib.auth.models import User+from django.core.urlresolvers import reversefrom wger.core.tests import api_base_test+from wger.core.tests.base_testcase import STATUS_CODES_FAIL+from wger.core.tests.base_testcase import WorkoutManagerAddTestCase+from wger.core.tests.base_testcase import WorkoutManagerDeleteTestCase+from wger.core.tests.base_testcase import WorkoutManagerEditTestCase+from wger.core.tests.base_testcase import WorkoutManagerTestCasefrom wger.manager.models import Schedulefrom wger.manager.models import ScheduleStepfrom wger.manager.models import Workout-from wger.manager.tests.testcase import STATUS_CODES_FAIL-from wger.manager.tests.testcase import WorkoutManagerTestCase-from wger.manager.tests.testcase import WorkoutManagerDeleteTestCase-from wger.manager.tests.testcase import WorkoutManagerEditTestCase-from wger.manager.tests.testcase import WorkoutManagerAddTestCasefrom wger.utils.helpers import make_tokenlogger = logging.getLogger(__name__)diff --git a/wger/manager/tests/test_schedule_step.py b/wger/manager/tests/test_schedule_step.pyindex 3f3caae99..d0389cfe8 100644--- a/wger/manager/tests/test_schedule_step.py+++ b/wger/manager/tests/test_schedule_step.py@@ -16,11 +16,11 @@ import datetimefrom django.core.urlresolvers import reverse_lazyfrom wger.core.tests import api_base_test+from wger.core.tests.base_testcase import WorkoutManagerAddTestCase+from wger.core.tests.base_testcase import WorkoutManagerDeleteTestCase+from wger.core.tests.base_testcase import WorkoutManagerEditTestCase+from wger.core.tests.base_testcase import WorkoutManagerTestCasefrom wger.manager.models import ScheduleStep-from wger.manager.tests.testcase import WorkoutManagerTestCase-from wger.manager.tests.testcase import WorkoutManagerDeleteTestCase-from wger.manager.tests.testcase import WorkoutManagerEditTestCase-from wger.manager.tests.testcase import WorkoutManagerAddTestCaseclass ScheduleStepRepresentationTestCase(WorkoutManagerTestCase):diff --git a/wger/manager/tests/test_set.py b/wger/manager/tests/test_set.pyindex 413057b41..8c1e1be3f 100644--- a/wger/manager/tests/test_set.py+++ b/wger/manager/tests/test_set.py@@ -14,18 +14,18 @@import logging+from django.core.cache import cachefrom django.core.urlresolvers import reversefrom django.core.urlresolvers import reverse_lazy-from django.core.cache import cachefrom wger.core.tests import api_base_test+from wger.core.tests.base_testcase import STATUS_CODES_FAIL+from wger.core.tests.base_testcase import WorkoutManagerAddTestCase+from wger.core.tests.base_testcase import WorkoutManagerTestCase+from wger.exercises.models import Exercise+from wger.manager.models import Dayfrom wger.manager.models import Setfrom wger.manager.models import Setting-from wger.manager.models import Day-from wger.exercises.models import Exercise-from wger.manager.tests.testcase import STATUS_CODES_FAIL-from wger.manager.tests.testcase import WorkoutManagerTestCase-from wger.manager.tests.testcase import WorkoutManagerAddTestCasefrom wger.utils.cache import cache_mapperdiff --git a/wger/manager/tests/test_timer.py b/wger/manager/tests/test_timer.pyindex 51a73e5a6..a7eab1867 100644--- a/wger/manager/tests/test_timer.py+++ b/wger/manager/tests/test_timer.py@@ -12,18 +12,18 @@## You should have received a copy of the GNU Affero General Public License+import datetimeimport loggingimport math-import datetimefrom decimal import Decimalfrom django.contrib.auth.models import Userfrom django.core.urlresolvers import reverse-from wger.manager.tests.testcase import WorkoutManagerTestCase+from wger.core.tests.base_testcase import WorkoutManagerTestCasefrom wger.exercises.models import Exercise-from wger.manager.models import WorkoutSessionfrom wger.manager.models import Workout+from wger.manager.models import WorkoutSessionlogger = logging.getLogger(__name__)diff --git a/wger/manager/tests/test_weight_log.py b/wger/manager/tests/test_weight_log.pyindex e1f0fca14..3c1c21f7d 100644--- a/wger/manager/tests/test_weight_log.py+++ b/wger/manager/tests/test_weight_log.py@@ -12,23 +12,21 @@## You should have received a copy of the GNU Affero General Public License-import loggingimport datetime+import loggingfrom django.contrib.auth.models import Userfrom django.core.cache import cachefrom django.core.urlresolvers import reverse, reverse_lazyfrom wger.core.tests import api_base_test+from wger.core.tests.base_testcase import WorkoutManagerDeleteTestCase+from wger.core.tests.base_testcase import WorkoutManagerTestCasefrom wger.exercises.models import Exercise-from wger.manager.models import WorkoutLogfrom wger.manager.models import Workout+from wger.manager.models import WorkoutLogfrom wger.manager.models import WorkoutSession-from wger.manager.tests.testcase import WorkoutManagerTestCase-from wger.manager.tests.testcase import WorkoutManagerAddTestCase-from wger.manager.tests.testcase import WorkoutManagerDeleteTestCase-from wger.utils.cache import get_template_cache_name, cache_mapper-+from wger.utils.cache import cache_mapperlogger = logging.getLogger(__name__)diff --git a/wger/manager/tests/test_workout.py b/wger/manager/tests/test_workout.pyindex 82a981b3e..439edb0f9 100644--- a/wger/manager/tests/test_workout.py+++ b/wger/manager/tests/test_workout.py@@ -17,10 +17,10 @@ import datetimefrom django.core.urlresolvers import reversefrom wger.core.tests import api_base_test+from wger.core.tests.base_testcase import WorkoutManagerDeleteTestCase+from wger.core.tests.base_testcase import WorkoutManagerEditTestCase+from wger.core.tests.base_testcase import WorkoutManagerTestCasefrom wger.manager.models import Workout-from wger.manager.tests.testcase import WorkoutManagerTestCase-from wger.manager.tests.testcase import WorkoutManagerDeleteTestCase-from wger.manager.tests.testcase import WorkoutManagerEditTestCaseclass WorkoutShareButtonTestCase(WorkoutManagerTestCase):diff --git a/wger/manager/tests/test_workout_canonical.py b/wger/manager/tests/test_workout_canonical.pyindex 0132dd652..f5b2acb02 100644--- a/wger/manager/tests/test_workout_canonical.py+++ b/wger/manager/tests/test_workout_canonical.py@@ -16,20 +16,19 @@ from decimal import Decimalfrom django.core.cache import cache-from wger.exercises.models import Exercisefrom wger.core.models import (DaysOfWeek,RepetitionUnit,WeightUnit)+from wger.core.tests.base_testcase import WorkoutManagerTestCase+from wger.exercises.models import Exercisefrom wger.manager.models import (Workout,Day,Set,Setting)--from wger.manager.tests.testcase import WorkoutManagerTestCasefrom wger.utils.cache import cache_mapperdiff --git a/wger/manager/tests/test_workout_session.py b/wger/manager/tests/test_workout_session.pyindex 051251042..565a6f4e5 100644--- a/wger/manager/tests/test_workout_session.py+++ b/wger/manager/tests/test_workout_session.py@@ -20,10 +20,10 @@ from django.core.exceptions import ValidationErrorfrom django.core.urlresolvers import reverse, reverse_lazyfrom wger.core.tests import api_base_test+from wger.core.tests.base_testcase import WorkoutManagerAddTestCase+from wger.core.tests.base_testcase import WorkoutManagerEditTestCase+from wger.core.tests.base_testcase import WorkoutManagerTestCase, WorkoutManagerDeleteTestCasefrom wger.manager.models import Workout, WorkoutSession, WorkoutLog-from wger.manager.tests.testcase import WorkoutManagerTestCase, WorkoutManagerDeleteTestCase-from wger.manager.tests.testcase import WorkoutManagerAddTestCase-from wger.manager.tests.testcase import WorkoutManagerEditTestCasefrom wger.utils.cache import cache_mapperdiff --git a/wger/nutrition/tests/test_bmi.py b/wger/nutrition/tests/test_bmi.pyindex ded112b82..5724dc770 100644--- a/wger/nutrition/tests/test_bmi.py+++ b/wger/nutrition/tests/test_bmi.py@@ -12,17 +12,17 @@## You should have received a copy of the GNU Affero General Public License-import jsonimport datetime+import jsonfrom decimal import Decimal-from django.core.urlresolvers import reversefrom django.contrib.auth.models import User+from django.core.urlresolvers import reverse+from wger.core.models import UserProfile+from wger.core.tests.base_testcase import WorkoutManagerTestCasefrom wger.utils.constants import TWOPLACES-from wger.weight.models import WeightEntry-from wger.manager.tests.testcase import WorkoutManagerTestCaseclass BmiTestCase(WorkoutManagerTestCase):diff --git a/wger/nutrition/tests/test_calories_calculator.py b/wger/nutrition/tests/test_calories_calculator.pyindex 82e7a653a..dd9020718 100644--- a/wger/nutrition/tests/test_calories_calculator.py+++ b/wger/nutrition/tests/test_calories_calculator.py@@ -12,16 +12,16 @@## You should have received a copy of the GNU Affero General Public License-import json-import decimalimport datetime+import decimal+import json-from django.core.urlresolvers import reversefrom django.contrib.auth.models import User-from wger.utils.constants import TWOPLACES+from django.core.urlresolvers import reverse+from wger.core.tests.base_testcase import WorkoutManagerTestCase+from wger.utils.constants import TWOPLACESfrom wger.weight.models import WeightEntry-from wger.manager.tests.testcase import WorkoutManagerTestCaseclass CaloriesCalculatorTestCase(WorkoutManagerTestCase):diff --git a/wger/nutrition/tests/test_copy_plan.py b/wger/nutrition/tests/test_copy_plan.pyindex efb8ba563..6caaa425d 100644--- a/wger/nutrition/tests/test_copy_plan.py+++ b/wger/nutrition/tests/test_copy_plan.py@@ -14,10 +14,9 @@from django.core.urlresolvers import reverse+from wger.core.tests.base_testcase import WorkoutManagerTestCasefrom wger.nutrition.models import NutritionPlan-from wger.manager.tests.testcase import WorkoutManagerTestCase-class CopyPlanTestCase(WorkoutManagerTestCase):'''diff --git a/wger/nutrition/tests/test_ingredient.py b/wger/nutrition/tests/test_ingredient.pyindex d9d151fe7..775ae6113 100644--- a/wger/nutrition/tests/test_ingredient.py+++ b/wger/nutrition/tests/test_ingredient.py@@ -13,26 +13,24 @@# 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/>.-import jsonimport datetime+import jsonfrom decimal import Decimal-from django.core.urlresolvers import reversefrom django.core.exceptions import ValidationError-from wger.core.tests import api_base_test-from wger.core.models import Language--from wger.nutrition.models import Ingredient-from wger.nutrition.models import Meal--from wger.utils.constants import NUTRITION_TAB+from django.core.urlresolvers import reverse-from wger.manager.tests.testcase import (+from wger.core.models import Language+from wger.core.tests import api_base_test+from wger.core.tests.base_testcase import (WorkoutManagerTestCase,WorkoutManagerDeleteTestCase,WorkoutManagerEditTestCase,WorkoutManagerAddTestCase)+from wger.nutrition.models import Ingredient+from wger.nutrition.models import Meal+from wger.utils.constants import NUTRITION_TABclass IngredientRepresentationTestCase(WorkoutManagerTestCase):diff --git a/wger/nutrition/tests/test_ingredient_overview.py b/wger/nutrition/tests/test_ingredient_overview.pyindex 01bed3003..4a39b4f5a 100644--- a/wger/nutrition/tests/test_ingredient_overview.py+++ b/wger/nutrition/tests/test_ingredient_overview.py@@ -15,7 +15,7 @@from django.core.urlresolvers import reverse-from wger.manager.tests.testcase import WorkoutManagerTestCase+from wger.core.tests.base_testcase import WorkoutManagerTestCasefrom wger.utils.constants import PAGINATION_OBJECTS_PER_PAGEdiff --git a/wger/nutrition/tests/test_meal.py b/wger/nutrition/tests/test_meal.pyindex e18ca13f6..ab670fc2d 100644--- a/wger/nutrition/tests/test_meal.py+++ b/wger/nutrition/tests/test_meal.py@@ -16,16 +16,15 @@import datetimefrom django.core.urlresolvers import reverse-from wger.core.tests import api_base_test--from wger.nutrition.models import Meal-from wger.nutrition.models import NutritionPlan-from wger.manager.tests.testcase import (+from wger.core.tests import api_base_test+from wger.core.tests.base_testcase import (WorkoutManagerTestCase,WorkoutManagerEditTestCase,WorkoutManagerAddTestCase)+from wger.nutrition.models import Meal+from wger.nutrition.models import NutritionPlanclass MealRepresentationTestCase(WorkoutManagerTestCase):diff --git a/wger/nutrition/tests/test_meal_item.py b/wger/nutrition/tests/test_meal_item.pyindex 810cbd9ba..34a515fd7 100644--- a/wger/nutrition/tests/test_meal_item.py+++ b/wger/nutrition/tests/test_meal_item.py@@ -14,13 +14,12 @@# 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.core.tests import api_base_test+from wger.core.tests.base_testcase import WorkoutManagerAddTestCase+from wger.core.tests.base_testcase import WorkoutManagerEditTestCasefrom wger.nutrition.models import MealItem-from wger.manager.tests.testcase import WorkoutManagerEditTestCase-from wger.manager.tests.testcase import WorkoutManagerAddTestCase-class EditMealItemUnitTestCase(WorkoutManagerEditTestCase):'''diff --git a/wger/nutrition/tests/test_nutritional_calculations.py b/wger/nutrition/tests/test_nutritional_calculations.pyindex 70491e839..d4dda128f 100644--- a/wger/nutrition/tests/test_nutritional_calculations.py+++ b/wger/nutrition/tests/test_nutritional_calculations.py@@ -16,8 +16,8 @@import loggingfrom decimal import Decimal+from wger.core.tests.base_testcase import WorkoutManagerTestCasefrom wger.nutrition import models-from wger.manager.tests.testcase import WorkoutManagerTestCasefrom wger.utils.constants import TWOPLACESlogger = logging.getLogger(__name__)diff --git a/wger/nutrition/tests/test_pdf.py b/wger/nutrition/tests/test_pdf.pyindex 7de946d8e..827d6ba42 100644--- a/wger/nutrition/tests/test_pdf.py+++ b/wger/nutrition/tests/test_pdf.py@@ -12,12 +12,12 @@## You should have received a copy of the GNU Affero General Public License-from django.core.urlresolvers import reversefrom django.contrib.auth.models import User-from wger.core.models import Language+from django.core.urlresolvers import reverse+from wger.core.models import Language+from wger.core.tests.base_testcase import WorkoutManagerTestCasefrom wger.nutrition.models import NutritionPlan-from wger.manager.tests.testcase import WorkoutManagerTestCasefrom wger.utils.helpers import make_tokendiff --git a/wger/nutrition/tests/test_plan.py b/wger/nutrition/tests/test_plan.pyindex 20296513b..0f485dbaa 100644--- a/wger/nutrition/tests/test_plan.py+++ b/wger/nutrition/tests/test_plan.py@@ -14,12 +14,12 @@# 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.core.tests import api_base_test+from wger.core.tests.base_testcase import WorkoutManagerDeleteTestCase+from wger.core.tests.base_testcase import WorkoutManagerEditTestCase+from wger.core.tests.base_testcase import WorkoutManagerTestCasefrom 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 WorkoutManagerTestCaseclass PlanRepresentationTestCase(WorkoutManagerTestCase):diff --git a/wger/nutrition/tests/test_submitted_ingredient.py b/wger/nutrition/tests/test_submitted_ingredient.pyindex c19cd0994..5e6db8327 100644--- a/wger/nutrition/tests/test_submitted_ingredient.py+++ b/wger/nutrition/tests/test_submitted_ingredient.py@@ -15,10 +15,9 @@from django.core import mailfrom django.core.urlresolvers import reverse+from wger.core.tests.base_testcase import WorkoutManagerTestCasefrom wger.nutrition.models import Ingredient-from wger.manager.tests.testcase import WorkoutManagerTestCase-class IngredientsPendingTestCase(WorkoutManagerTestCase):'''diff --git a/wger/nutrition/tests/test_weight_unit.py b/wger/nutrition/tests/test_weight_unit.pyindex 1559b677b..ab4e6096e 100644--- a/wger/nutrition/tests/test_weight_unit.py+++ b/wger/nutrition/tests/test_weight_unit.py@@ -14,15 +14,13 @@# 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.core.tests import api_base_test+from wger.core.tests.base_testcase import WorkoutManagerAddTestCase+from wger.core.tests.base_testcase import WorkoutManagerDeleteTestCase+from wger.core.tests.base_testcase import WorkoutManagerEditTestCase+from wger.core.tests.base_testcase import WorkoutManagerTestCasefrom wger.nutrition.models import WeightUnit--from wger.manager.tests.testcase import WorkoutManagerTestCase-from wger.manager.tests.testcase import WorkoutManagerDeleteTestCase-from wger.manager.tests.testcase import WorkoutManagerEditTestCase-from wger.manager.tests.testcase import WorkoutManagerAddTestCase-from wger.utils.constants import PAGINATION_OBJECTS_PER_PAGEdiff --git a/wger/nutrition/tests/test_weight_unit_ingredient.py b/wger/nutrition/tests/test_weight_unit_ingredient.pyindex 3aaed0862..d1cdc3e68 100644--- a/wger/nutrition/tests/test_weight_unit_ingredient.py+++ b/wger/nutrition/tests/test_weight_unit_ingredient.py@@ -13,17 +13,16 @@# 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_lazyfrom django.core.urlresolvers import reverse-from wger.core.tests import api_base_test+from django.core.urlresolvers import reverse_lazy-from wger.nutrition.models import WeightUnit+from wger.core.tests import api_base_test+from wger.core.tests.base_testcase import WorkoutManagerAddTestCase+from wger.core.tests.base_testcase import WorkoutManagerDeleteTestCase+from wger.core.tests.base_testcase import WorkoutManagerEditTestCase+from wger.core.tests.base_testcase import WorkoutManagerTestCasefrom wger.nutrition.models import IngredientWeightUnit--from wger.manager.tests.testcase import WorkoutManagerTestCase-from wger.manager.tests.testcase import WorkoutManagerDeleteTestCase-from wger.manager.tests.testcase import WorkoutManagerEditTestCase-from wger.manager.tests.testcase import WorkoutManagerAddTestCase+from wger.nutrition.models import WeightUnitclass WeightUnitIngredientRepresentationTestCase(WorkoutManagerTestCase):diff --git a/wger/utils/tests/test_check_access.py b/wger/utils/tests/test_check_access.pyindex 981e43772..375424af8 100644--- a/wger/utils/tests/test_check_access.py+++ b/wger/utils/tests/test_check_access.py@@ -15,7 +15,7 @@from django.contrib.auth.models import User, AnonymousUserfrom django.http import Http404-from wger.manager.tests.testcase import WorkoutManagerTestCase+from wger.core.tests.base_testcase import WorkoutManagerTestCasefrom wger.utils.helpers import check_accessdiff --git a/wger/utils/tests/test_middleware.py b/wger/utils/tests/test_middleware.pyindex da69ce5f3..98e952edb 100644--- a/wger/utils/tests/test_middleware.py+++ b/wger/utils/tests/test_middleware.py@@ -14,7 +14,7 @@from django.core.urlresolvers import reverse-from wger.manager.tests.testcase import WorkoutManagerTestCase+from wger.core.tests.base_testcase import WorkoutManagerTestCaseclass RobotsExclusionMiddlewareTestCase(WorkoutManagerTestCase):diff --git a/wger/utils/tests/test_unit_conversion.py b/wger/utils/tests/test_unit_conversion.pyindex 4ec0632b0..4a4a65f62 100644--- a/wger/utils/tests/test_unit_conversion.py+++ b/wger/utils/tests/test_unit_conversion.py@@ -14,9 +14,8 @@from decimal import Decimal-from wger.manager.tests.testcase import WorkoutManagerTestCase+from wger.core.tests.base_testcase import WorkoutManagerTestCasefrom wger.utils.constants import FOURPLACES-from wger.utils.units import AbstractWeightdiff --git a/wger/utils/tests/test_user_agents.py b/wger/utils/tests/test_user_agents.pyindex 4e5aef6be..df64ec327 100644--- a/wger/utils/tests/test_user_agents.py+++ b/wger/utils/tests/test_user_agents.py@@ -13,7 +13,7 @@# You should have received a copy of the GNU Affero General Public License-from wger.manager.tests.testcase import WorkoutManagerTestCase+from wger.core.tests.base_testcase import WorkoutManagerTestCasefrom wger.utils import user_agentsdiff --git a/wger/weight/tests/test_csv_export.py b/wger/weight/tests/test_csv_export.pyindex 96044e941..da6231e40 100644--- a/wger/weight/tests/test_csv_export.py+++ b/wger/weight/tests/test_csv_export.py@@ -16,7 +16,7 @@ import loggingfrom django.core.urlresolvers import reverse-from wger.manager.tests.testcase import WorkoutManagerTestCase+from wger.core.tests.base_testcase import WorkoutManagerTestCaselogger = logging.getLogger(__name__)diff --git a/wger/weight/tests/test_csv_import.py b/wger/weight/tests/test_csv_import.pyindex db84d3cb8..3237c3e6f 100644--- a/wger/weight/tests/test_csv_import.py+++ b/wger/weight/tests/test_csv_import.py@@ -16,8 +16,8 @@ import loggingfrom django.core.urlresolvers import reverse+from wger.core.tests.base_testcase import WorkoutManagerTestCasefrom wger.weight.models import WeightEntry-from wger.manager.tests.testcase import WorkoutManagerTestCaselogger = logging.getLogger(__name__)diff --git a/wger/weight/tests/test_email_weight_reminder.py b/wger/weight/tests/test_email_weight_reminder.pyindex 647a5c84c..009387479 100644--- a/wger/weight/tests/test_email_weight_reminder.py+++ b/wger/weight/tests/test_email_weight_reminder.py@@ -14,10 +14,11 @@from datetime import timedelta, datetime-from django.core.management import call_command-from django.core import mailfrom django.contrib.auth.models import User-from wger.manager.tests.testcase import WorkoutManagerTestCase+from django.core import mail+from django.core.management import call_command++from wger.core.tests.base_testcase import WorkoutManagerTestCasefrom wger.weight.models import WeightEntrydiff --git a/wger/weight/tests/test_entry.py b/wger/weight/tests/test_entry.pyindex bfed66b66..a9199a823 100644--- a/wger/weight/tests/test_entry.py+++ b/wger/weight/tests/test_entry.py@@ -14,16 +14,15 @@import datetimeimport decimal+from django.core.urlresolvers import reversefrom wger.core.tests import api_base_test+from wger.core.tests.base_testcase import WorkoutManagerAddTestCase+from wger.core.tests.base_testcase import WorkoutManagerEditTestCase, WorkoutManagerTestCasefrom wger.utils.constants import TWOPLACES-from wger.weight.models import WeightEntry-from wger.manager.tests.testcase import WorkoutManagerEditTestCase, WorkoutManagerTestCase-from wger.manager.tests.testcase import WorkoutManagerAddTestCase-class MealRepresentationTestCase(WorkoutManagerTestCase):'''diff --git a/wger/weight/tests/test_overview.py b/wger/weight/tests/test_overview.pyindex 13c822420..f9a0712fb 100644--- a/wger/weight/tests/test_overview.py+++ b/wger/weight/tests/test_overview.py@@ -16,7 +16,7 @@ import loggingfrom django.core.urlresolvers import reverse-from wger.manager.tests.testcase import WorkoutManagerTestCase+from wger.core.tests.base_testcase import WorkoutManagerTestCaselogger = logging.getLogger(__name__)