Merge branch 'bjones1-misc_bugs'

Author: runestonetest

controllers/admin.py

@@ -1822,20 +1822,26 @@ def _add_q_meta_info(qrow):
     requires_login=True,
 )
 def get_assignment():
-    assignment_id = request.vars["assignmentid"]
+    try:
+        assignment_id = int(request.vars.assignmentid)
+    except:
+        assignment_row = None
+    else:
+        assignment_row = db(db.assignments.id == assignment_id).select().first()
     # Assemble the assignment-level properties
-    if assignment_id == "undefined":
+    if not assignment_row:
         logger.error(
-            "UNDEFINED assignment {} {}".format(
-                auth.user.course_name, auth.user.username
+            "UNDEFINED assignment {} {} {}".format(
+                request.vars.assignmentid, auth.user.course_name, auth.user.username
             )
         )
-        session.flash = "Error assignment ID is undefined"
-        return redirect(URL("assignments", "index"))
+        session.flash = "Error: assignment ID {} does not exist".format(
+            request.vars.assignmentid
+        )
+        return redirect(URL("assignments", "chooseAssignment.html"))
 
     _set_assignment_max_points(assignment_id)
     assignment_data = {}
-    assignment_row = db(db.assignments.id == assignment_id).select().first()
     assignment_data["assignment_points"] = assignment_row.points
     try:
         assignment_data["due_date"] = assignment_row.duedate.strftime("%Y/%m/%d %H:%M")

controllers/default.py

@@ -412,9 +412,13 @@ def removecourse():
         redirect(URL("default", "courses"))
 
     if settings.academy_mode:
-        course_id_query = db(db.courses.course_name == request.args[0]).select(
-            db.courses.id
+        course_id_query = (
+            db(db.courses.course_name == request.args[0]).select(db.courses.id).first()
         )
+        # Redirect if this course wasn't found.
+        if not course_id_query:
+            redirect(URL("default", "courses"))
+
         # todo: properly encode course_names to handle courses with special characters
         # Check if they're about to remove their currently active course
         auth_query = db(db.auth_user.id == auth.user.id).select()
@@ -426,7 +430,7 @@ def removecourse():
             else:
                 db(
                     (db.user_courses.user_id == auth.user.id)
-                    & (db.user_courses.course_id == course_id_query[0].id)
+                    & (db.user_courses.course_id == course_id_query.id)
                 ).delete()
 
     redirect("/%s/default/courses" % request.application)

tests/conftest.py

@@ -566,7 +566,10 @@ def validate(
                 admin_client.get("default/ticket/" + error_code)
                 assert admin_client.status == 200
                 # Save it to a file.
-                traceback_file = url.replace("/", "-") + "_traceback.html"
+                traceback_file = (
+                    "".join(c if c not in "\/:*?<>|" else "_" for c in url)
+                    + "_traceback.html"
+                )
                 with open(traceback_file, "wb") as f:
                     f.write(_html_prep(admin_client.text))
                 print("Traceback saved to {}.".format(traceback_file))

tests/test_course_1/_sources/index.rst

@@ -5,6 +5,7 @@ This book generates data for use with the test suite.
 
 .. toctree::
    :maxdepth: 2
+   :numbered:
 
    test_chapter_1/toctree
    lp_demo.py

tests/test_server.py

@@ -12,7 +12,6 @@
 #
 # Standard library
 # ----------------
-from io import open
 from textwrap import dedent
 import json
 from threading import Thread
@@ -101,7 +100,7 @@ def test_killer(test_assignment, test_client, test_user_1, runestone_db_tools):
         ("default/user/login", False, "Login", 1),
         ("default/user/register", False, "Registration", 1),
         ("default/user/logout", True, "Logged out", 1),
-        # One profile error is a result of removing the input field for the e-mail, but web2py still tries to label it, which is an error.
+        # One validation error is a result of removing the input field for the e-mail, but web2py still tries to label it, which is an error.
         ("default/user/profile", True, "Profile", 2),
         ("default/user/change_password", True, "Change password", 1),
         # Runestone doesn't support this.
@@ -114,14 +113,11 @@ def test_killer(test_assignment, test_client, test_user_1, runestone_db_tools):
         # FIXME: This produces an exception.
         #'default/user/groups', True, 'Groups', 1),
         ("default/user/not_authorized", False, "Not authorized", 1),
-        # Returns a 404.
-        # ('default/user/navbar'=(False, 'xxx', 1),
         # *Other pages*
         #
         # TODO: What is this for?
         # ('default/call', False, 'Not found', 0),
-        # TODO: weird returned HTML. ???
-        # ('default/index', True, 'Course Selection', 1),
+        ("default/index", True, "Course Selection", 1),
         ("default/about", False, "About Us", 1),
         ("default/error", False, "Error: the document does not exist", 1),
         ("default/ack", False, "Acknowledgements", 1),
@@ -132,14 +128,16 @@ def test_killer(test_assignment, test_client, test_user_1, runestone_db_tools):
         # Should work in both cases.
         ("default/reportabug", False, "Report a Bug", 1),
         ("default/reportabug", True, "Report a Bug", 1),
-        # TODO: weird returned HTML. ???
         # ('default/sendreport', True, 'Could not create issue', 1),
         ("default/terms", False, "Terms and Conditions", 1),
         ("default/privacy", False, "Runestone Academy Privacy Policy", 1),
         ("default/donate", False, "Support Runestone Interactive", 1),
-        # TODO: This soesn't really test the body of either of these
+        # TODO: This doesn't really test much of the body of either of these.
         ("default/coursechooser", True, "Course Selection", 1),
+        # If we choose an invalid course, then we go to the profile to allow the user to add that course. The second validation failure seems to be about the ``for`` attribute of the ```<label class="readonly" for="auth_user_email" id="auth_user_email__label">`` tag, since the id ``auth_user_email`` isn't defined elsewhere.
+        ("default/coursechooser/xxx", True, "Course IDs for open courses", 2),
         ("default/removecourse", True, "Course Selection", 1),
+        ("default/removecourse/xxx", True, "Course Selection", 1),
         ("dashboard/studentreport", True, "Recent Activity", 1,),
         # **Designer**
         # -------------
@@ -203,6 +201,9 @@ def test_validate_user_pages(
         # ('admin/removeassign', 'Cannot remove assignment with id of', 1),
         # ('admin/removeinstructor', 'xxx', 1),
         # ('admin/removeStudents', 'xxx', 1),
+        ("admin/get_assignment", "Error: assignment ID", 1),
+        ("admin/get_assignment?assignmentid=junk", "Error: assignment ID", 1),
+        ("admin/get_assignment?assignmentid=100", "Error: assignment ID", 1),
         # TODO: added to the ``createAssignment`` endpoint so far.
         # **Dashboard**
         # --------------