Merge branch 'master' into tests/diana/update-oe-unit-tests

Gemfile

@@ -1,5 +1,4 @@
 source :rubygems
-ruby "1.8.7"
 gem 'rake', '~> 10.0.3'
 gem 'sass', '3.1.15'
 gem 'bourbon', '~> 1.3.6'

common/djangoapps/student/management/commands/tests/test_pearson.py

@@ -40,6 +40,7 @@ def create_tc_registration(username, course_id = 'org1/course1/term1', exam_code
                'eligibility_appointment_date_first' : '2013-01-01T00:00',
                'eligibility_appointment_date_last' : '2013-12-31T23:59',
                'accommodation_code' : accommodation_code, 
+               'create_dummy_exam' : True,
                }
 
     call_command('pearson_make_tc_registration', username, course_id, **options)
@@ -179,11 +180,11 @@ class PearsonCommandTestCase(PearsonTestCase):
         self.assertErrorContains(error_string, 'Field Form Error:  address_1')
         
     def test_create_good_testcenter_user(self):
-        testcenter_user = create_tc_user("test1")
+        testcenter_user = create_tc_user("test_good_user")
         self.assertIsNotNone(testcenter_user)
         
     def test_create_good_testcenter_registration(self):
-        username = 'test1'
+        username = 'test_good_registration'
         create_tc_user(username)
         registration = create_tc_registration(username)
         self.assertIsNotNone(registration)

lms/envs/test.py

@@ -17,7 +17,7 @@ from path import path
 MITX_FEATURES['DISABLE_START_DATES'] = True
 
 # Until we have discussion actually working in test mode, just turn it off
-#MITX_FEATURES['ENABLE_DISCUSSION_SERVICE'] = True
+MITX_FEATURES['ENABLE_DISCUSSION_SERVICE'] = False
 
 # Need wiki for courseware views to work. TODO (vshnayder): shouldn't need it.
 WIKI_ENABLED = True

lms/static/coffee/src/navigation.coffee

@@ -13,6 +13,7 @@ class @Navigation
         active: active
         header: 'h3'
         autoHeight: false
+        heightStyle: 'content'
       $('#accordion .ui-state-active').closest('.chapter').addClass('is-open')
       $('#open_close_accordion a').click @toggle
       $('#accordion').show()