Merge branch 'master' into more-tests-1

Author: bnmnetp

runestone/activecode/test/test_activecode.py

@@ -92,8 +92,7 @@ def test_history(selenium_utils_get):
 
 def test_livecode_datafile(selenium_utils_get):
     """
-    Runs test2 example
-    Code is dependent on supplementary file
+    Code is dependent on datafile directive.
     """
     t2 = find_ac(selenium_utils_get, "test_activecode_3")
     click_run(selenium_utils_get, t2)

runestone/codelens/js/codelens.js

@@ -30,6 +30,9 @@ function attachLoggers(codelens, divid) {
     codelens.domRoot.find("#executionSlider").bind("slide", function (evt, ui) {
         rb.logBookEvent({ event: "codelens", act: "slide", div_id: divid });
     });
+    // TODO: The component isn't quite fully initialized, but it also doesn't inherit from RunestoneBase. This is a convenient place to mark it ready for now, but it should be moved forward in time during a rewrite.
+    rb.containerDiv = document.getElementById(divid);
+    rb.indicate_component_ready();
 }
 
 function styleButtons(divid) {

runestone/codelens/test/_sources/index.rst

@@ -13,7 +13,7 @@ CodeLens Tests
 .. Sources can also be included from subfolders of this directory.
    (e.g. "DataStructures/queues.rst").
 
-.. codelens:: test1
+.. codelens:: test_codelens_1
 
    a = [1, 2, 3]
    b = [4, 5, 6]
@@ -22,7 +22,7 @@ CodeLens Tests
 
 You can make a Codelens by providing the raw trace data in the source as an option.
 
-.. codelens:: test2
+.. codelens:: test_codelens_2
     :language: java
     :tracedata: {"code":"public class Test { public static void main(String[] args)\n { int x=42;\n x+=1;\n x+=1; x+=1;} }","stdin":"","trace":[{"stdout":"","event":"call","line":2,"stack_to_render":[{"func_name":"main:2","encoded_locals":{},"ordered_varnames":[],"parent_frame_id_list":[],"is_highlighted":true,"is_zombie":false,"is_parent":false,"unique_hash":"1","frame_id":1}],"globals":{},"ordered_globals":[],"func_name":"main","heap":{}},{"stdout":"","event":"step_line","line":2,"stack_to_render":[{"func_name":"main:2","encoded_locals":{},"ordered_varnames":[],"parent_frame_id_list":[],"is_highlighted":true,"is_zombie":false,"is_parent":false,"unique_hash":"2","frame_id":2}],"globals":{},"ordered_globals":[],"func_name":"main","heap":{}},{"stdout":"","event":"step_line","line":3,"stack_to_render":[{"func_name":"main:3","encoded_locals":{"x":42},"ordered_varnames":["x"],"parent_frame_id_list":[],"is_highlighted":true,"is_zombie":false,"is_parent":false,"unique_hash":"4","frame_id":4}],"globals":{},"ordered_globals":[],"func_name":"main","heap":{}},{"stdout":"","event":"step_line","line":4,"stack_to_render":[{"func_name":"main:4","encoded_locals":{"x":43},"ordered_varnames":["x"],"parent_frame_id_list":[],"is_highlighted":true,"is_zombie":false,"is_parent":false,"unique_hash":"6","frame_id":6}],"globals":{},"ordered_globals":[],"func_name":"main","heap":{}},{"stdout":"","event":"step_line","line":4,"stack_to_render":[{"func_name":"main:4","encoded_locals":{"x":44},"ordered_varnames":["x"],"parent_frame_id_list":[],"is_highlighted":true,"is_zombie":false,"is_parent":false,"unique_hash":"8","frame_id":8}],"globals":{},"ordered_globals":[],"func_name":"main","heap":{}},{"stdout":"","event":"step_line","line":4,"stack_to_render":[{"func_name":"main:4","encoded_locals":{"x":45},"ordered_varnames":["x"],"parent_frame_id_list":[],"is_highlighted":true,"is_zombie":false,"is_parent":false,"unique_hash":"9","frame_id":9}],"globals":{},"ordered_globals":[],"func_name":"main","heap":{}},{"stdout":"","event":"return","line":4,"stack_to_render":[{"func_name":"main:4","encoded_locals":{"x":45,"__return__":["VOID"]},"ordered_varnames":["x","__return__"],"parent_frame_id_list":[],"is_highlighted":true,"is_zombie":false,"is_parent":false,"unique_hash":"10","frame_id":10}],"globals":{},"ordered_globals":[],"func_name":"main","heap":{}}],"userlog":"Debugger VM maxMemory: 444M\n"}
 
@@ -34,7 +34,7 @@ You can make a Codelens by providing the raw trace data in the source as an opti
 
 Lets test Java now by providing the source.
 
-.. codelens:: test3
+.. codelens:: test_codelens_3
     :language: java
 
     public class Test1
@@ -49,7 +49,7 @@ Lets test Java now by providing the source.
        }
     }
 
-.. codelens:: test4
+.. codelens:: test_codelens_4
     :language: c
 
     #include <stdlib.h>
@@ -68,7 +68,7 @@ Lets test Java now by providing the source.
     }
 
 
-.. codelens:: test5
+.. codelens:: test_codelens_5
 
    a = [1, 2, 3]
    b = [4, 5, 6]
@@ -88,7 +88,7 @@ Lets test Java now by providing the source.
        prod = prod * i
 
 
-.. codelens:: test6
+.. codelens:: test_codelens_6
     :language: cpp
 
     // From the test suite of https://github.com/codespecs/daikon

runestone/codelens/test/test_codelens.py

@@ -1,34 +1,15 @@
-import time
-from runestone.unittest_base import module_fixture_maker, RunestoneTestCase
-from selenium.webdriver.support import expected_conditions as EC
-from selenium.webdriver.support.ui import WebDriverWait
-from selenium.webdriver.common.by import By
-
 __author__ = "Brad Miller"
 
-mf, setUpModule, tearDownModule = module_fixture_maker(__file__, True)
-
-
-class ShowEvalTest_TraceMode(RunestoneTestCase):
-    def setUp(self):
-        super(ShowEvalTest_TraceMode, self).setUp()
-        print(vars(self))
-        self.driver.get(self.host + "/index.html")
-        wait = WebDriverWait(self.driver, 10)
-        try:
-            wait.until(EC.presence_of_element_located((By.TAG_NAME, "body")))
-        except Exception:
-            text = self.driver.page_source
-            print(text[:300])
 
-    def test_Next_Step(self):
-        driver = self.driver
-        self.assertIn("CodeLens", driver.title)
-        for tdiv in ["test1", "test2", "test3", "test4", "test5", "test6"]:
-            clDiv = driver.find_element_by_id("test5")
-            assert clDiv
-            fwd = clDiv.find_element_by_id("jmpStepFwd")
-            assert fwd
-            bak = clDiv.find_element_by_id("jmpStepBack")
-            assert bak
-            assert bak.get_property("disabled") is True
+def test_Next_Step(selenium_utils_get):
+    driver = selenium_utils_get.driver
+    assert "CodeLens" in driver.title
+    for tdiv in ["test_codelens_1", "test_codelens_2", "test_codelens_3", "test_codelens_4", "test_codelens_5", "test_codelens_6"]:
+        selenium_utils_get.wait_until_ready(tdiv)
+        clDiv = driver.find_element_by_id(tdiv)
+        assert clDiv
+        fwd = clDiv.find_element_by_id("jmpStepFwd")
+        assert fwd
+        bak = clDiv.find_element_by_id("jmpStepBack")
+        assert bak
+        assert bak.get_property("disabled") is True