Merge pull request #1163 from bjones1/more-tests-1

Improved testing 5

Author: bnmnetp

runestone/tabbedStuff/js/tabbedstuff.js

@@ -34,6 +34,7 @@ class TabbedStuff extends RunestoneBase {
         this.activeTab = 0; // default value--activeTab is the index of the tab that starts open
         this.findActiveTab();
         this.createTabContainer();
+        this.indicate_component_ready();
     }
     /*===========================================
     == Update attributes of instance variables ==
@@ -57,21 +58,21 @@ class TabbedStuff extends RunestoneBase {
     == Creating/appending final HTML elements ==
     ==========================================*/
     createTabContainer() {
-        this.replacementDiv = document.createElement("div");
-        this.replacementDiv.id = this.divid;
-        $(this.replacementDiv).addClass(this.origElem.getAttribute("class"));
-        $(this.replacementDiv).attr({ role: "tabpanel" });
+        this.containerDiv = document.createElement("div");
+        this.containerDiv.id = this.divid;
+        $(this.containerDiv).addClass(this.origElem.getAttribute("class"));
+        $(this.containerDiv).attr({ role: "tabpanel" });
         this.tabsUL = document.createElement("ul");
         this.tabsUL.id = this.divid + "_tab";
         $(this.tabsUL).addClass("nav nav-tabs");
         $(this.tabsUL).attr({ role: "tablist" });
         this.tabContentDiv = document.createElement("div"); // Create tab content container that holds tab panes w/content
         $(this.tabContentDiv).addClass("tab-content");
         this.createTabs(); // create and append tabs to the <ul>
-        this.replacementDiv.appendChild(this.tabsUL);
-        this.replacementDiv.appendChild(this.tabContentDiv);
+        this.containerDiv.appendChild(this.tabsUL);
+        this.containerDiv.appendChild(this.tabContentDiv);
         this.addCMD(); // Adds fuctionality for Codemirror/Disqus
-        $(this.origElem).replaceWith(this.replacementDiv);
+        $(this.origElem).replaceWith(this.containerDiv);
     }
     createTabs() {
         // Create tabs in format <li><a><span></span></a></li> to be appended to the <ul>

runestone/tabbedStuff/test/test_tabbedStuff.py

@@ -4,60 +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
 
-setUpModule, tearDownModule = module_fixture_maker(__file__)
+def test_t1(selenium_utils):
+    """Initial view. Tab 1 is visible, tab 2 is hidden"""
+    su = selenium_utils
+    su.get("index.html")
+    su.wait_until_ready("exercise1")
 
+    e1 = su.driver.find_element_by_id("exercise1")
 
-class TabbedQuestion_Tests(RunestoneTestCase):
-    def test_t1(self):
-        """Initial view. Tab 1 is visible, tab 2 is hidden"""
-        self.driver.get(self.host + "/index.html")
-        wait = WebDriverWait(self.driver, 10)
-        try:
-            wait.until(EC.presence_of_element_located((By.ID, "exercise1")))
-        except:
-            text = self.driver.page_source
-            print(text[:300])
+    t1 = e1.find_element_by_class_name("active")
+    tp1 = e1.find_element_by_id("exercise1-0")
 
-        e1 = self.driver.find_element_by_id("exercise1")
+    assert "Tab 1" == t1.text
+    assert "Hello!" == tp1.text
 
-        t1 = e1.find_element_by_class_name("active")
-        tp1 = e1.find_element_by_id("exercise1-0")
 
-        self.assertEqual("Tab 1", t1.text)
-        self.assertEqual("Hello!", tp1.text)
+def test_t2(selenium_utils):
+    """Tab 2 is visible, tab 1 is hidden"""
+    su = selenium_utils
+    su.get("index.html")
+    su.wait_until_ready("exercise1")
+    e1 = su.driver.find_element_by_id("exercise1")
 
-    def test_t2(self):
-        """Tab 2 is visible, tab 1 is hidden"""
-        self.driver.get(self.host + "/index.html")
-        e1 = self.driver.find_element_by_id("exercise1")
+    btn_tab2 = e1.find_element_by_link_text("Tab 2")
+    btn_tab2.click()
 
-        btn_tab2 = e1.find_element_by_link_text("Tab 2")
-        btn_tab2.click()
+    t1 = e1.find_element_by_class_name("active")
+    tp1 = e1.find_element_by_id("exercise1-1")
 
-        t1 = e1.find_element_by_class_name("active")
-        tp1 = e1.find_element_by_id("exercise1-1")
+    assert "Tab 2" == t1.text
+    assert "Goodbye!" == tp1.text
 
-        self.assertEqual("Tab 2", t1.text)
-        self.assertEqual("Goodbye!", tp1.text)
 
-    def test_t3(self):
-        """Tab 2 is selected, then tab 1"""
-        self.driver.get(self.host + "/index.html")
-        e1 = self.driver.find_element_by_id("exercise1")
+def test_t3(selenium_utils):
+    """Tab 2 is selected, then tab 1"""
+    su = selenium_utils
+    su.get("index.html")
+    su.wait_until_ready("exercise1")
+    e1 = su.driver.find_element_by_id("exercise1")
 
-        btn_tab2 = e1.find_element_by_link_text("Tab 2")
-        btn_tab2.click()
+    btn_tab2 = e1.find_element_by_link_text("Tab 2")
+    btn_tab2.click()
 
-        btn_tab1 = e1.find_element_by_link_text("Tab 1")
-        btn_tab1.click()
+    btn_tab1 = e1.find_element_by_link_text("Tab 1")
+    btn_tab1.click()
 
-        t1 = e1.find_element_by_class_name("active")
-        tp1 = e1.find_element_by_id("exercise1-0")
+    t1 = e1.find_element_by_class_name("active")
+    tp1 = e1.find_element_by_id("exercise1-0")
 
-        self.assertEqual("Tab 1", t1.text)
-        self.assertEqual("Hello!", tp1.text)
+    assert "Tab 1" == t1.text
+    assert "Hello!" == tp1.text