Merge branch 'master' into feature/cale/cms-master

Conflicts:
	rakefile

lms/.coveragerc

@@ -0,0 +1,13 @@
+# .coveragerc for lms
+[run]
+data_file = reports/lms/.coverage
+source = lms
+
+[report]
+ignore_errors = True
+
+[html]
+directory = reports/lms/cover
+
+[xml]
+output = reports/lms/coverage.xml

lms/djangoapps/courseware/models.py

@@ -108,7 +108,6 @@ class StudentModuleCache(object):
         else:
             self.cache = []
 
-
     @classmethod
     def cache_for_descriptor_descendents(cls, course_id, user, descriptor, depth=None,
                                          descriptor_filter=lambda descriptor: True,
@@ -138,7 +137,6 @@ class StudentModuleCache(object):
 
             return descriptors
 
-
         descriptors = get_child_descriptors(descriptor, depth, descriptor_filter)
 
         return StudentModuleCache(course_id, user, descriptors, select_for_update)

lms/envs/aws.py

@@ -85,3 +85,5 @@ CONTENTSTORE = AUTH_TOKENS.get('CONTENTSTORE', CONTENTSTORE)
 if 'COURSE_ID' in ENV_TOKENS:
     ASKBOT_URL = "courses/{0}/discussions/".format(ENV_TOKENS['COURSE_ID'])
 
+PEARSON_TEST_USER = "pearsontest"
+PEARSON_TEST_PASSWORD = AUTH_TOKENS.get("PEARSON_TEST_PASSWORD")

lms/envs/dev.py

@@ -177,3 +177,8 @@ FILE_UPLOAD_HANDLERS = (
 ########################### PIPELINE #################################
 
 PIPELINE_SASS_ARGUMENTS = '-r {proj_dir}/static/sass/bourbon/lib/bourbon.rb'.format(proj_dir=PROJECT_ROOT)
+
+########################## PEARSON TESTING ###########################
+MITX_FEATURES['ENABLE_PEARSON_HACK_TEST'] = True
+PEARSON_TEST_USER = "pearsontest"
+PEARSON_TEST_PASSWORD = "12345"

lms/envs/test.py

@@ -27,18 +27,11 @@ SOUTH_TESTS_MIGRATE = False # To disable migrations and use syncdb instead
 
 # Nose Test Runner
 INSTALLED_APPS += ('django_nose',)
-NOSE_ARGS = []
 
-# Turning off coverage speeds up tests dramatically... until we have better config,
-# leave it here for manual fiddling.
-_coverage = True
-if _coverage:
-    NOSE_ARGS = ['--cover-erase', '--with-xunit', '--with-xcoverage', '--cover-html',
-                 # '-v', '--pdb',     # When really stuck, uncomment to start debugger on error
-                 '--cover-inclusive', '--cover-html-dir',
-                 os.environ.get('NOSE_COVER_HTML_DIR', 'cover_html')]
-    for app in os.listdir(PROJECT_ROOT / 'djangoapps'):
-        NOSE_ARGS += ['--cover-package', app]
+NOSE_ARGS = [
+    '--with-xunit',
+    # '-v', '--pdb',     # When really stuck, uncomment to start debugger on error
+]
 TEST_RUNNER = 'django_nose.NoseTestSuiteRunner'
 
 # Local Directories

lms/templates/video.html

@@ -18,3 +18,9 @@
   <p>Download video <a href="${source}">here</a>.</p>
 </div>
 % endif
+
+% if track:
+<div class="video-tracks">
+  <p>Download subtitles <a href="${track}">here</a>.</p>
+</div>
+% endif

lms/urls.py

@@ -26,6 +26,11 @@ urlpatterns = ('',
     url(r'^reject_name_change$', 'student.views.reject_name_change'),
     url(r'^pending_name_changes$', 'student.views.pending_name_changes'),
 
+    url(r'^testcenter/login$', 'student.views.test_center_login'),
+
+    # url(r'^testcenter/login$', 'student.test_center_views.login'),
+    # url(r'^testcenter/logout$', 'student.test_center_views.logout'),
+
     url(r'^event$', 'track.views.user_track'),
     url(r'^t/(?P<template>[^/]*)$', 'static_template_view.views.index'), # TODO: Is this used anymore? What is STATIC_GRAB?