Commit 79744b52 by Alan Boudreault Committed by Jonathan Piacenti

Add ENABLE_DISCUSSION_EMAIL_DIGEST in api_manager

Conflicts:
	lms/djangoapps/api_manager/users/tests.py
parent b686b2da
......@@ -33,8 +33,13 @@ from xmodule.modulestore.tests.django_utils import ModuleStoreTestCase
from openedx.core.djangoapps.user_api.models import UserPreference
from xmodule.modulestore.tests.factories import CourseFactory, ItemFactory
from django.contrib.auth.models import User
from openedx.core.djangoapps.user_api.models import UserPreference
from notification_prefs import NOTIFICATION_PREF_KEY
TEST_API_KEY = str(uuid.uuid4())
class SecureClient(Client):
""" Django test client using a "secure" connection. """
......
......@@ -27,6 +27,7 @@ from django_comment_common.models import Role, FORUM_ROLE_MODERATOR
from gradebook.models import StudentGradebook
from instructor.access import revoke_access, update_forum_role
from lang_pref import LANGUAGE_KEY
from notification_prefs.views import enable_notifications
from lms.lib.comment_client.user import User as CommentUser
from lms.lib.comment_client.utils import CommentClientRequestError
from notification_prefs.views import enable_notifications
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment