Revert "black"

This reverts commit 152764a.

Author: bnmnetp

runestone/activecode/test/test_activecode.py

@@ -18,8 +18,7 @@ def click_run(selenium_utils, ac_selenium_element):
     rb.click()
     # After clicking run, the browser may need some time to load and execute the code. Wait until the run button becomes clickable, indicating the code has finished running.
     div_id = ac_selenium_element.get_attribute("id")
-    selenium_utils.wait.until(EC.element_to_be_clickable(
-        (By.CSS_SELECTOR, f"#{div_id} .run-button")))
+    selenium_utils.wait.until(EC.element_to_be_clickable((By.CSS_SELECTOR, f"#{div_id} .run-button")))
 
 
 def test_hello(selenium_utils_get):
@@ -76,7 +75,7 @@ def test_history(selenium_utils_get):
     ta = t1.find_element_by_class_name("cm-s-default")
     assert ta
     selenium_utils_get.driver.execute_script(
-        f"""window.componentMap['{div_id}'].editor.setValue("print('Goodbye')")"""
+        f"""window.edList['{div_id}'].editor.setValue("print('Goodbye')")"""
     )
     click_run(selenium_utils_get, t1)
     output = t1.find_element_by_class_name("ac_output")
@@ -112,17 +111,14 @@ def test_activity_count(selenium_utils_progress):
     click_run(selenium_utils_progress, t2)
     pb = selenium_utils_progress.driver.find_element_by_id("subchapterprogress")
     assert pb
-    total = selenium_utils_progress.driver.find_element_by_id(
-        "scprogresstotal").text.strip()
+    total = selenium_utils_progress.driver.find_element_by_id("scprogresstotal").text.strip()
     assert 2 == int(total)
-    possible = selenium_utils_progress.driver.find_element_by_id(
-        "scprogressposs").text.strip()
+    possible = selenium_utils_progress.driver.find_element_by_id("scprogressposs").text.strip()
     # expect only 1 because the page isn't included when not using services
     assert 2 == int(possible)
     # count should not increment after a second click
     click_run(selenium_utils_progress, t2)
-    total = selenium_utils_progress.driver.find_element_by_id(
-        "scprogresstotal").text.strip()
+    total = selenium_utils_progress.driver.find_element_by_id("scprogresstotal").text.strip()
     assert 2 == int(total)
 
 
@@ -132,8 +128,7 @@ def test_sql_activecode(selenium_utils_get):
     # TODO: We don't yet have a way for async operations in ActiveCode constructors to signal when they're complete. So, insert a delay to guesstimate when the async load of the SQL WASM code and other async functions complete.
     time.sleep(2)
     click_run(selenium_utils_get, t2)
-    selenium_utils_get.wait.until(
-        EC.text_to_be_present_in_element((By.ID, f"{div_id}_stdout"), "You"))
+    selenium_utils_get.wait.until(EC.text_to_be_present_in_element((By.ID, f"{div_id}_stdout"), "You"))
     res = selenium_utils_get.driver.find_element_by_id(f"{div_id}_sql_out")
     assert res
     out = selenium_utils_get.driver.find_element_by_id(f"{div_id}_stdout")
@@ -151,7 +146,7 @@ def test_sql_activecode(selenium_utils_get):
     ta = t1.find_element_by_class_name("cm-s-default")
     assert ta
     selenium_utils_get.driver.execute_script(
-        f"""window.componentMap['{div_id}'].editor.setValue("CREATE TABLE created_table (x TEXT); INSERT INTO created_table VALUES ('itworks');")"""
+        f"""window.edList['{div_id}'].editor.setValue("CREATE TABLE created_table (x TEXT); INSERT INTO created_table VALUES ('itworks');")"""
     )
     click_run(selenium_utils_get, t1)
 
@@ -160,14 +155,12 @@ def test_sql_activecode(selenium_utils_get):
     # TODO: We don't yet have a way for async operations in ActiveCode constructors to signal when they're complete. So, insert a delay to guesstimate when the async load of the SQL WASM code and other async functions complete.
     time.sleep(2)
     click_run(selenium_utils_get, t2)
