Fix: Update div_ids used in testing.

Author: bjones1

runestone/activecode/test/_sources/index.rst

@@ -2,16 +2,14 @@
 
 ActiveCode Test
 ===============
+Note: an existing server-side test is named ``test_activecode_1``. So, we start numbering here at 2.
 
-
-.. activecode:: test1
+.. activecode:: test_activecode_2
 
    print("Hello World")
 
 
-End of test1
-
-.. activecode:: test1a
+.. activecode:: test_activecode_2a
 
    This question has multiple lines of explanatory
    text prior to the editing area or scaffolded code.
@@ -50,7 +48,7 @@ End of test1
         }
     }
 
-.. activecode:: test2
+.. activecode:: test_activecode_3
     :language: java
     :datafile: Shape.java
 
@@ -87,7 +85,7 @@ End of test1
     </script>
 
 
-.. activecode:: Picture
+.. activecode:: test_activecode_4
     :language: java
     :datafile: turtleClasses.jar, arch.jpg
 
@@ -213,9 +211,7 @@ End of test1
 
 Support for SQL in the browser ?  Yes!
 --------------------------------------
-
-
-.. activecode:: sql1
+.. activecode:: test_activecode_6
     :language: sql
     :autograde: unittest
     :dburl: /_static/test.db
@@ -230,7 +226,7 @@ Support for SQL in the browser ?  Yes!
 ..     :dburl: http://dev.runestoneinteractive.org:8080/_static/bikeshare.db
 
 
-.. activecode:: sql2
+.. activecode:: test_activecode_7
     :language: sql
     :autograde: unittest
     :dburl: /_static/test.db

runestone/activecode/test/_sources/progresspage.rst

@@ -1,7 +1,7 @@
 Progress Bar Testing
 ====================
 
-.. activecode:: test_p1
+.. activecode:: test_activecode_5
 
    print("Hello World")
 

runestone/activecode/test/test_activecode.py

@@ -27,10 +27,11 @@ def test_hello(selenium_utils_get):
     4. Check the output from the ac_output element
     :return:
     """
-    t1 = find_ac(selenium_utils_get, "test1")
+    div_id = "test_activecode_2"
+    t1 = find_ac(selenium_utils_get, div_id)
     click_run(t1)
     selenium_utils_get.wait.until(
-        EC.text_to_be_present_in_element((By.ID, "test1_stdout"), "Hello World"),
+        EC.text_to_be_present_in_element((By.ID, f"{div_id}_stdout"), "Hello World"),
         message="Did not find expected text",
     )
     output = t1.find_element_by_class_name("ac_output")
@@ -65,17 +66,17 @@ def test_history(selenium_utils_get):
     4. Check the output from the ac_output element
     :return:
     """
-    #import pdb; pdb.set_trace()
-    t1 = find_ac(selenium_utils_get, "test1")
-    selenium_utils_get.driver.execute_script("window.scrollTo(0, 0);")
+    div_id = "test_activecode_2"
+    t1 = find_ac(selenium_utils_get, div_id)
+    time.sleep(1)
     rb = t1.find_element_by_class_name("run-button")
     rb.click()
     time.sleep(2)
 
     ta = t1.find_element_by_class_name("cm-s-default")
     assert ta
     selenium_utils_get.driver.execute_script(
-        """window.edList['test1'].editor.setValue("print('GoodBye')")"""
+        f"""window.edList['{div_id}'].editor.setValue("print('GoodBye')")"""
     )
     selenium_utils_get.wait.until(EC.element_to_be_clickable((By.CLASS_NAME, "run-button")))
     try:
@@ -109,7 +110,7 @@ def test_livecode_datafile(selenium_utils_get):
     Runs test2 example
     Code is dependent on supplementary file
     """
-    t2 = find_ac(selenium_utils_get, "test2")
+    t2 = find_ac(selenium_utils_get, "test_activecode_3")
     click_run(t2)
     output = t2.find_element_by_class_name("ac_output")
 
@@ -133,7 +134,7 @@ def selenium_utils_progress(selenium_utils):
 
 
 def test_activity_count(selenium_utils_progress):
-    t2 = find_ac(selenium_utils_progress, "test_p1")
+    t2 = find_ac(selenium_utils_progress, "test_activecode_5")
     click_run(t2)
     pb = selenium_utils_progress.driver.find_element_by_id("subchapterprogress")
     assert pb
@@ -151,19 +152,19 @@ def test_activity_count(selenium_utils_progress):
 
 
 def test_sql_activecode(selenium_utils_get):
-    t2 = find_ac(selenium_utils_get, "sql1")
-    time.sleep(1)
+    div_id = "test_activecode_6"
+    t2 = find_ac(selenium_utils_get, div_id)
     click_run(t2)
-    selenium_utils_get.wait.until(EC.text_to_be_present_in_element((By.ID, "sql1_stdout"), "You"))
-    res = selenium_utils_get.driver.find_element_by_id("sql1_sql_out")
+    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("sql1_stdout")
+    out = selenium_utils_get.driver.find_element_by_id(f"{div_id}_stdout")
     assert "You passed 2 out of 3 tests" in out.text
 
-    t2 = selenium_utils_get.driver.find_element_by_id("sql2")
-    time.sleep(1)
+    div_id = "test_activecode_7"
+    t2 = find_ac(selenium_utils_get, div_id)
     click_run(t2)
-    out = selenium_utils_get.driver.find_element_by_id("sql2_stdout")
+    out = selenium_utils_get.driver.find_element_by_id(f"{div_id}_stdout")
     assert "" == out.text.strip()