Merge branch 'master' into docs

Author: bnmnetp

runestone/activecode/js/activecode.js

@@ -2,6 +2,9 @@
  *
  * Created by bmiller on 3/19/15.
  */
+/* Define global variables for ESLint */
+/* global Sk */
+
 "use strict";
 
 import RunestoneBase from "../../common/js/runestonebase.js";
@@ -1132,40 +1135,39 @@ Yet another is that there is an internal error.  The internal error message is:
         return Promise.resolve(prog);
     }
 
-    async manage_scrubber(scrubber_dfd, history_dfd, saveCode) {
+    async manage_scrubber(saveCode) {
+        let scrubber_dfd = false;
         if (this.historyScrubber === null && !this.autorun) {
             scrubber_dfd = await this.addHistoryScrubber();
         }
-        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";
+        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";
+            }
         }
-        history_dfd = Promise.resolve({
-            history_dfd: scrubber_dfd,
-            saveCode: saveCode,
-        });
-        return history_dfd;
+        return Promise.resolve(saveCode);
     }
 
     async checkCurrentAnswer() {
@@ -1238,7 +1240,6 @@ Yet another is that there is an internal error.  The internal error message is:
         this.isAnswered = true;
         var prog = await this.buildProg(true);
         this.saveCode = "True";
-        var scrubber_dfd, history_dfd;
         $(this.output).text("");
         $(this.eContainer).remove();
         if (this.codelens) {
@@ -1277,14 +1278,7 @@ Yet another is that there is an internal error.  The internal error message is:
                 duration: 700,
                 queue: false,
             });
