From cee24c5cb23bdd077f195c291d705a50ca8f977b Mon Sep 17 00:00:00 2001 From: Jay Zoldak Date: Tue, 5 Mar 2013 11:18:07 -0500 Subject: [PATCH] Import existing UserFactory --- lms/djangoapps/courseware/tests/test_module_render.py | 8 ++------ lms/djangoapps/courseware/tests/test_views.py | 7 ++----- 2 files changed, 4 insertions(+), 11 deletions(-) diff --git a/lms/djangoapps/courseware/tests/test_module_render.py b/lms/djangoapps/courseware/tests/test_module_render.py index 9b9b3f6d2f..61b70d3656 100644 --- a/lms/djangoapps/courseware/tests/test_module_render.py +++ b/lms/djangoapps/courseware/tests/test_module_render.py @@ -25,6 +25,8 @@ from xmodule.seq_module import SequenceModule from courseware.tests.tests import PageLoader from student.models import Registration +from factories import UserFactory + class Stub: def __init__(self): pass @@ -40,12 +42,6 @@ def xml_store_config(data_dir): } } -class UserFactory(factory.Factory): - first_name = 'Test' - last_name = 'Robot' - is_staff = True - is_active = True - TEST_DATA_DIR = settings.COMMON_TEST_DATA_ROOT TEST_DATA_XML_MODULESTORE = xml_store_config(TEST_DATA_DIR) diff --git a/lms/djangoapps/courseware/tests/test_views.py b/lms/djangoapps/courseware/tests/test_views.py index 3ff845834a..cb15b5b7b6 100644 --- a/lms/djangoapps/courseware/tests/test_views.py +++ b/lms/djangoapps/courseware/tests/test_views.py @@ -19,14 +19,11 @@ from xmodule.modulestore.exceptions import InvalidLocationError,\ import courseware.views as views from xmodule.modulestore import Location +from factories import UserFactory + class Stub(): pass -class UserFactory(factory.Factory): - first_name = 'Test' - last_name = 'Robot' - is_staff = True - is_active = True # This part is required for modulestore() to work properly def xml_store_config(data_dir):