Merge branch 'master' into bjones1-test_child_course

Author: runestonetest

controllers/ajax.py

@@ -608,7 +608,7 @@ def getlastpage():
                 rowarray_list.append(res)
             return json.dumps(rowarray_list)
         else:
-            db.user_state.insert(user_id=auth.user.id, course_id=course)
+            db.user_state.insert(user_id=auth.user.id, course_id=course.course_name)
 
 
 def _getCorrectStats(miscdata,event):

tests/test_ajax2.py

@@ -445,7 +445,6 @@ def test_RunLog(test_client, test_user_1):
 
     assert prog[0]['source'] == "this is a unittest"
 
-@pytest.mark.skip(reason='reactivate with bjones PR')
 def test_GetLastPage(test_client, test_user_1):
 
     test_user_1.login()