-            var __ret = await this.manage_scrubber(
-                scrubber_dfd,
-                history_dfd,
-                this.saveCode
-            );
-            history_dfd = __ret.history_dfd;
-            this.saveCode = __ret.saveCode;
-            promise_list.push(__ret);
+            this.saveCode = await this.manage_scrubber(this.saveCode);
         }
         this.run_promise = Sk.misceval.asyncToPromise(function () {
             return Sk.importMainWithBody("<stdin>", false, prog, true);
@@ -1295,7 +1289,7 @@ Yet another is that there is an internal error.  The internal error message is:
         var self = this;
         Promise.all(promise_list)
             .then(
-                function (mod) {
+                function () {
                     $(this.runButton).removeAttr("disabled");
                     if (!noUI) {
                         if (this.slideit) {

runestone/activecode/test/test_activecode.py

@@ -1,8 +1,10 @@
 from selenium.webdriver import ActionChains
 from selenium.webdriver.support import expected_conditions as EC
-from selenium.webdriver.support.ui import WebDriverWait
 from selenium.webdriver.common.by import By
-from selenium.common.exceptions import ElementClickInterceptedException
+from selenium.common.exceptions import (
+    ElementClickInterceptedException,
+    TimeoutException,
+)
 import time
 from runestone.unittest_base import module_fixture_maker, RunestoneTestCase
 
@@ -19,21 +21,19 @@ def test_hello(self):
         :return:
         """
         self.driver.get(self.host + "/index.html")
-        wait = WebDriverWait(self.driver, 10)
         try:
-            wait.until(EC.presence_of_element_located((By.ID, "test1")))
-        except:
+            self.wait.until(EC.presence_of_element_located((By.ID, "test1")))
+        except TimeoutException:
             text = self.driver.page_source
             print(text[:300])
         t1 = self.driver.find_element_by_id("test1")
         self.assertIsNotNone(t1)
         rb = t1.find_element_by_class_name("run-button")
         self.assertIsNotNone(rb)
         rb.click()
-        time.sleep(0.5)
-        wait = WebDriverWait(self.driver, 10)
-        wait.until(
-            EC.text_to_be_present_in_element((By.ID, "test1_stdout"), "Hello")
+        self.wait.until(
+            EC.text_to_be_present_in_element((By.ID, "test1_stdout"), "Hello World"),
+            message="Did not find expected text",
         )
         output = t1.find_element_by_class_name("ac_output")
         self.assertEqual(output.text.strip(), "Hello World")
@@ -47,22 +47,22 @@ def test_hidden(self):
         :return:
         """
         self.driver.get(self.host + "/index.html")
-        wait = WebDriverWait(self.driver, 10)
         try:
-            wait.until(EC.presence_of_element_located((By.ID, "testprefixcode")))
-        except:
+            self.wait.until(EC.presence_of_element_located((By.ID, "testprefixcode")))
+        except TimeoutException:
             text = self.driver.page_source
             print(text[:300])
         t1 = self.driver.find_element_by_id("testprefixcode")
         self.assertIsNotNone(t1)
         rb = t1.find_element_by_class_name("run-button")
         self.assertIsNotNone(rb)
         rb.click()
-        wait.until(
-            EC.text_to_be_present_in_element((By.ID, "testprefixcode_stdout"), "My")
+        self.wait.until(
+            EC.text_to_be_present_in_element(
+                (By.ID, "testprefixcode_stdout"), "My Code"
+            )
         )
         output = t1.find_element_by_class_name("ac_output")
-        self.assertIn("My Code", output.text.strip())
         self.assertIn("hidden code", output.text.strip())
         self.assertIn("i\nx", output.text.strip())
 
@@ -98,9 +98,7 @@ def test_history(self):
         self.driver.execute_script(
             """window.edList['test1'].editor.setValue("print('GoodBye')")"""
         )
-        WebDriverWait(self.driver, 10).until(
-            EC.element_to_be_clickable((By.CLASS_NAME, "run-button"))
-        )
+        self.wait.until(EC.element_to_be_clickable((By.CLASS_NAME, "run-button")))
         try:
             rb.click()
         except ElementClickInterceptedException:
@@ -147,7 +145,7 @@ def test_livecode_datafile(self):
             print("Ouput so far:", output.text)
         try:
             self.assertLess(count, 20)
-        except:
+        except Exception:
             print("WARNING - No response from JOBE server")
 
     def test_activity_count(self):
@@ -179,10 +177,7 @@ def test_sql_activecode(self):
         rb = t2.find_element_by_class_name("run-button")
         self.assertIsNotNone(rb)
         rb.click()
-        wait = WebDriverWait(self.driver, 10)
-        wait.until(
-            EC.text_to_be_present_in_element((By.ID, "sql1_stdout"), "You")
-        )
+        self.wait.until(EC.text_to_be_present_in_element((By.ID, "sql1_stdout"), "You"))
         res = self.driver.find_element_by_id("sql1_sql_out")
         self.assertIsNotNone(res)
         out = self.driver.find_element_by_id("sql1_stdout")
@@ -204,8 +199,7 @@ def test_readfiles(self):
         rb = t2.find_element_by_class_name("run-button")
         self.assertIsNotNone(rb)
         rb.click()
-        wait = WebDriverWait(self.driver, 10)
-        wait.until(
+        self.wait.until(
             EC.text_to_be_present_in_element((By.ID, "ac9_13_1_stdout"), "Lind")
         )
         out = t2.find_element_by_id("ac9_13_1_stdout")
@@ -221,11 +215,11 @@ def test_altair(self):
         rb.click()
         out = t2.find_element_by_id("alt_kiva_bar1_stdout")
         self.assertIsNotNone(out)
-        wait = WebDriverWait(self.driver, 10)
-        wait.until(
-            EC.text_to_be_present_in_element((By.ID, "alt_kiva_bar1_stdout"), "mark")
+        self.wait.until(
+            EC.text_to_be_present_in_element(
+                (By.ID, "alt_kiva_bar1_stdout"), "mark = bar"
+            )
         )
-        self.assertIn("mark = bar", out.text)
         self.assertIn("{'field': 'customer', 'type': 'nominal'}", out.text)
         can = t2.find_element_by_tag_name("canvas")
         self.assertIsNotNone(can)
@@ -237,13 +231,11 @@ def test_image(self):
         rb = t2.find_element_by_class_name("run-button")
         self.assertIsNotNone(rb)
         rb.click()
-        wait = WebDriverWait(self.driver, 10)
-        wait.until(
+        self.wait.until(
             EC.text_to_be_present_in_element((By.ID, "ac14_7_2_stdout"), "400")
         )
         out = t2.find_element_by_id("ac14_7_2_stdout")
         self.assertIsNotNone(out)
-        self.assertTrue("400" in out.text)
         self.assertTrue("244" in out.text)
         self.assertTrue(("165 161 158" in out.text) or ("165 162 157" in out.text))
         can = t2.find_element_by_tag_name("canvas")

runestone/unittest_base.py

@@ -24,6 +24,7 @@
 # -------------------
 from selenium import webdriver
 from selenium.webdriver.chrome.options import Options
+from selenium.webdriver.support.ui import WebDriverWait
 import pytest
 from pyvirtualdisplay import Display
 
@@ -70,14 +71,15 @@ def setUpModule(self):
         # Change to this directory for running Runestone.
         self.old_cwd = os.getcwd()
         os.chdir(self.base_path)
-        # use call so that npm run build completes before we move on to runestone build
+        # use `run` so that `npm run build` completes before we move on to `runestone build`
         # otherwise the runestone build may fail due to lack of a runestone.js file!
-        p = subprocess.call(
+        p = subprocess.run(
             ["npm.cmd" if IS_WINDOWS else "npm", "run", "build"],
             stdout=subprocess.PIPE,
             stderr=subprocess.PIPE,
             universal_newlines=True,
         )
+        self.assertFalse(p.returncode)
         # Compile the docs. Save the stdout and stderr for examination.
         p = subprocess.Popen(
             ["runestone", "build", "--all"],
@@ -230,6 +232,9 @@ def setUp(self):
         self.host = HOST_URL
         # Add an `implicit wait <https://selenium-python.readthedocs.io/waits.html#implicit-waits>`_.
         self.driver.implicitly_wait(5)
+        # For cases where an implicit wait does not help.  For example waiting for text to appear
+        # after running an activecode.  We create an explicit wait object.
+        self.wait = WebDriverWait(self.driver, 5)
 
     def tearDown(self):
         # Clear as much as possible, to present an almost-fresh instance of a browser for the next test. (Shutting down then starting up a browswer is very slow.)