Merge branch 'master' into more-tests-1

Author: bnmnetp

runestone/reveal/js/reveal.js

@@ -46,6 +46,7 @@ class Reveal extends RunestoneBase {
                 this.createHideButton(); // Hide button is already implemented in modal dialog
             }
         }
+        this.indicate_component_ready();
     }
     /*====================================
     == Get text for buttons/modal title ==
@@ -79,17 +80,17 @@ class Reveal extends RunestoneBase {
     ============================*/
     createShowButton() {
         var _this = this;
-        this.wrapDiv = document.createElement("div"); // wrapper div
+        this.containerDiv = document.createElement("div"); // wrapper div
+        this.containerDiv.id = this.divid;
         if (!this.dataModal) {
             this.revealDiv = document.createElement("div"); // Div that is hidden that contains content
-            this.revealDiv.id = this.divid;
             // Get original content, put it inside revealDiv and replace original div with revealDiv
             //$(this.revealDiv).html(this.origContent);
             for (var i = 0; i < this.children.length; i++) {
                 this.revealDiv.appendChild(this.children[i]);
             }
             $(this.revealDiv).hide();
-            this.wrapDiv.appendChild(this.revealDiv);
+            this.containerDiv.appendChild(this.revealDiv);
         }
         if (this.instructorOnly) {
             $(this.revealDiv).addClass("iguide");
@@ -116,8 +117,8 @@ class Reveal extends RunestoneBase {
                 "data-target": "#" + this.divid + "_modal",
             });
         }
-        this.wrapDiv.appendChild(this.sbutt);
-        $(this.origElem).replaceWith(this.wrapDiv);
+        this.containerDiv.appendChild(this.sbutt);
+        $(this.origElem).replaceWith(this.containerDiv);
     }
     createHideButton() {
         var _this = this;
@@ -131,7 +132,7 @@ class Reveal extends RunestoneBase {
             _this.hideInline();
             $(this).hide();
         };
-        this.wrapDiv.appendChild(this.hbutt);
+        this.containerDiv.appendChild(this.hbutt);
     }
     createInstructorButtons() {
         this.createShowButton();

runestone/reveal/test/test_reveal.py

@@ -4,61 +4,54 @@
 
 __author__ = "yasinovskyy"
 
-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
+def test_r1(selenium_utils):
+    """Initial view. Content is hidden"""
+    su = selenium_utils
+    su.get("index.html")
+    su.wait_until_ready("question1")
 
-setUpModule, tearDownModule = module_fixture_maker(__file__)
+    q1 = su.driver.find_element_by_css_selector("#question1 div")
+    cnamestr = q1.get_attribute("style")
+    assert "display: none;" == cnamestr
 
 
-class RevealQuestion_Tests(RunestoneTestCase):
-    def test_r1(self):
-        """Initial view. Content is hidden"""
-        self.driver.get(self.host + "/index.html")
-        wait = WebDriverWait(self.driver, 10)
-        try:
-            wait.until(EC.presence_of_element_located((By.ID, "reveal")))
-        except:
-            text = self.driver.page_source
-            print(text[:300])
+def test_r2(selenium_utils):
+    """Reveal button clicked"""
+    su = selenium_utils
+    su.get("index.html")
+    su.wait_until_ready("question1")
+    t1 = su.driver.find_element_by_id("reveal")
 
-        t1 = self.driver.find_element_by_id("reveal")
+    btn_show = t1.find_element_by_id("question1_show")
+    btn_show.click()
 
-        q1 = t1.find_element_by_id("question1")
+    q1 = t1.find_element_by_id("question1")
 
-        cnamestr = q1.get_attribute("style")
-        self.assertEqual("display: none;", cnamestr)
+    cnamestr = q1.get_attribute("style")
+    assert "display: none;" != cnamestr
 
-    def test_r2(self):
-        """Reveal button clicked"""
-        self.driver.get(self.host + "/index.html")
-        t1 = self.driver.find_element_by_id("reveal")
 
-        btn_show = t1.find_element_by_id("question1_show")
-        btn_show.click()
+def test_r3(selenium_utils):
+    """Content is revealed, then hidden again"""
+    su = selenium_utils
+    su.get("index.html")
+    su.wait_until_ready("question1")
+    t1 = su.driver.find_element_by_id("reveal")
 
-        q1 = t1.find_element_by_id("question1")
+    btn_show = t1.find_element_by_id("question1_show")
+    btn_show.click()
+    btn_hide = t1.find_element_by_id("question1_hide")
+    btn_hide.click()
 
-        cnamestr = q1.get_attribute("style")
-        self.assertNotEqual("display: none;", cnamestr)
+    q1 = su.driver.find_element_by_css_selector("#question1 div")
+    cnamestr = q1.get_attribute("style")
+    assert "display: none;" == cnamestr
 
-    def test_r3(self):
-        """Content is revealed, then hidden again"""
-        self.driver.get(self.host + "/index.html")
-        t1 = self.driver.find_element_by_id("reveal")
 
-        btn_show = t1.find_element_by_id("question1_show")
-        btn_show.click()
-        btn_hide = t1.find_element_by_id("question1_hide")
-        btn_hide.click()
-
-        q1 = t1.find_element_by_id("question1")
-
-        cnamestr = q1.get_attribute("style")
-        self.assertEqual("display: none;", cnamestr)
-
-    def test_r4(self):
-        """Check for is_instructor test """
-        t1 = self.driver.find_element_by_id("reveal")
-        self.assertIn("{{ if is_instructor: }}", t1.get_attribute("innerHTML"))
+def test_r4(selenium_utils):
+    """Check for is_instructor test """
+    su = selenium_utils
+    su.get("index.html")
+    su.wait_until_ready("question1")
+    t1 = su.driver.find_element_by_id("reveal")
+    assert "{{ if is_instructor: }}" in t1.get_attribute("innerHTML")

setup.py

@@ -10,7 +10,7 @@
 with open("requirements.txt", "r", encoding="utf-8") as fh:
     dependencies = [l.strip() for l in fh]
 
-VERSION = "5.5.17"
+VERSION = "5.6.0"
 
 # These pre-install hooks are useful to make sure any pre-requisite
 # programs that are not pip installable are in place.