Merge branch 'master' into docs

Author: bnmnetp

runestone/activecode/js/activecode.js

@@ -241,9 +241,14 @@ export class ActiveCode extends RunestoneBase {
         $(butt).addClass("btn btn-success run-button");
         ctrlDiv.appendChild(butt);
         this.runButton = butt;
+        console.log("adding click function for run");
         $(butt).click(
             async function () {
-                await this.runProg();
+                try {
+                    await this.runProg();
+                } catch (e) {
+                    console.log(`there was an error ${e} running the code`);
+                }
                 if (this.logResults) {
                     this.logCurrentAnswer();
                 }
@@ -1136,42 +1141,46 @@ Yet another is that there is an internal error.  The internal error message is:
     }
 
     async manage_scrubber(saveCode) {
-        let scrubber_dfd = false;
         if (this.historyScrubber === null && !this.autorun) {
-            scrubber_dfd = await this.addHistoryScrubber();
-        }
-        if (scrubber_dfd && scrubber_dfd.ok) {
-            if (
-                this.historyScrubber &&
-                this.history[$(this.historyScrubber).slider("value")] !=
-                    this.editor.getValue()
-            ) {
-                saveCode = "True";
-                this.history.push(this.editor.getValue());
-                this.timestamps.push(new Date().toLocaleString());
-                $(this.historyScrubber).slider(
-                    "option",
-                    "max",
-                    this.history.length - 1
-                );
-                $(this.historyScrubber).slider(
-                    "option",
-                    "value",
-                    this.history.length - 1
-                );
-                this.slideit();
-            } else {
-                saveCode = "False";
-            }
-            if (this.historyScrubber == null) {
-                saveCode = "False";
+            let response = await this.addHistoryScrubber();
+            if (!response.ok) {
+                console.log("Failed to load history -- this should not fail.");
             }
         }
+        if (
+            this.historyScrubber &&
+            this.history[$(this.historyScrubber).slider("value")] !=
+                this.editor.getValue()
+        ) {
+            saveCode = "True";
+            this.history.push(this.editor.getValue());
+            this.timestamps.push(new Date().toLocaleString());
+            $(this.historyScrubber).slider(
+                "option",
+                "max",
+                this.history.length - 1
+            );
+            $(this.historyScrubber).slider(
+                "option",
+                "value",
+                this.history.length - 1
+            );
+            this.slideit();
+        } else {
+            saveCode = "False";
+        }
+        if (this.historyScrubber == null) {
+            saveCode = "False";
+        }
         return Promise.resolve(saveCode);
     }
 
     async checkCurrentAnswer() {
-        this.run_promise = this.runProg();
+        try {
+            await this.runProg();
+        } catch (e) {
+            console.log(`error running code ${e}`);
+        }
     }
 
     logCurrentAnswer() {
@@ -1229,6 +1238,7 @@ Yet another is that there is an internal error.  The internal error message is:
      *
      */
     async runProg(noUI, logResults) {
+        console.log("starting runProg");
         if (typeof logResults === "undefined") {
             this.logResults = true;
         } else {
@@ -1241,7 +1251,10 @@ Yet another is that there is an internal error.  The internal error message is:
         var prog = await this.buildProg(true);
         this.saveCode = "True";
         $(this.output).text("");
-        $(this.eContainer).remove();
+        while ($(`#${this.divid}_errinfo`).length > 0) {
+            $(`#${this.divid}_errinfo`).remove();
+        }
+        //$(this.eContainer).remove();
         if (this.codelens) {
             this.codelens.style.display = "none";
         }

runestone/activecode/js/timed_activecode.js

@@ -71,21 +71,10 @@ var TimedActiveCodeMixin = {
     },
 
     reinitializeListeners: function (taken) {
-        // re-attach the run button listener
-        $(this.runButton).click(this.runProg.bind(this));
         $(this.codeDiv).show();
         this.runButton.disabled = false;
         $(this.codeDiv).removeClass("ac-disabled");
         this.editor.refresh();
-        $(this.histButton).click(this.addHistoryScrubber.bind(this));
-        if (this.historyScrubber !== null) {
-            $(this.historyScrubber).slider({
-                max: this.history.length - 1,
-                value: this.history.length - 1,
-                slide: this.slideit.bind(this),
-                change: this.slideit.bind(this),
-            });
-        }
         if (taken) {
             $(`#${this.divid}_unit_results`).show();
         }

runestone/common/js/runestonebase.js

@@ -60,10 +60,10 @@ export default class RunestoneBase {
         });
     }
 
-// .. _logBookEvent:
-//
-// logBookEvent
-// ------------
+    // .. _logBookEvent:
+    //
+    // logBookEvent
+    // ------------
     // This function sends the provided ``eventInfo`` to the `hsblog endpoint` of the server. Awaiting this function returns either ``undefined`` (if Runestone services are not available) or the data returned by the server as a JavaScript object (already JSON-decoded).
     async logBookEvent(eventInfo) {
         if (this.graderactive) {
@@ -99,10 +99,10 @@ export default class RunestoneBase {
         return post_return;
     }
 
-// .. _logRunEvent:
-//
-// logRunEvent
-// -----------
+    // .. _logRunEvent:
+    //
+    // logRunEvent
+    // -----------
     // This function sends the provided ``eventInfo`` to the `runlog endpoint`. When awaited, this function returns the data (decoded from JSON) the server sent back.
     async logRunEvent(eventInfo) {
         let post_promise = "done";
@@ -121,8 +121,8 @@ export default class RunestoneBase {
                 headers: this.jsonHeaders,
                 body: JSON.stringify(eventInfo),
             });
-            post_promise = await fetch(request);
-            if (!post_promise.ok) {
+            let response = await fetch(request);
+            if (!response.ok) {
                 throw new Error("Failed to log the run");
             }
             post_promise = await response.json();
@@ -139,6 +139,10 @@ export default class RunestoneBase {
     /* Checking/loading from storage */
     async checkServer(eventInfo) {
         // Check if the server has stored answer
+        let self = this;
+        this.checkServerComplete = new Promise(function (resolve, reject) {
+            self.csresolver = resolve;
+        });
         if (this.useRunestoneServices || this.graderactive) {
             let data = {};
             data.div_id = this.divid;
@@ -165,6 +169,7 @@ export default class RunestoneBase {
                     let response = await fetch(request);
                     data = await response.json();
                     this.repopulateFromStorage(data);
+                    this.csresolver("server");
                 } catch (err) {
                     try {
                         this.checkLocalStorage();
@@ -177,6 +182,7 @@ export default class RunestoneBase {
             }
         } else {
             this.checkLocalStorage(); // just go right to local storage
+            this.csresolver("local");
         }
     }
 

runestone/mchoice/test/test_assess.py

@@ -1,16 +1,21 @@
-"""
-Test Multiple Choice question directive
-"""
+# ****************************************************
+# |docname| - Test Multiple Choice question directive
+# ****************************************************
 
 __author__ = "yasinovskyy"
 
 from unittest import TestCase
-from selenium.webdriver.support import expected_conditions as EC
 from selenium.webdriver.common.by import By
-from runestone.unittest_base import module_fixture_maker, RunestoneTestCase
+from selenium.webdriver.support import expected_conditions as EC
+from runestone.unittest_base import (
+    module_fixture_maker,
+    RunestoneTestCase,
+    element_has_css_class,
+)
 
 mf, setUpModule, tearDownModule = module_fixture_maker(__file__, True)
 
+
 # Look for errors producted by invalid questions.
 class MultipleChoiceQuestion_Error_Tests(TestCase):
     def test_1(self):
@@ -132,10 +137,9 @@ def test_mc1(self):
         t1 = self.driver.find_element_by_id("question2")
         btn_check = t1.find_element_by_tag_name("button")
         btn_check.click()
-        fb = t1.find_element_by_id("question2_feedback")
-        self.assertIsNotNone(fb)
-        cnamestr = fb.get_attribute("class")
-        self.assertIn("alert-danger", cnamestr)
+        self.wait.until(
+            element_has_css_class((By.ID, "question2_feedback"), "alert-danger")
+        )
 
     def test_mc2(self):
         """Multiple Choice: Correct answer selected"""
@@ -149,6 +153,10 @@ def test_mc2(self):
 
         fb = t1.find_element_by_id("question2_feedback")
         self.assertIsNotNone(fb)
+        self.wait.until(
+            EC.text_to_be_present_in_element((By.ID, "question2_feedback"), "Red"),
+            message="Did not find expected text",
+        )
         cnamestr = fb.get_attribute("class")
         self.assertIn("alert-info", cnamestr)
 

runestone/parsons/js/parsons.js

@@ -278,6 +278,7 @@ export default class Parsons extends RunestoneBase {
         this.parsonsControlDiv.appendChild(this.messageDiv);
         $(this.messageDiv).hide();
         $(this.origElem).replaceWith(this.containerDiv);
+        $(this.containerDiv).closest(".sqcontainer").css("max-width", "none");
     }
     // Initialize lines and solution properties
     initializeLines(text) {
@@ -296,13 +297,13 @@ export default class Parsons extends RunestoneBase {
             // Remove the options from the code
             // only options are #paired or #distractor
             var options = {};
-            textBlock = textBlock.replace(/#(paired|distractor)/, function (
-                mystring,
-                arg1
-            ) {
-                options[arg1] = true;
-                return "";
-            });
+            textBlock = textBlock.replace(
+                /#(paired|distractor)/,
+                function (mystring, arg1) {
+                    options[arg1] = true;
+                    return "";
+                }
+            );
             // Create lines
             var lines = [];
             var split = textBlock.split("\n");
@@ -2058,8 +2059,9 @@ export default class Parsons extends RunestoneBase {
         $(this.messageDiv).hide();
     }
     // Disable the interface
-    disableInteraction() {
+    async disableInteraction() {
         // Disable blocks
+        await this.checkServerComplete;
         if (this.blocks !== undefined) {
             for (var i = 0; i < this.blocks.length; i++) {
                 var block = this.blocks[i];

runestone/selectquestion/selectone.py

@@ -47,7 +47,7 @@
 
 
 TEMPLATE = """
-<div class="runestone alert alert-warning">
+<div class="runestone alert alert-warning sqcontainer">
 <div data-component="selectquestion" id={component_id} {selector} {points} {proficiency} {min_difficulty} {max_difficulty} {autogradable} {not_seen_ever} {primary} {AB}>
     <p>Loading ...</p>
 </div>

runestone/timed/js/timed.js

@@ -815,9 +815,10 @@ export default class Timed extends RunestoneBase {
         currentQuestion.checkCurrentAnswer();
         currentQuestion.logCurrentAnswer();
         currentQuestion.renderFeedback();
+        currentQuestion.disableInteraction();
 
         for (var i = 0; i < this.renderedQuestionArray.length; i++) {
-            var currentQuestion = this.renderedQuestionArray[i];
+            let currentQuestion = this.renderedQuestionArray[i];
             // set the state to forreview so we know that feedback may be appropriate
             currentQuestion.state = "forreview";
         }