diff --git a/cms/djangoapps/contentstore/views/certificates.py b/cms/djangoapps/contentstore/views/certificates.py
index dd656fa28d..b6bbe3ebe8 100644
--- a/cms/djangoapps/contentstore/views/certificates.py
+++ b/cms/djangoapps/contentstore/views/certificates.py
@@ -362,7 +362,7 @@ def certificates_list_handler(request, course_key_string):
certificate_web_view_url = get_lms_link_for_certificate_web_view(
user_id=request.user.id,
course_key=course_key,
- mode=course_modes[0] # CourseMode.modes_for_course returns default mode 'honor' if doesn't find anyone.
+ mode=course_modes[0] # CourseMode.modes_for_course returns default mode if doesn't find anyone.
)
certificates = None
is_active = False
diff --git a/common/djangoapps/course_modes/helpers.py b/common/djangoapps/course_modes/helpers.py
index e69de29bb2..4a3ceae231 100644
--- a/common/djangoapps/course_modes/helpers.py
+++ b/common/djangoapps/course_modes/helpers.py
@@ -0,0 +1,86 @@
+""" Helper methods for CourseModes. """
+from django.utils.translation import ugettext_lazy as _
+
+from course_modes.models import CourseMode
+from student.helpers import (
+ VERIFY_STATUS_NEED_TO_VERIFY,
+ VERIFY_STATUS_SUBMITTED,
+ VERIFY_STATUS_APPROVED
+)
+
+DISPLAY_VERIFIED = "verified"
+DISPLAY_HONOR = "honor"
+DISPLAY_AUDIT = "audit"
+DISPLAY_PROFESSIONAL = "professional"
+
+
+def enrollment_mode_display(mode, verification_status, course_id):
+ """ Select appropriate display strings and CSS classes.
+
+ Uses mode and verification status to select appropriate display strings and CSS classes
+ for certificate display.
+
+ Args:
+ mode (str): enrollment mode.
+ verification_status (str) : verification status of student
+
+ Returns:
+ dictionary:
+ """
+ show_image = False
+ image_alt = ''
+ enrollment_title = ''
+ enrollment_value = ''
+ display_mode = _enrollment_mode_display(mode, verification_status, course_id)
+
+ if display_mode == DISPLAY_VERIFIED:
+ if verification_status in [VERIFY_STATUS_NEED_TO_VERIFY, VERIFY_STATUS_SUBMITTED]:
+ enrollment_title = _("Your verification is pending")
+ enrollment_value = _("Verified: Pending Verification")
+ show_image = True
+ image_alt = _("ID verification pending")
+ elif verification_status == VERIFY_STATUS_APPROVED:
+ enrollment_title = _("You're enrolled as a verified student")
+ enrollment_value = _("Verified")
+ show_image = True
+ image_alt = _("ID Verified Ribbon/Badge")
+ elif display_mode == DISPLAY_HONOR:
+ enrollment_title = _("You're enrolled as an honor code student")
+ enrollment_value = _("Honor Code")
+ elif display_mode == DISPLAY_PROFESSIONAL:
+ enrollment_title = _("You're enrolled as a professional education student")
+ enrollment_value = _("Professional Ed")
+
+ return {
+ 'enrollment_title': unicode(enrollment_title),
+ 'enrollment_value': unicode(enrollment_value),
+ 'show_image': show_image,
+ 'image_alt': unicode(image_alt),
+ 'display_mode': _enrollment_mode_display(mode, verification_status, course_id)
+ }
+
+
+def _enrollment_mode_display(enrollment_mode, verification_status, course_id):
+ """Checking enrollment mode and status and returns the display mode
+ Args:
+ enrollment_mode (str): enrollment mode.
+ verification_status (str) : verification status of student
+
+ Returns:
+ display_mode (str) : display mode for certs
+ """
+ course_mode_slugs = [mode.slug for mode in CourseMode.modes_for_course(course_id)]
+
+ if enrollment_mode == CourseMode.VERIFIED:
+ if verification_status in [VERIFY_STATUS_NEED_TO_VERIFY, VERIFY_STATUS_SUBMITTED, VERIFY_STATUS_APPROVED]:
+ display_mode = DISPLAY_VERIFIED
+ elif DISPLAY_HONOR in course_mode_slugs:
+ display_mode = DISPLAY_HONOR
+ else:
+ display_mode = DISPLAY_AUDIT
+ elif enrollment_mode in [CourseMode.PROFESSIONAL, CourseMode.NO_ID_PROFESSIONAL_MODE]:
+ display_mode = DISPLAY_PROFESSIONAL
+ else:
+ display_mode = enrollment_mode
+
+ return display_mode
diff --git a/common/djangoapps/course_modes/models.py b/common/djangoapps/course_modes/models.py
index 2c43d80cee..4402a3e00a 100644
--- a/common/djangoapps/course_modes/models.py
+++ b/common/djangoapps/course_modes/models.py
@@ -99,8 +99,8 @@ class CourseMode(models.Model):
NO_ID_PROFESSIONAL_MODE = "no-id-professional"
CREDIT_MODE = "credit"
- DEFAULT_MODE = Mode(HONOR, _('Honor Code Certificate'), 0, '', 'usd', None, None, None)
- DEFAULT_MODE_SLUG = HONOR
+ DEFAULT_MODE = Mode(AUDIT, _('Audit'), 0, '', 'usd', None, None, None)
+ DEFAULT_MODE_SLUG = AUDIT
# Modes that allow a student to pursue a verified certificate
VERIFIED_MODES = [VERIFIED, PROFESSIONAL]
@@ -112,7 +112,7 @@ class CourseMode(models.Model):
CREDIT_MODES = [CREDIT_MODE]
# Modes that are allowed to upsell
- UPSELL_TO_VERIFIED_MODES = [HONOR]
+ UPSELL_TO_VERIFIED_MODES = [HONOR, AUDIT]
class Meta(object):
unique_together = ('course_id', 'mode_slug', 'currency')
@@ -511,8 +511,27 @@ class CourseMode(models.Model):
if cls.is_white_label(course_id, modes_dict=modes_dict):
return False
- # Check that the default mode is available.
- return cls.HONOR in modes_dict
+ # Check that a free mode is available.
+ return cls.AUDIT in modes_dict or cls.HONOR in modes_dict
+
+ @classmethod
+ def auto_enroll_mode(cls, course_id, modes_dict=None):
+ """
+ return the auto-enrollable mode from given dict
+
+ Args:
+ modes_dict (dict): course modes.
+
+ Returns:
+ String: Mode name
+ """
+ if modes_dict is None:
+ modes_dict = cls.modes_for_course_dict(course_id)
+
+ if cls.HONOR in modes_dict:
+ return cls.HONOR
+ elif cls.AUDIT in modes_dict:
+ return cls.AUDIT
@classmethod
def is_white_label(cls, course_id, modes_dict=None):
@@ -552,96 +571,6 @@ class CourseMode(models.Model):
modes = cls.modes_for_course(course_id)
return min(mode.min_price for mode in modes if mode.currency.lower() == currency.lower())
- @classmethod
- def enrollment_mode_display(cls, mode, verification_status):
- """ Select appropriate display strings and CSS classes.
-
- Uses mode and verification status to select appropriate display strings and CSS classes
- for certificate display.
-
- Args:
- mode (str): enrollment mode.
- verification_status (str) : verification status of student
-
- Returns:
- dictionary:
- """
-
- # import inside the function to avoid the circular import
- from student.helpers import (
- VERIFY_STATUS_NEED_TO_VERIFY,
- VERIFY_STATUS_SUBMITTED,
- VERIFY_STATUS_APPROVED
- )
-
- show_image = False
- image_alt = ''
-
- if mode == cls.VERIFIED:
- if verification_status in [VERIFY_STATUS_NEED_TO_VERIFY, VERIFY_STATUS_SUBMITTED]:
- enrollment_title = _("Your verification is pending")
- enrollment_value = _("Verified: Pending Verification")
- show_image = True
- image_alt = _("ID verification pending")
- elif verification_status == VERIFY_STATUS_APPROVED:
- enrollment_title = _("You're enrolled as a verified student")
- enrollment_value = _("Verified")
- show_image = True
- image_alt = _("ID Verified Ribbon/Badge")
- else:
- enrollment_title = _("You're enrolled as an honor code student")
- enrollment_value = _("Honor Code")
- elif mode == cls.HONOR:
- enrollment_title = _("You're enrolled as an honor code student")
- enrollment_value = _("Honor Code")
- elif mode == cls.AUDIT:
- enrollment_title = _("You're auditing this course")
- enrollment_value = _("Auditing")
- elif mode in [cls.PROFESSIONAL, cls.NO_ID_PROFESSIONAL_MODE]:
- enrollment_title = _("You're enrolled as a professional education student")
- enrollment_value = _("Professional Ed")
- else:
- enrollment_title = ''
- enrollment_value = ''
-
- return {
- 'enrollment_title': unicode(enrollment_title),
- 'enrollment_value': unicode(enrollment_value),
- 'show_image': show_image,
- 'image_alt': unicode(image_alt),
- 'display_mode': cls._enrollment_mode_display(mode, verification_status)
- }
-
- @staticmethod
- def _enrollment_mode_display(enrollment_mode, verification_status):
- """Checking enrollment mode and status and returns the display mode
- Args:
- enrollment_mode (str): enrollment mode.
- verification_status (str) : verification status of student
-
- Returns:
- display_mode (str) : display mode for certs
- """
-
- # import inside the function to avoid the circular import
- from student.helpers import (
- VERIFY_STATUS_NEED_TO_VERIFY,
- VERIFY_STATUS_SUBMITTED,
- VERIFY_STATUS_APPROVED
- )
-
- if enrollment_mode == CourseMode.VERIFIED:
- if verification_status in [VERIFY_STATUS_NEED_TO_VERIFY, VERIFY_STATUS_SUBMITTED, VERIFY_STATUS_APPROVED]:
- display_mode = "verified"
- else:
- display_mode = "honor"
- elif enrollment_mode in [CourseMode.PROFESSIONAL, CourseMode.NO_ID_PROFESSIONAL_MODE]:
- display_mode = "professional"
- else:
- display_mode = enrollment_mode
-
- return display_mode
-
def to_tuple(self):
"""
Takes a mode model and turns it into a model named tuple.
diff --git a/common/djangoapps/course_modes/tests/test_models.py b/common/djangoapps/course_modes/tests/test_models.py
index 69de9de4a8..24a0dc3fde 100644
--- a/common/djangoapps/course_modes/tests/test_models.py
+++ b/common/djangoapps/course_modes/tests/test_models.py
@@ -15,6 +15,7 @@ from opaque_keys.edx.locations import SlashSeparatedCourseKey
from opaque_keys.edx.locator import CourseLocator
import pytz
+from course_modes.helpers import enrollment_mode_display
from course_modes.models import CourseMode, Mode
@@ -193,6 +194,21 @@ class CourseModeModelTest(TestCase):
# Verify that we can or cannot auto enroll
self.assertEqual(CourseMode.can_auto_enroll(self.course_key), can_auto_enroll)
+ @ddt.data(
+ ([], None),
+ (["honor", "audit", "verified"], "honor"),
+ (["honor", "audit"], "honor"),
+ (["audit", "verified"], "audit"),
+ (["professional"], None),
+ (["no-id-professional"], None),
+ (["credit", "audit", "verified"], "audit"),
+ (["credit"], None),
+ )
+ @ddt.unpack
+ def test_auto_enroll_mode(self, modes, result):
+ # Verify that the proper auto enroll mode is returned
+ self.assertEqual(CourseMode.auto_enroll_mode(self.course_key, modes), result)
+
def test_all_modes_for_courses(self):
now = datetime.now(pytz.UTC)
future = now + timedelta(days=1)
@@ -316,30 +332,30 @@ class CourseModeModelTest(TestCase):
def test_enrollment_mode_display(self, mode, verification_status):
if mode == "verified":
self.assertEqual(
- CourseMode.enrollment_mode_display(mode, verification_status),
+ enrollment_mode_display(mode, verification_status, self.course_key),
self._enrollment_display_modes_dicts(verification_status)
)
self.assertEqual(
- CourseMode.enrollment_mode_display(mode, verification_status),
+ enrollment_mode_display(mode, verification_status, self.course_key),
self._enrollment_display_modes_dicts(verification_status)
)
self.assertEqual(
- CourseMode.enrollment_mode_display(mode, verification_status),
+ enrollment_mode_display(mode, verification_status, self.course_key),
self._enrollment_display_modes_dicts(verification_status)
)
elif mode == "honor":
self.assertEqual(
- CourseMode.enrollment_mode_display(mode, verification_status),
+ enrollment_mode_display(mode, verification_status, self.course_key),
self._enrollment_display_modes_dicts(mode)
)
elif mode == "audit":
self.assertEqual(
- CourseMode.enrollment_mode_display(mode, verification_status),
+ enrollment_mode_display(mode, verification_status, self.course_key),
self._enrollment_display_modes_dicts(mode)
)
elif mode == "professional":
self.assertEqual(
- CourseMode.enrollment_mode_display(mode, verification_status),
+ enrollment_mode_display(mode, verification_status, self.course_key),
self._enrollment_display_modes_dicts(mode)
)
@@ -375,9 +391,9 @@ class CourseModeModelTest(TestCase):
'ID verification pending', 'verified'],
"verify_approved": ["You're enrolled as a verified student", "Verified", True, 'ID Verified Ribbon/Badge',
'verified'],
- "verify_none": ["You're enrolled as an honor code student", "Honor Code", False, '', 'honor'],
+ "verify_none": ["", "", False, '', 'audit'],
"honor": ["You're enrolled as an honor code student", "Honor Code", False, '', 'honor'],
- "audit": ["You're auditing this course", "Auditing", False, '', 'audit'],
+ "audit": ["", "", False, '', 'audit'],
"professional": ["You're enrolled as a professional education student", "Professional Ed", False, '',
'professional']
}
diff --git a/common/djangoapps/course_modes/tests/test_views.py b/common/djangoapps/course_modes/tests/test_views.py
index 66197bf194..369b16d8bc 100644
--- a/common/djangoapps/course_modes/tests/test_views.py
+++ b/common/djangoapps/course_modes/tests/test_views.py
@@ -177,6 +177,7 @@ class CourseModeViewTest(UrlResetMixin, ModuleStoreTestCase):
# Mapping of course modes to the POST parameters sent
# when the user chooses that mode.
POST_PARAMS_FOR_COURSE_MODE = {
+ 'audit': {},
'honor': {'honor_mode': True},
'verified': {'verified_mode': True, 'contribution': '1.23'},
'unsupported': {'unsupported_mode': True},
@@ -227,9 +228,9 @@ class CourseModeViewTest(UrlResetMixin, ModuleStoreTestCase):
expected_amount = decimal.Decimal(self.POST_PARAMS_FOR_COURSE_MODE['verified']['contribution'])
self.assertEqual(actual_amount, expected_amount)
- def test_successful_honor_enrollment(self):
+ def test_successful_default_enrollment(self):
# Create the course modes
- for mode in ('honor', 'verified'):
+ for mode in (CourseMode.DEFAULT_MODE_SLUG, 'verified'):
CourseModeFactory(mode_slug=mode, course_id=self.course.id)
# Enroll the user in the default mode (honor) to emulate
@@ -242,11 +243,11 @@ class CourseModeViewTest(UrlResetMixin, ModuleStoreTestCase):
# Explicitly select the honor mode (POST request)
choose_track_url = reverse('course_modes_choose', args=[unicode(self.course.id)])
- self.client.post(choose_track_url, self.POST_PARAMS_FOR_COURSE_MODE['honor'])
+ self.client.post(choose_track_url, self.POST_PARAMS_FOR_COURSE_MODE[CourseMode.DEFAULT_MODE_SLUG])
# Verify that the user's enrollment remains unchanged
mode, is_active = CourseEnrollment.enrollment_mode_for_user(self.user, self.course.id)
- self.assertEqual(mode, 'honor')
+ self.assertEqual(mode, CourseMode.DEFAULT_MODE_SLUG)
self.assertEqual(is_active, True)
def test_unsupported_enrollment_mode_failure(self):
diff --git a/common/djangoapps/course_modes/views.py b/common/djangoapps/course_modes/views.py
index 331ecbd38a..58dbf8839c 100644
--- a/common/djangoapps/course_modes/views.py
+++ b/common/djangoapps/course_modes/views.py
@@ -174,12 +174,16 @@ class ChooseModeView(View):
if requested_mode not in allowed_modes:
return HttpResponseBadRequest(_("Enrollment mode not supported"))
- if requested_mode == 'honor':
- # The user will have already been enrolled in the honor mode at this
+ if requested_mode == 'audit':
+ # The user will have already been enrolled in the audit mode at this
# point, so we just redirect them to the dashboard, thereby avoiding
# hitting the database a second time attempting to enroll them.
return redirect(reverse('dashboard'))
+ if requested_mode == 'honor':
+ CourseEnrollment.enroll(user, course_key, mode=requested_mode)
+ return redirect(reverse('dashboard'))
+
mode_info = allowed_modes[requested_mode]
if requested_mode == 'verified':
@@ -224,6 +228,8 @@ class ChooseModeView(View):
return 'verified'
if 'honor_mode' in request_dict:
return 'honor'
+ if 'audit_mode' in request_dict:
+ return 'audit'
else:
return None
diff --git a/common/djangoapps/enrollment/api.py b/common/djangoapps/enrollment/api.py
index f7774b53a1..1a0043eb0e 100644
--- a/common/djangoapps/enrollment/api.py
+++ b/common/djangoapps/enrollment/api.py
@@ -7,6 +7,7 @@ import importlib
import logging
from django.conf import settings
from django.core.cache import cache
+from course_modes.models import CourseMode
from enrollment import errors
log = logging.getLogger(__name__)
@@ -132,10 +133,10 @@ def get_enrollment(user_id, course_id):
return _data_api().get_course_enrollment(user_id, course_id)
-def add_enrollment(user_id, course_id, mode='honor', is_active=True):
+def add_enrollment(user_id, course_id, mode=CourseMode.DEFAULT_MODE_SLUG, is_active=True):
"""Enrolls a user in a course.
- Enrolls a user in a course. If the mode is not specified, this will default to 'honor'.
+ Enrolls a user in a course. If the mode is not specified, this will default to `CourseMode.DEFAULT_MODE_SLUG`.
Arguments:
user_id (str): The user to enroll.
@@ -143,7 +144,7 @@ def add_enrollment(user_id, course_id, mode='honor', is_active=True):
Keyword Arguments:
mode (str): Optional argument for the type of enrollment to create. Ex. 'audit', 'honor', 'verified',
- 'professional'. If not specified, this defaults to 'honor'.
+ 'professional'. If not specified, this defaults to the default course mode.
is_active (boolean): Optional argument for making the new enrollment inactive. If not specified, is_active
defaults to True.
@@ -154,7 +155,7 @@ def add_enrollment(user_id, course_id, mode='honor', is_active=True):
>>> add_enrollment("Bob", "edX/DemoX/2014T2", mode="audit")
{
"created": "2014-10-20T20:18:00Z",
- "mode": "honor",
+ "mode": "audit",
"is_active": True,
"user": "Bob",
"course": {
@@ -165,8 +166,8 @@ def add_enrollment(user_id, course_id, mode='honor', is_active=True):
"course_end": "2015-05-06T00:00:00Z",
"course_modes": [
{
- "slug": "honor",
- "name": "Honor Code Certificate",
+ "slug": "audit",
+ "name": "Audit",
"min_price": 0,
"suggested_prices": "",
"currency": "usd",
diff --git a/common/djangoapps/enrollment/tests/test_views.py b/common/djangoapps/enrollment/tests/test_views.py
index 20052bff34..914075ee1f 100644
--- a/common/djangoapps/enrollment/tests/test_views.py
+++ b/common/djangoapps/enrollment/tests/test_views.py
@@ -47,7 +47,7 @@ class EnrollmentTestMixin(object):
expected_status=status.HTTP_200_OK,
email_opt_in=None,
as_server=False,
- mode=CourseMode.HONOR,
+ mode=CourseMode.DEFAULT_MODE_SLUG,
is_active=None,
enrollment_attributes=None,
min_mongo_calls=0,
@@ -169,13 +169,13 @@ class EnrollmentTest(EnrollmentTestMixin, ModuleStoreTestCase, APITestCase):
@ddt.data(
# Default (no course modes in the database)
- # Expect that users are automatically enrolled as "honor".
- ([], CourseMode.HONOR),
+ # Expect that users are automatically enrolled as the default
+ ([], CourseMode.DEFAULT_MODE_SLUG),
- # Audit / Verified / Honor
+ # Audit / Verified
# We should always go to the "choose your course" page.
- # We should also be enrolled as "honor" by default.
- ([CourseMode.HONOR, CourseMode.VERIFIED, CourseMode.AUDIT], CourseMode.HONOR),
+ # We should also be enrolled as the default.
+ ([CourseMode.VERIFIED, CourseMode.AUDIT], CourseMode.DEFAULT_MODE_SLUG),
)
@ddt.unpack
def test_enroll(self, course_modes, enrollment_mode):
@@ -198,8 +198,8 @@ class EnrollmentTest(EnrollmentTestMixin, ModuleStoreTestCase, APITestCase):
def test_check_enrollment(self):
CourseModeFactory.create(
course_id=self.course.id,
- mode_slug=CourseMode.HONOR,
- mode_display_name=CourseMode.HONOR,
+ mode_slug=CourseMode.DEFAULT_MODE_SLUG,
+ mode_display_name=CourseMode.DEFAULT_MODE_SLUG,
)
# Create an enrollment
self.assert_enrollment_status()
@@ -209,7 +209,7 @@ class EnrollmentTest(EnrollmentTestMixin, ModuleStoreTestCase, APITestCase):
self.assertEqual(resp.status_code, status.HTTP_200_OK)
data = json.loads(resp.content)
self.assertEqual(unicode(self.course.id), data['course_details']['course_id'])
- self.assertEqual(CourseMode.HONOR, data['mode'])
+ self.assertEqual(CourseMode.DEFAULT_MODE_SLUG, data['mode'])
self.assertTrue(data['is_active'])
@ddt.data(
@@ -258,8 +258,8 @@ class EnrollmentTest(EnrollmentTestMixin, ModuleStoreTestCase, APITestCase):
def test_user_not_specified(self):
CourseModeFactory.create(
course_id=self.course.id,
- mode_slug=CourseMode.HONOR,
- mode_display_name=CourseMode.HONOR,
+ mode_slug=CourseMode.DEFAULT_MODE_SLUG,
+ mode_display_name=CourseMode.DEFAULT_MODE_SLUG,
)
# Create an enrollment
self.assert_enrollment_status()
@@ -269,7 +269,7 @@ class EnrollmentTest(EnrollmentTestMixin, ModuleStoreTestCase, APITestCase):
self.assertEqual(resp.status_code, status.HTTP_200_OK)
data = json.loads(resp.content)
self.assertEqual(unicode(self.course.id), data['course_details']['course_id'])
- self.assertEqual(CourseMode.HONOR, data['mode'])
+ self.assertEqual(CourseMode.DEFAULT_MODE_SLUG, data['mode'])
self.assertTrue(data['is_active'])
def test_user_not_authenticated(self):
@@ -306,8 +306,8 @@ class EnrollmentTest(EnrollmentTestMixin, ModuleStoreTestCase, APITestCase):
# Try to enroll a user that is not the authenticated user.
CourseModeFactory.create(
course_id=self.course.id,
- mode_slug=CourseMode.HONOR,
- mode_display_name=CourseMode.HONOR,
+ mode_slug=CourseMode.DEFAULT_MODE_SLUG,
+ mode_display_name=CourseMode.DEFAULT_MODE_SLUG,
)
self.assert_enrollment_status(username=self.other_user.username, expected_status=status.HTTP_404_NOT_FOUND)
# Verify that the server still has access to this endpoint.
@@ -340,8 +340,8 @@ class EnrollmentTest(EnrollmentTestMixin, ModuleStoreTestCase, APITestCase):
for course in self.course, other_course:
CourseModeFactory.create(
course_id=unicode(course.id),
- mode_slug=CourseMode.HONOR,
- mode_display_name=CourseMode.HONOR,
+ mode_slug=CourseMode.DEFAULT_MODE_SLUG,
+ mode_display_name=CourseMode.DEFAULT_MODE_SLUG,
)
self.assert_enrollment_status(
course_id=unicode(course.id),
@@ -520,8 +520,8 @@ class EnrollmentTest(EnrollmentTestMixin, ModuleStoreTestCase, APITestCase):
self.rate_limit_config.save()
CourseModeFactory.create(
course_id=self.course.id,
- mode_slug=CourseMode.HONOR,
- mode_display_name=CourseMode.HONOR,
+ mode_slug=CourseMode.DEFAULT_MODE_SLUG,
+ mode_display_name=CourseMode.DEFAULT_MODE_SLUG,
)
for attempt in xrange(self.rate_limit + 10):
@@ -534,8 +534,8 @@ class EnrollmentTest(EnrollmentTestMixin, ModuleStoreTestCase, APITestCase):
self.rate_limit_config.save()
CourseModeFactory.create(
course_id=self.course.id,
- mode_slug=CourseMode.HONOR,
- mode_display_name=CourseMode.HONOR,
+ mode_slug=CourseMode.DEFAULT_MODE_SLUG,
+ mode_display_name=CourseMode.DEFAULT_MODE_SLUG,
)
for attempt in xrange(self.rate_limit + 10):
@@ -595,7 +595,7 @@ class EnrollmentTest(EnrollmentTestMixin, ModuleStoreTestCase, APITestCase):
def test_update_enrollment_with_mode(self):
"""With the right API key, update an existing enrollment with a new mode. """
# Create an honor and verified mode for a course. This allows an update.
- for mode in [CourseMode.HONOR, CourseMode.VERIFIED]:
+ for mode in [CourseMode.DEFAULT_MODE_SLUG, CourseMode.VERIFIED]:
CourseModeFactory.create(
course_id=self.course.id,
mode_slug=mode,
@@ -605,11 +605,11 @@ class EnrollmentTest(EnrollmentTestMixin, ModuleStoreTestCase, APITestCase):
# Create an enrollment
self.assert_enrollment_status(as_server=True)
- # Check that the enrollment is honor.
+ # Check that the enrollment is default.
self.assertTrue(CourseEnrollment.is_enrolled(self.user, self.course.id))
course_mode, is_active = CourseEnrollment.enrollment_mode_for_user(self.user, self.course.id)
self.assertTrue(is_active)
- self.assertEqual(course_mode, CourseMode.HONOR)
+ self.assertEqual(course_mode, CourseMode.DEFAULT_MODE_SLUG)
# Check that the enrollment upgraded to verified.
self.assert_enrollment_status(as_server=True, mode=CourseMode.VERIFIED, expected_status=status.HTTP_200_OK)
@@ -621,7 +621,7 @@ class EnrollmentTest(EnrollmentTestMixin, ModuleStoreTestCase, APITestCase):
"""With the right API key, update an existing enrollment with credit
mode and set enrollment attributes.
"""
- for mode in [CourseMode.HONOR, CourseMode.CREDIT_MODE]:
+ for mode in [CourseMode.DEFAULT_MODE_SLUG, CourseMode.CREDIT_MODE]:
CourseModeFactory.create(
course_id=self.course.id,
mode_slug=mode,
@@ -631,11 +631,11 @@ class EnrollmentTest(EnrollmentTestMixin, ModuleStoreTestCase, APITestCase):
# Create an enrollment
self.assert_enrollment_status(as_server=True)
- # Check that the enrollment is honor.
+ # Check that the enrollment is the default.
self.assertTrue(CourseEnrollment.is_enrolled(self.user, self.course.id))
course_mode, is_active = CourseEnrollment.enrollment_mode_for_user(self.user, self.course.id)
self.assertTrue(is_active)
- self.assertEqual(course_mode, CourseMode.HONOR)
+ self.assertEqual(course_mode, CourseMode.DEFAULT_MODE_SLUG)
# Check that the enrollment upgraded to credit.
enrollment_attributes = [{
@@ -657,7 +657,7 @@ class EnrollmentTest(EnrollmentTestMixin, ModuleStoreTestCase, APITestCase):
"""Check response status is bad request when invalid enrollment
attributes are passed
"""
- for mode in [CourseMode.HONOR, CourseMode.CREDIT_MODE]:
+ for mode in [CourseMode.DEFAULT_MODE_SLUG, CourseMode.CREDIT_MODE]:
CourseModeFactory.create(
course_id=self.course.id,
mode_slug=mode,
@@ -667,11 +667,11 @@ class EnrollmentTest(EnrollmentTestMixin, ModuleStoreTestCase, APITestCase):
# Create an enrollment
self.assert_enrollment_status(as_server=True)
- # Check that the enrollment is honor.
+ # Check that the enrollment is the default.
self.assertTrue(CourseEnrollment.is_enrolled(self.user, self.course.id))
course_mode, is_active = CourseEnrollment.enrollment_mode_for_user(self.user, self.course.id)
self.assertTrue(is_active)
- self.assertEqual(course_mode, CourseMode.HONOR)
+ self.assertEqual(course_mode, CourseMode.DEFAULT_MODE_SLUG)
# Check that the enrollment upgraded to credit.
enrollment_attributes = [{
@@ -687,12 +687,12 @@ class EnrollmentTest(EnrollmentTestMixin, ModuleStoreTestCase, APITestCase):
)
course_mode, is_active = CourseEnrollment.enrollment_mode_for_user(self.user, self.course.id)
self.assertTrue(is_active)
- self.assertEqual(course_mode, CourseMode.HONOR)
+ self.assertEqual(course_mode, CourseMode.DEFAULT_MODE_SLUG)
def test_downgrade_enrollment_with_mode(self):
"""With the right API key, downgrade an existing enrollment with a new mode. """
# Create an honor and verified mode for a course. This allows an update.
- for mode in [CourseMode.HONOR, CourseMode.VERIFIED]:
+ for mode in [CourseMode.DEFAULT_MODE_SLUG, CourseMode.VERIFIED]:
CourseModeFactory.create(
course_id=self.course.id,
mode_slug=mode,
@@ -708,16 +708,20 @@ class EnrollmentTest(EnrollmentTestMixin, ModuleStoreTestCase, APITestCase):
self.assertTrue(is_active)
self.assertEqual(course_mode, CourseMode.VERIFIED)
- # Check that the enrollment downgraded to honor.
- self.assert_enrollment_status(as_server=True, mode=CourseMode.HONOR, expected_status=status.HTTP_200_OK)
+ # Check that the enrollment was downgraded to the default mode.
+ self.assert_enrollment_status(
+ as_server=True,
+ mode=CourseMode.DEFAULT_MODE_SLUG,
+ expected_status=status.HTTP_200_OK
+ )
course_mode, is_active = CourseEnrollment.enrollment_mode_for_user(self.user, self.course.id)
self.assertTrue(is_active)
- self.assertEqual(course_mode, CourseMode.HONOR)
+ self.assertEqual(course_mode, CourseMode.DEFAULT_MODE_SLUG)
@ddt.data(
- ((CourseMode.HONOR, ), CourseMode.HONOR),
- ((CourseMode.HONOR, CourseMode.VERIFIED), CourseMode.HONOR),
- ((CourseMode.HONOR, CourseMode.VERIFIED), CourseMode.VERIFIED),
+ ((CourseMode.DEFAULT_MODE_SLUG, ), CourseMode.DEFAULT_MODE_SLUG),
+ ((CourseMode.DEFAULT_MODE_SLUG, CourseMode.VERIFIED), CourseMode.DEFAULT_MODE_SLUG),
+ ((CourseMode.DEFAULT_MODE_SLUG, CourseMode.VERIFIED), CourseMode.VERIFIED),
((CourseMode.PROFESSIONAL, ), CourseMode.PROFESSIONAL),
((CourseMode.NO_ID_PROFESSIONAL_MODE, ), CourseMode.NO_ID_PROFESSIONAL_MODE),
((CourseMode.VERIFIED, CourseMode.CREDIT_MODE), CourseMode.VERIFIED),
@@ -758,8 +762,12 @@ class EnrollmentTest(EnrollmentTestMixin, ModuleStoreTestCase, APITestCase):
self.assert_enrollment_activation(False, selected_mode)
# Verify that omitting the mode returns 400 for course configurations
- # in which the default (honor) mode doesn't exist.
- expected_status = status.HTTP_200_OK if CourseMode.HONOR in configured_modes else status.HTTP_400_BAD_REQUEST
+ # in which the default mode doesn't exist.
+ expected_status = (
+ status.HTTP_200_OK
+ if CourseMode.DEFAULT_MODE_SLUG in configured_modes
+ else status.HTTP_400_BAD_REQUEST
+ )
self.assert_enrollment_status(
as_server=True,
is_active=False,
@@ -788,8 +796,8 @@ class EnrollmentTest(EnrollmentTestMixin, ModuleStoreTestCase, APITestCase):
def test_change_mode_from_user(self):
"""Users should not be able to alter the enrollment mode on an enrollment. """
- # Create an honor and verified mode for a course. This allows an update.
- for mode in [CourseMode.HONOR, CourseMode.VERIFIED]:
+ # Create a default and a verified mode for a course. This allows an update.
+ for mode in [CourseMode.DEFAULT_MODE_SLUG, CourseMode.VERIFIED]:
CourseModeFactory.create(
course_id=self.course.id,
mode_slug=mode,
@@ -803,13 +811,13 @@ class EnrollmentTest(EnrollmentTestMixin, ModuleStoreTestCase, APITestCase):
self.assertTrue(CourseEnrollment.is_enrolled(self.user, self.course.id))
course_mode, is_active = CourseEnrollment.enrollment_mode_for_user(self.user, self.course.id)
self.assertTrue(is_active)
- self.assertEqual(course_mode, CourseMode.HONOR)
+ self.assertEqual(course_mode, CourseMode.DEFAULT_MODE_SLUG)
# Get a 403 response when trying to upgrade yourself.
self.assert_enrollment_status(mode=CourseMode.VERIFIED, expected_status=status.HTTP_403_FORBIDDEN)
course_mode, is_active = CourseEnrollment.enrollment_mode_for_user(self.user, self.course.id)
self.assertTrue(is_active)
- self.assertEqual(course_mode, CourseMode.HONOR)
+ self.assertEqual(course_mode, CourseMode.DEFAULT_MODE_SLUG)
@ddt.data(*itertools.product(
(CourseMode.HONOR, CourseMode.VERIFIED),
diff --git a/common/djangoapps/enrollment/views.py b/common/djangoapps/enrollment/views.py
index d3aa42eab2..110df7e906 100644
--- a/common/djangoapps/enrollment/views.py
+++ b/common/djangoapps/enrollment/views.py
@@ -287,9 +287,10 @@ class EnrollmentListView(APIView, ApiKeyPermissionMixIn):
* Enroll the currently signed in user in a course.
- Currently a user can use this command only to enroll the user in
- honor mode. If honor mode is not supported for the course, the
- request fails and returns the available modes.
+ Currently a user can use this command only to enroll the
+ user in the default course mode. If this is not
+ supported for the course, the request fails and returns
+ the available modes.
This command can use a server-to-server call to enroll a user in
other modes, such as "verified", "professional", or "credit". If
@@ -325,7 +326,7 @@ class EnrollmentListView(APIView, ApiKeyPermissionMixIn):
You cannot use the command to enroll a different user.
* mode: Optional. The course mode for the enrollment. Individual
- users cannot upgrade their enrollment mode from 'honor'. Only
+ users cannot upgrade their enrollment mode from the default. Only
server-to-server requests can enroll with other modes.
* is_active: Optional. A Boolean value indicating whether the
@@ -353,7 +354,7 @@ class EnrollmentListView(APIView, ApiKeyPermissionMixIn):
deactivate an enrollment.
* mode: Optional. The course mode for the enrollment. Individual
- users cannot upgrade their enrollment mode from "honor". Only
+ users cannot upgrade their enrollment mode from the default. Only
server-to-server requests can enroll with other modes.
* user: Optional. The user ID of the currently logged in user. You
@@ -519,7 +520,7 @@ class EnrollmentListView(APIView, ApiKeyPermissionMixIn):
}
)
- mode = request.data.get('mode', CourseMode.HONOR)
+ mode = request.data.get('mode', CourseMode.DEFAULT_MODE_SLUG)
has_api_key_permissions = self.has_api_key_permissions(request)
@@ -531,7 +532,7 @@ class EnrollmentListView(APIView, ApiKeyPermissionMixIn):
# other users, do not let them deduce the existence of an enrollment.
return Response(status=status.HTTP_404_NOT_FOUND)
- if mode != CourseMode.HONOR and not has_api_key_permissions:
+ if mode != CourseMode.DEFAULT_MODE_SLUG and not has_api_key_permissions:
return Response(
status=status.HTTP_403_FORBIDDEN,
data={
diff --git a/common/djangoapps/student/models.py b/common/djangoapps/student/models.py
index daec221983..de736b7f9f 100644
--- a/common/djangoapps/student/models.py
+++ b/common/djangoapps/student/models.py
@@ -895,7 +895,7 @@ class CourseEnrollment(models.Model):
# Represents the modes that are possible. We'll update this later with a
# list of possible values.
- mode = models.CharField(default="honor", max_length=100)
+ mode = models.CharField(default=CourseMode.DEFAULT_MODE_SLUG, max_length=100)
objects = CourseEnrollmentManager()
@@ -957,7 +957,7 @@ class CourseEnrollment(models.Model):
# If we *did* just create a new enrollment, set some defaults
if created:
- enrollment.mode = "honor"
+ enrollment.mode = CourseMode.DEFAULT_MODE_SLUG
enrollment.is_active = False
enrollment.save()
@@ -1043,8 +1043,8 @@ class CourseEnrollment(models.Model):
u"mode:{}".format(self.mode)]
)
if mode_changed:
- # the user's default mode is "honor" and disabled for a course
- # mode change events will only be emitted when the user's mode changes from this
+ # Only emit mode change events when the user's enrollment
+ # mode has changed from its previous setting
self.emit_event(EVENT_NAME_ENROLLMENT_MODE_CHANGED)
def emit_event(self, event_name):
@@ -1090,7 +1090,7 @@ class CourseEnrollment(models.Model):
)
@classmethod
- def enroll(cls, user, course_key, mode="honor", check_access=False):
+ def enroll(cls, user, course_key, mode=CourseMode.DEFAULT_MODE_SLUG, check_access=False):
"""
Enroll a user in a course. This saves immediately.
@@ -1103,8 +1103,8 @@ class CourseEnrollment(models.Model):
`course_key` is our usual course_id string (e.g. "edX/Test101/2013_Fall)
`mode` is a string specifying what kind of enrollment this is. The
- default is 'honor', meaning honor certificate. Other options
- include 'professional', 'verified', 'audit',
+ default is the default course mode, 'audit'. Other options
+ include 'professional', 'verified', 'honor',
'no-id-professional' and 'credit'.
See CourseMode in common/djangoapps/course_modes/models.py.
@@ -1165,7 +1165,7 @@ class CourseEnrollment(models.Model):
return enrollment
@classmethod
- def enroll_by_email(cls, email, course_id, mode="honor", ignore_errors=True):
+ def enroll_by_email(cls, email, course_id, mode=CourseMode.DEFAULT_MODE_SLUG, ignore_errors=True):
"""
Enroll a user in a course given their email. This saves immediately.
@@ -1181,9 +1181,10 @@ class CourseEnrollment(models.Model):
`course_id` is our usual course_id string (e.g. "edX/Test101/2013_Fall)
`mode` is a string specifying what kind of enrollment this is. The
- default is "honor", meaning honor certificate. Future options
- may include "audit", "verified_id", etc. Please don't use it
- until we have these mapped out.
+ default is the default course mode, 'audit'. Other options
+ include 'professional', 'verified', 'honor',
+ 'no-id-professional' and 'credit'.
+ See CourseMode in common/djangoapps/course_modes/models.py.
`ignore_errors` is a boolean indicating whether we should suppress
`User.DoesNotExist` errors (returning None) or let it
diff --git a/common/djangoapps/student/tests/factories.py b/common/djangoapps/student/tests/factories.py
index f59750eb40..e9ed3395d5 100644
--- a/common/djangoapps/student/tests/factories.py
+++ b/common/djangoapps/student/tests/factories.py
@@ -52,8 +52,8 @@ class CourseModeFactory(DjangoModelFactory):
model = CourseMode
course_id = None
- mode_display_name = u'Honor Code',
- mode_slug = 'honor'
+ mode_display_name = CourseMode.DEFAULT_MODE.name
+ mode_slug = CourseMode.DEFAULT_MODE_SLUG
min_price = 0
suggested_prices = ''
currency = 'usd'
diff --git a/common/djangoapps/student/tests/test_enrollment.py b/common/djangoapps/student/tests/test_enrollment.py
index 2334c99b95..679a86e12b 100644
--- a/common/djangoapps/student/tests/test_enrollment.py
+++ b/common/djangoapps/student/tests/test_enrollment.py
@@ -7,6 +7,7 @@ from mock import patch
from django.conf import settings
from django.core.urlresolvers import reverse
+from course_modes.models import CourseMode
from xmodule.modulestore.tests.django_utils import ModuleStoreTestCase
from xmodule.modulestore.tests.factories import CourseFactory
from util.testing import UrlResetMixin
@@ -41,13 +42,20 @@ class EnrollmentTest(UrlResetMixin, ModuleStoreTestCase):
@ddt.data(
# Default (no course modes in the database)
# Expect that we're redirected to the dashboard
- # and automatically enrolled as "honor"
- ([], '', 'honor'),
+ # and automatically enrolled
+ ([], '', CourseMode.DEFAULT_MODE_SLUG),
+
+ # Audit / Verified
+ # We should always go to the "choose your course" page.
+ # We should also be enrolled as the default mode.
+ (['verified', 'audit'], 'course_modes_choose', CourseMode.DEFAULT_MODE_SLUG),
# Audit / Verified / Honor
# We should always go to the "choose your course" page.
- # We should also be enrolled as "honor" by default.
- (['honor', 'verified', 'audit'], 'course_modes_choose', 'honor'),
+ # We should also be enrolled as the honor mode.
+ # Since honor and audit are currently offered together this precedence must
+ # be maintained.
+ (['honor', 'verified', 'audit'], 'course_modes_choose', CourseMode.HONOR),
# Professional ed
# Expect that we're sent to the "choose your track" page
diff --git a/common/djangoapps/student/tests/test_recent_enrollments.py b/common/djangoapps/student/tests/test_recent_enrollments.py
index 6372030367..ec94f4868b 100644
--- a/common/djangoapps/student/tests/test_recent_enrollments.py
+++ b/common/djangoapps/student/tests/test_recent_enrollments.py
@@ -127,22 +127,21 @@ class TestRecentEnrollments(ModuleStoreTestCase):
self.assertContains(response, "Thank you for enrolling in")
@ddt.data(
- #Register as an honor in any course modes with no payment option
+ # Register as honor in any course modes with no payment option
([('audit', 0), ('honor', 0)], 'honor', True),
([('honor', 0)], 'honor', True),
- ([], 'honor', True),
- #Register as an honor in any course modes which has payment option
+ # Register as honor in any course modes which has payment option
([('honor', 10)], 'honor', False), # This is a paid course
([('audit', 0), ('honor', 0), ('professional', 20)], 'honor', True),
([('audit', 0), ('honor', 0), ('verified', 20)], 'honor', True),
([('audit', 0), ('honor', 0), ('verified', 20), ('professional', 20)], 'honor', True),
- ([], 'honor', True),
- #Register as an audit in any course modes with no payment option
+ # Register as audit in any course modes with no payment option
([('audit', 0), ('honor', 0)], 'audit', True),
([('audit', 0)], 'audit', True),
- #Register as an audit in any course modes which has no payment option
+ ([], 'audit', True),
+ # Register as audit in any course modes which has no payment option
([('audit', 0), ('honor', 0), ('verified', 10)], 'audit', True),
- #Register as a verified in any course modes which has payment option
+ # Register as verified in any course modes which has payment option
([('professional', 20)], 'professional', False),
([('verified', 20)], 'verified', False),
([('professional', 20), ('verified', 20)], 'verified', False),
diff --git a/common/djangoapps/student/tests/test_verification_status.py b/common/djangoapps/student/tests/test_verification_status.py
index c3002bb63d..498a147fa2 100644
--- a/common/djangoapps/student/tests/test_verification_status.py
+++ b/common/djangoapps/student/tests/test_verification_status.py
@@ -44,7 +44,7 @@ class TestCourseVerificationStatus(UrlResetMixin, ModuleStoreTestCase):
self.dashboard_url = reverse('dashboard')
def test_enrolled_as_non_verified(self):
- self._setup_mode_and_enrollment(None, "honor")
+ self._setup_mode_and_enrollment(None, "audit")
# Expect that the course appears on the dashboard
# without any verification messaging
@@ -290,12 +290,9 @@ class TestCourseVerificationStatus(UrlResetMixin, ModuleStoreTestCase):
VerificationDeadline.set_deadline(self.course.id, deadline)
BANNER_ALT_MESSAGES = {
- None: "Honor",
VERIFY_STATUS_NEED_TO_VERIFY: "ID verification pending",
VERIFY_STATUS_SUBMITTED: "ID verification pending",
VERIFY_STATUS_APPROVED: "ID Verified Ribbon/Badge",
- VERIFY_STATUS_MISSED_DEADLINE: "Honor",
- VERIFY_STATUS_NEED_TO_REVERIFY: "Honor"
}
NOTIFICATION_MESSAGES = {
@@ -309,12 +306,12 @@ class TestCourseVerificationStatus(UrlResetMixin, ModuleStoreTestCase):
}
MODE_CLASSES = {
- None: "honor",
+ None: "audit",
VERIFY_STATUS_NEED_TO_VERIFY: "verified",
VERIFY_STATUS_SUBMITTED: "verified",
VERIFY_STATUS_APPROVED: "verified",
- VERIFY_STATUS_MISSED_DEADLINE: "honor",
- VERIFY_STATUS_NEED_TO_REVERIFY: "honor"
+ VERIFY_STATUS_MISSED_DEADLINE: "audit",
+ VERIFY_STATUS_NEED_TO_REVERIFY: "audit"
}
def _assert_course_verification_status(self, status):
@@ -334,7 +331,9 @@ class TestCourseVerificationStatus(UrlResetMixin, ModuleStoreTestCase):
self.assertContains(response, unicode(self.course.id))
# Verify that the correct banner is rendered on the dashboard
- self.assertContains(response, self.BANNER_ALT_MESSAGES[status])
+ alt_text = self.BANNER_ALT_MESSAGES.get(status)
+ if alt_text:
+ self.assertContains(response, alt_text)
# Verify that the correct banner color is rendered
self.assertContains(
diff --git a/common/djangoapps/student/tests/tests.py b/common/djangoapps/student/tests/tests.py
index 61c9d176ca..b44f6aad63 100644
--- a/common/djangoapps/student/tests/tests.py
+++ b/common/djangoapps/student/tests/tests.py
@@ -11,6 +11,7 @@ from urlparse import urljoin
import pytz
from mock import Mock, patch
from opaque_keys.edx.locations import SlashSeparatedCourseKey
+from pyquery import PyQuery as pq
from django.conf import settings
from django.contrib.auth.models import User, AnonymousUser
@@ -18,6 +19,7 @@ from django.core.urlresolvers import reverse
from django.test import TestCase
from django.test.client import Client
+from course_modes.models import CourseMode
from student.models import (
anonymous_id_for_user, user_by_anonymous_id, CourseEnrollment,
unique_id_for_user, LinkedInAddToProfileConfiguration
@@ -248,7 +250,7 @@ class DashboardTest(ModuleStoreTestCase):
self.client.login(username="jack", password="test")
self._check_verification_status_on('verified', 'You\'re enrolled as a verified student')
self._check_verification_status_on('honor', 'You\'re enrolled as an honor code student')
- self._check_verification_status_on('audit', 'You\'re auditing this course')
+ self._check_verification_status_off('audit', '')
self._check_verification_status_on('professional', 'You\'re enrolled as a professional education student')
self._check_verification_status_on('no-id-professional', 'You\'re enrolled as a professional education student')
@@ -268,8 +270,13 @@ class DashboardTest(ModuleStoreTestCase):
attempt.approve()
response = self.client.get(reverse('dashboard'))
- self.assertNotContains(response, "class=\"course {0}\"".format(mode))
- self.assertNotContains(response, value)
+
+ if mode == 'audit':
+ # Audit mode does not have a banner. Assert no banner element.
+ self.assertEqual(pq(response.content)(".sts-enrollment").length, 0)
+ else:
+ self.assertNotContains(response, "class=\"course {0}\"".format(mode))
+ self.assertNotContains(response, value)
@patch.dict("django.conf.settings.FEATURES", {'ENABLE_VERIFIED_CERTIFICATES': False})
def test_verification_status_invisible(self):
@@ -280,7 +287,7 @@ class DashboardTest(ModuleStoreTestCase):
self.client.login(username="jack", password="test")
self._check_verification_status_off('verified', 'You\'re enrolled as a verified student')
self._check_verification_status_off('honor', 'You\'re enrolled as an honor code student')
- self._check_verification_status_off('audit', 'You\'re auditing this course')
+ self._check_verification_status_off('audit', '')
def test_course_mode_info(self):
verified_mode = CourseModeFactory.create(
@@ -321,7 +328,12 @@ class DashboardTest(ModuleStoreTestCase):
course_id=self.course.id
)
course_reg_code = shoppingcart.models.CourseRegistrationCode(
- code="abcde", course_id=self.course.id, created_by=self.user, invoice=sale_invoice_1, invoice_item=invoice_item, mode_slug='honor'
+ code="abcde",
+ course_id=self.course.id,
+ created_by=self.user,
+ invoice=sale_invoice_1,
+ invoice_item=invoice_item,
+ mode_slug=CourseMode.DEFAULT_MODE_SLUG
)
course_reg_code.save()
@@ -339,7 +351,6 @@ class DashboardTest(ModuleStoreTestCase):
#now activate the user by enrolling him/her to the course
response = self.client.post(redeem_url)
self.assertEquals(response.status_code, 200)
-
response = self.client.get(reverse('dashboard'))
self.assertIn('You can no longer access this course because payment has not yet been received', response.content)
optout_object = Optout.objects.filter(user=self.user, course_id=self.course.id)
@@ -566,7 +577,7 @@ class EnrollmentEventTestMixin(EventTestMixin):
{
'course_id': course_key.to_deprecated_string(),
'user_id': user.pk,
- 'mode': 'honor'
+ 'mode': CourseMode.DEFAULT_MODE_SLUG
}
)
self.mock_tracker.reset_mock()
@@ -578,7 +589,7 @@ class EnrollmentEventTestMixin(EventTestMixin):
{
'course_id': course_key.to_deprecated_string(),
'user_id': user.pk,
- 'mode': 'honor'
+ 'mode': CourseMode.DEFAULT_MODE_SLUG
}
)
self.mock_tracker.reset_mock()
@@ -754,19 +765,19 @@ class EnrollInCourseTest(EnrollmentEventTestMixin, TestCase):
user = User.objects.create(username="justin", email="jh@fake.edx.org")
course_id = SlashSeparatedCourseKey("edX", "Test101", "2013")
- CourseEnrollment.enroll(user, course_id)
+ CourseEnrollment.enroll(user, course_id, "audit")
self.assert_enrollment_event_was_emitted(user, course_id)
- CourseEnrollment.enroll(user, course_id, "audit")
- self.assert_enrollment_mode_change_event_was_emitted(user, course_id, "audit")
-
- # same enrollment mode does not emit an event
- CourseEnrollment.enroll(user, course_id, "audit")
- self.assert_no_events_were_emitted()
-
CourseEnrollment.enroll(user, course_id, "honor")
self.assert_enrollment_mode_change_event_was_emitted(user, course_id, "honor")
+ # same enrollment mode does not emit an event
+ CourseEnrollment.enroll(user, course_id, "honor")
+ self.assert_no_events_were_emitted()
+
+ CourseEnrollment.enroll(user, course_id, "audit")
+ self.assert_enrollment_mode_change_event_was_emitted(user, course_id, "audit")
+
@unittest.skipUnless(settings.ROOT_URLCONF == 'lms.urls', 'Test only valid in lms')
class ChangeEnrollmentViewTest(ModuleStoreTestCase):
@@ -789,7 +800,7 @@ class ChangeEnrollmentViewTest(ModuleStoreTestCase):
)
return response
- def test_enroll_as_honor(self):
+ def test_enroll_as_default(self):
"""Tests that a student can successfully enroll through this view"""
response = self._enroll_through_view(self.course)
self.assertEqual(response.status_code, 200)
@@ -797,7 +808,7 @@ class ChangeEnrollmentViewTest(ModuleStoreTestCase):
self.user, self.course.id
)
self.assertTrue(is_active)
- self.assertEqual(enrollment_mode, u'honor')
+ self.assertEqual(enrollment_mode, CourseMode.DEFAULT_MODE_SLUG)
def test_cannot_enroll_if_already_enrolled(self):
"""
@@ -810,14 +821,14 @@ class ChangeEnrollmentViewTest(ModuleStoreTestCase):
response = self._enroll_through_view(self.course)
self.assertEqual(response.status_code, 400)
- def test_change_to_honor_if_verified(self):
+ def test_change_to_default_if_verified(self):
"""
Tests that a student that is a currently enrolled verified student cannot
- accidentally change their enrollment to verified
+ accidentally change their enrollment mode
"""
CourseEnrollment.enroll(self.user, self.course.id, mode=u'verified')
self.assertTrue(CourseEnrollment.is_enrolled(self.user, self.course.id))
- # now try to enroll the student in the honor mode:
+ # now try to enroll the student in the default mode:
response = self._enroll_through_view(self.course)
self.assertEqual(response.status_code, 400)
enrollment_mode, is_active = CourseEnrollment.enrollment_mode_for_user(
@@ -826,7 +837,7 @@ class ChangeEnrollmentViewTest(ModuleStoreTestCase):
self.assertTrue(is_active)
self.assertEqual(enrollment_mode, u'verified')
- def test_change_to_honor_if_verified_not_active(self):
+ def test_change_to_default_if_verified_not_active(self):
"""
Tests that one can renroll for a course if one has already unenrolled
"""
@@ -847,7 +858,7 @@ class ChangeEnrollmentViewTest(ModuleStoreTestCase):
self.user, self.course.id
)
self.assertTrue(is_active)
- self.assertEqual(enrollment_mode, u'honor')
+ self.assertEqual(enrollment_mode, CourseMode.DEFAULT_MODE_SLUG)
class AnonymousLookupTable(ModuleStoreTestCase):
diff --git a/common/djangoapps/student/views.py b/common/djangoapps/student/views.py
index 033901154b..506dc069a6 100644
--- a/common/djangoapps/student/views.py
+++ b/common/djangoapps/student/views.py
@@ -1008,14 +1008,16 @@ def change_enrollment(request, check_access=True):
# Check that auto enrollment is allowed for this course
# (= the course is NOT behind a paywall)
if CourseMode.can_auto_enroll(course_id):
- # Enroll the user using the default mode (honor)
+ # Enroll the user using the default mode (audit)
# We're assuming that users of the course enrollment table
# will NOT try to look up the course enrollment model
# by its slug. If they do, it's possible (based on the state of the database)
# for no such model to exist, even though we've set the enrollment type
- # to "honor".
+ # to "audit".
try:
- CourseEnrollment.enroll(user, course_id, check_access=check_access)
+ enroll_mode = CourseMode.auto_enroll_mode(course_id, available_modes)
+ if enroll_mode:
+ CourseEnrollment.enroll(user, course_id, check_access=check_access, mode=enroll_mode)
except Exception:
return HttpResponseBadRequest(_("Could not enroll"))
diff --git a/common/templates/course_modes/choose.html b/common/templates/course_modes/choose.html
index 0def3743fd..3b05aa7f41 100644
--- a/common/templates/course_modes/choose.html
+++ b/common/templates/course_modes/choose.html
@@ -143,15 +143,35 @@ from django.core.urlresolvers import reverse
-
${_("Audit This Course")}
+
${_("Earn an Honor Certificate")}
-
${_("Audit this course for free and have complete access to all the course material, activities, tests, and forums. If your work is satisfactory and you abide by the Honor Code, you'll receive a personalized Honor Code Certificate to showcase your achievement.")}
+
${_("Take this course for free and have complete access to all the course material, activities, tests, and forums. Please note that learners who earn a passing grade will earn a certificate in this course.")}
+
+ % elif "audit" in modes:
+
+ ${_("or")}
+
+
+
+
+
+
${_("Audit This Course")}
+
+
${_("Audit this course for free and have complete access to all the course material, activities, tests, and forums. Please note that this track does not offer a certificate for learners who earn a passing grade.")}
+
+
+
+
${_("Your final grade:")}
${"{0:.0f}%".format(float(cert_status['grade'])*100)}.
- % if cert_status['status'] == 'notpassing' and enrollment.mode != 'audit':
- ${_("Grade required for a {cert_name_short}:").format(cert_name_short=cert_name_short)}
- ${"{0:.0f}%".format(float(course_overview.lowest_passing_grade)*100)}.
+ % if cert_status['status'] == 'notpassing':
+ % if enrollment.mode != 'audit':
+ ${_("Grade required for a {cert_name_short}:").format(cert_name_short=cert_name_short)}
+ % else:
+ ${_("Grade required to pass this course:")}
+ % endif
+ ${"{0:.0f}%".format(float(course_overview.lowest_passing_grade)*100)}.
% elif cert_status['status'] == 'restricted' and enrollment.mode == 'verified':
${_("Your verified {cert_name_long} is being held pending confirmation that the issuance of your {cert_name_short} is in compliance with strict U.S. embargoes on Iran, Cuba, Syria and Sudan. If you think our system has mistakenly identified you as being connected with one of those countries, please let us know by contacting {email}. If you would like a refund on your {cert_name_long}, please contact our billing address {billing_email}").format(email='{email}.'.format(email=settings.CONTACT_EMAIL), billing_email='{email}'.format(email=settings.PAYMENT_SUPPORT_EMAIL), cert_name_short=cert_name_short, cert_name_long=cert_name_long)}
diff --git a/lms/templates/dashboard/_dashboard_course_listing.html b/lms/templates/dashboard/_dashboard_course_listing.html
index b17e089ca1..50e6b1ac1a 100644
--- a/lms/templates/dashboard/_dashboard_course_listing.html
+++ b/lms/templates/dashboard/_dashboard_course_listing.html
@@ -9,6 +9,7 @@ from django.core.urlresolvers import reverse
from markupsafe import escape
from courseware.courses import get_course_university_about_section
from course_modes.models import CourseMode
+from course_modes.helpers import enrollment_mode_display
from student.helpers import (
VERIFY_STATUS_NEED_TO_VERIFY,
VERIFY_STATUS_SUBMITTED,
@@ -34,7 +35,13 @@ from student.helpers import (
% if settings.FEATURES.get('ENABLE_VERIFIED_CERTIFICATES'):
- <% course_verified_certs = CourseMode.enrollment_mode_display(enrollment.mode, verification_status.get('status')) %>
+ <%
+ course_verified_certs = enrollment_mode_display(
+ enrollment.mode,
+ verification_status.get('status'),
+ course_overview.id
+ )
+ %>
<%
mode_class = course_verified_certs.get('display_mode', '')
if mode_class != '':
@@ -69,7 +76,7 @@ from student.helpers import (
% endif
- % if settings.FEATURES.get('ENABLE_VERIFIED_CERTIFICATES'):
+ % if settings.FEATURES.get('ENABLE_VERIFIED_CERTIFICATES') and course_verified_certs.get('display_mode') != 'audit':
${_("Enrolled as: ")}
% if course_verified_certs.get('show_image'):
diff --git a/lms/templates/verify_student/missed_deadline.html b/lms/templates/verify_student/missed_deadline.html
index 05be906911..f342ec0372 100644
--- a/lms/templates/verify_student/missed_deadline.html
+++ b/lms/templates/verify_student/missed_deadline.html
@@ -22,7 +22,7 @@ from lms.djangoapps.verify_student.views import PayAndVerifyView
${_(u"The verification deadline for {course_name} was {date}. Verification is no longer available.").format(
course_name=course.display_name, date=deadline)}
% elif deadline_name == PayAndVerifyView.UPGRADE_DEADLINE:
- ${_(u"The deadline to upgrade to a verified certificate for this course has passed. You can still earn an honor code certificate.")}
+ ${_(u"The deadline to upgrade to a verified certificate for this course has passed.")}
% endif
diff --git a/openedx/core/djangoapps/credit/tests/test_services.py b/openedx/core/djangoapps/credit/tests/test_services.py
index c250ce0074..00080406c2 100644
--- a/openedx/core/djangoapps/credit/tests/test_services.py
+++ b/openedx/core/djangoapps/credit/tests/test_services.py
@@ -25,6 +25,15 @@ class CreditServiceTests(ModuleStoreTestCase):
self.credit_course = CreditCourse.objects.create(course_key=self.course.id, enabled=True)
self.profile = UserProfile.objects.create(user_id=self.user.id, name='Foo Bar')
+ def enroll(self, course_id=None):
+ """
+ Enroll the test user in the given course's honor mode, or the test
+ course if not provided.
+ """
+ if course_id is None:
+ course_id = self.course.id
+ return CourseEnrollment.enroll(self.user, course_id, mode='honor')
+
def test_user_not_found(self):
"""
Makes sure that get_credit_state returns None if user_id cannot be found
@@ -46,7 +55,7 @@ class CreditServiceTests(ModuleStoreTestCase):
inactive
"""
- enrollment = CourseEnrollment.enroll(self.user, self.course.id)
+ enrollment = self.enroll()
enrollment.is_active = False
enrollment.save()
@@ -58,7 +67,7 @@ class CreditServiceTests(ModuleStoreTestCase):
Credit eligible
"""
- CourseEnrollment.enroll(self.user, self.course.id)
+ self.enroll()
self.credit_course.enabled = False
self.credit_course.save()
@@ -86,7 +95,7 @@ class CreditServiceTests(ModuleStoreTestCase):
self.assertTrue(self.service.is_credit_course(self.course.id))
- CourseEnrollment.enroll(self.user, self.course.id)
+ self.enroll()
# set course requirements
set_credit_requirements(
@@ -127,7 +136,7 @@ class CreditServiceTests(ModuleStoreTestCase):
"""
self.assertTrue(self.service.is_credit_course(self.course.id))
- CourseEnrollment.enroll(self.user, self.course.id)
+ self.enroll()
# set course requirements
set_credit_requirements(
@@ -216,7 +225,7 @@ class CreditServiceTests(ModuleStoreTestCase):
self.assertFalse(self.service.is_credit_course(no_credit_course.id))
- CourseEnrollment.enroll(self.user, no_credit_course.id)
+ self.enroll(no_credit_course.id)
# this should be a no-op
self.service.remove_credit_requirement_status(
@@ -237,7 +246,7 @@ class CreditServiceTests(ModuleStoreTestCase):
Make sure we can get back the optional course name
"""
- CourseEnrollment.enroll(self.user, self.course.id)
+ self.enroll()
# make sure it is not returned by default
credit_state = self.service.get_credit_state(self.user.id, self.course.id)
@@ -258,7 +267,7 @@ class CreditServiceTests(ModuleStoreTestCase):
self.assertFalse(self.service.is_credit_course(no_credit_course.id))
- CourseEnrollment.enroll(self.user, no_credit_course.id)
+ self.enroll(no_credit_course.id)
# this should be a no-op
self.service.set_credit_requirement_status(
@@ -308,7 +317,7 @@ class CreditServiceTests(ModuleStoreTestCase):
Make sure we can pass a course_id (string) and get back correct results as well
"""
- CourseEnrollment.enroll(self.user, self.course.id)
+ self.enroll()
# set course requirements
set_credit_requirements(