Response to CR

common/djangoapps/course_modes/views.py

@@ -17,12 +17,10 @@ from edxmako.shortcuts import render_to_response
 
 from course_modes.models import CourseMode
 from courseware.access import has_access
-from student.models import CourseEnrollment, UserMethods
+from student.models import CourseEnrollment
 from student.views import course_from_id
 from verify_student.models import SoftwareSecurePhotoVerification
 
-EVENT_NAME_USER_CLICKED_UPGRADE = 'edx.user.upgrade.clicked'
-
 
 class ChooseModeView(View):
     """
@@ -39,8 +37,6 @@ class ChooseModeView(View):
 
         enrollment_mode = CourseEnrollment.enrollment_mode_for_user(request.user, course_id)
         upgrade = request.GET.get('upgrade', False)
-        if upgrade == "True":
-            UserMethods.emit_event(request.user, course_id, EVENT_NAME_USER_CLICKED_UPGRADE)
 
         # verified users do not need to register or upgrade
         if enrollment_mode == 'verified':

common/djangoapps/student/models.py

@@ -16,12 +16,6 @@ import json
 import logging
 import uuid
 
-import crum
-
-from track import contexts
-from track.views import server_track
-from eventtracking import tracker
-
 from django.conf import settings
 from django.contrib.auth.models import User
 from django.contrib.auth.signals import user_logged_in, user_logged_out

common/djangoapps/student/tests/tests.py

@@ -340,14 +340,7 @@ class EnrollInCourseTest(TestCase):
             user=user,
             course_id=course_id
         )
-
-    def test_user_emitted_events(self):
-        user = User.objects.create_user("joe", "joe@joe.com", "password")
-        course_id = "edX/Test101/2013"
-        course_id_partial = "edX/Test101"
-        with patch('eventtracking.tracker.get_tracker', side_effect=Exception):
-            UserMethods.emit_event(user, course_id, "fake")
-        self.assertTrue(True)
+        self.assertFalse(enrollment_record.is_active)
 
         # Make sure mode is updated properly if user unenrolls & re-enrolls
         enrollment = CourseEnrollment.enroll(user, course_id, "verified")

common/djangoapps/track/contexts.py

@@ -57,13 +57,3 @@ def course_context_from_course_id(course_id):
             )
 
     return context
-
-
-def user_context(user):
-    """
-    Creates a user context from `user`
-    """
-    context = {
-        'user': user,
-    }
-    return context