-    selenium_utils_get.wait.until(
-        EC.text_to_be_present_in_element((By.ID, f"{div_id}_stdout"), "You"))
+    selenium_utils_get.wait.until(EC.text_to_be_present_in_element((By.ID, f"{div_id}_stdout"), "You"))
     res = selenium_utils_get.driver.find_element_by_id(f"{div_id}_sql_out")
     assert res
     out = selenium_utils_get.driver.find_element_by_id(f"{div_id}_stdout")
     assert "You passed 1 out of 1 tests" in out.text
 
-
 @pytest.fixture
 def selenium_utils_sf(selenium_utils):
     selenium_utils.get("skulptfeatures.html")

runestone/timed/test/test_timed.py

@@ -95,8 +95,7 @@ def _test_1(selenium_utils_mq, timed_divid):
     src, dest = dnd.find_elements_by_class_name("rsdraggable")
     src_items = src.find_elements_by_tag_name("span")
     for i in range(3):
-        selenium_utils_mq.driver.execute_script(
-            f"""$("#{src_items[i].get_attribute('id')}").simulateDragDrop({{ dropTarget: 'span:contains("Answer {src_items[i].text[8:]}")' }})""")
+        selenium_utils_mq.driver.execute_script(f"""$("#{src_items[i].get_attribute('id')}").simulateDragDrop({{ dropTarget: 'span:contains("Answer {src_items[i].text[8:]}")' }})""")
     selenium_utils_mq.scroll_to_top()
     next.click()
 
@@ -111,33 +110,27 @@ def _test_1(selenium_utils_mq, timed_divid):
     div_id = "test_timed_activecode_1"
     selenium_utils_mq.wait_until_ready(div_id)
     selenium_utils_mq.driver.execute_script(
-        f"""window.componentMap['{div_id}'].editor.setValue("def add(a, b): return a + b")"""
+        f"""window.edList['{div_id}'].editor.setValue("def add(a, b): return a + b")"""
     )
     next.click()
 
     # The Parson's problem.
     selenium_utils_mq.wait_until_ready("test_timed_parsons_1")
     # This is an ugly hack, since Parson's problems number problems sequentially instead of based on the problem's ID. The div_id happens to match the ordering of Parson's problems...
     parsons_counter = timed_divid[-1]
-    source = selenium_utils_mq.driver.find_element_by_id(
-        f"parsons-{parsons_counter}-source")
-    answer = selenium_utils_mq.driver.find_element_by_id(
-        f"parsons-{parsons_counter}-answer")
-    dragndrop(selenium_utils_mq, source.find_element_by_id(
-        f"parsons-{parsons_counter}-block-0"), answer)
+    source = selenium_utils_mq.driver.find_element_by_id(f"parsons-{parsons_counter}-source")
+    answer = selenium_utils_mq.driver.find_element_by_id(f"parsons-{parsons_counter}-answer")
+    dragndrop(selenium_utils_mq, source.find_element_by_id(f"parsons-{parsons_counter}-block-0"), answer)
     time.sleep(1)
-    dragndrop(selenium_utils_mq, source.find_element_by_id(
-        f"parsons-{parsons_counter}-block-2"), answer)
+    dragndrop(selenium_utils_mq, source.find_element_by_id(f"parsons-{parsons_counter}-block-2"), answer)
     time.sleep(1)
-    dragndrop(selenium_utils_mq, source.find_element_by_id(
-        f"parsons-{parsons_counter}-block-1"), answer)
+    dragndrop(selenium_utils_mq, source.find_element_by_id(f"parsons-{parsons_counter}-block-1"), answer)
     next.click()
 
     # The short answer question.
     div_id = "test_timed_shortanswer_1"
     selenium_utils_mq.wait_until_ready(div_id)
-    selenium_utils_mq.driver.find_element_by_id(
-        f"{div_id}_solution").send_keys("ROYGBIV circle area")
+    selenium_utils_mq.driver.find_element_by_id(f"{div_id}_solution").send_keys("ROYGBIV circle area")
 
     finish(selenium_utils_mq)
     div_id = f"{timed_divid}results"