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

Port: To pytest.

Author: bnmnetp

runestone/matrixeq/test/test_matrixeq.py

@@ -2,41 +2,28 @@
 Test Matrix Equations directive (matrixeq)
 """
 
-from unittest import TestCase
 from selenium.webdriver.support import expected_conditions as EC
 from selenium.webdriver.support.ui import WebDriverWait
 from selenium.webdriver.common.by import By
-from runestone.unittest_base import module_fixture_maker, RunestoneTestCase
 
 __author__ = "wayne brown"
 
-mf, setUpModule, tearDownModule = module_fixture_maker(__file__, True)
 
+def test_ma1(selenium_utils_get):
+    """ matrixeq - test the click of a mutliplication operator """
+    wait = WebDriverWait(selenium_utils_get.driver, 10)
+    try:
+        wait.until(EC.presence_of_element_located((By.TAG_NAME, "body")))
+    except:
+        text = selenium_utils_get.driver.page_source
+        print(text[:300])
 
-class Matrixeq_Tests(RunestoneTestCase):
-    def test_ma1(self):
-        """ matrixeq - test the click of a mutliplication operator """
-        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:
-            text = self.driver.page_source
-            print(text[:300])
-
-        # t1 = self.driver.find_element_by_id("question1")
-        #
-        # btn_check = t1.find_element_by_tag_name('button')
-        # btn_check.click()
-        #
-        # fb = t1.find_element_by_id("question1_feedback")
-        # self.assertIsNotNone(fb)
-        # cnamestr = fb.get_attribute("class")
-        # self.assertIn("alert-danger", cnamestr)
-
-    # Testing time in dominated by browser startup/shutdown. So, simply run all tests in a single browser instance to speed things up. On failures, uncomment test functions to diagnose.
-    def test_ma2(self):
-        """
-        matrixeq - test the click of an equal operator
-        """
-        self.driver.get(self.host + "/index.html")
+    # t1 = self.driver.find_element_by_id("question1")
+    #
+    # btn_check = t1.find_element_by_tag_name('button')
+    # btn_check.click()
+    #
+    # fb = t1.find_element_by_id("question1_feedback")
+    # self.assertIsNotNone(fb)
+    # cnamestr = fb.get_attribute("class")
+    # self.assertIn("alert-danger", cnamestr)

runestone/question/test/test_question.py

@@ -1,61 +1,50 @@
-from runestone.unittest_base import module_fixture_maker, RunestoneTestCase
+def test_hello(selenium_utils_get):
+    """
+    1. Get the outer div id of the activecode component
+    2. Find the run button using its class name
+    3. Run the example
+    4. Check the output from the ac_output element
+    :return:
+    """
+    t1 = selenium_utils_get.driver.find_element_by_id("qtest_1")
+    li = t1.find_element_by_tag_name("ol")
+    num = li.get_attribute("start")
+    assert num == "1"
 
-setUpModule, tearDownModule = module_fixture_maker(__file__)
+    class_string = t1.get_attribute("class")
+    assert "full-width container" in class_string
 
+    t1 = selenium_utils_get.driver.find_element_by_id("qtest_2")
+    li = t1.find_element_by_tag_name("ol")
+    num = li.get_attribute("start")
+    assert num == "2"
 
-class QuestionTests(RunestoneTestCase):
-    def test_hello(self):
-        """
-        1. Get the outer div id of the activecode component
-        2. Find the run button using its class name
-        3. Run the example
-        4. Check the output from the ac_output element
-        :return:
-        """
-        self.driver.get(self.host + "/index.html")
-        t1 = self.driver.find_element_by_id("qtest_1")
-        self.assertIsNotNone(t1)
-        li = t1.find_element_by_tag_name("ol")
-        self.assertIsNotNone(li)
-        num = li.get_attribute("start")
-        self.assertEqual(num, "1")
 
-        class_string = t1.get_attribute("class")
-        self.assertTrue("full-width container" in class_string)
-
-        t1 = self.driver.find_element_by_id("qtest_2")
-        self.assertIsNotNone(t1)
-        li = t1.find_element_by_tag_name("ol")
-        self.assertIsNotNone(li)
-        num = li.get_attribute("start")
-        self.assertEqual(num, "2")
-
-    # def test_mc(self):
-    #     self.driver.get(self.host + "/index.html")
-    #     t1 = self.driver.find_element_by_id("qtest_2")
-    #     cbs = t1.find_elements_by_tag_name("li")
-    #     for el in cbs:
-    #         el.click()
-    #
-    #     checkme = t1.find_element_by_tag_name('button')
-    #     checkme.click()
-    #
-    #     fb = t1.find_element_by_id("question1_2_feedback")
-    #     self.assertIsNotNone(fb)
-    #     cnamestr = fb.get_attribute("class")
-    #     self.assertEqual(cnamestr, "alert alert-danger")
-    #
-    # def test_mc2(self):
-    #     self.driver.get(self.host + "/index.html")
-    #     t1 = self.driver.find_element_by_id("qtest_2")
-    #     t1.find_element_by_id("question1_2_opt_0").click()
-    #     t1.find_element_by_id("question1_2_opt_1").click()
-    #     t1.find_element_by_id("question1_2_opt_3").click()
-    #
-    #     checkme = t1.find_element_by_tag_name('button')
-    #     checkme.click()
-    #
-    #     fb = t1.find_element_by_id("question1_2_feedback")
-    #     self.assertIsNotNone(fb)
-    #     cnamestr = fb.get_attribute("class")
-    #     self.assertEqual(cnamestr, "alert alert-success")
+# def test_mc(self):
+#     t1 = self.driver.find_element_by_id("qtest_2")
+#     cbs = t1.find_elements_by_tag_name("li")
+#     for el in cbs:
+#         el.click()
+#
+#     checkme = t1.find_element_by_tag_name('button')
+#     checkme.click()
+#
+#     fb = t1.find_element_by_id("question1_2_feedback")
+#     self.assertIsNotNone(fb)
+#     cnamestr = fb.get_attribute("class")
+#     assert cnamestr, "alert alert-danger")
+#
+#
+# def test_mc2(self):
+#     t1 = self.driver.find_element_by_id("qtest_2")
+#     t1.find_element_by_id("question1_2_opt_0").click()
+#     t1.find_element_by_id("question1_2_opt_1").click()
+#     t1.find_element_by_id("question1_2_opt_3").click()
+#
+#     checkme = t1.find_element_by_tag_name('button')
+#     checkme.click()
+#
+#     fb = t1.find_element_by_id("question1_2_feedback")
+#     self.assertIsNotNone(fb)
+#     cnamestr = fb.get_attribute("class")
+#     assert cnamestr, "alert alert-success")

runestone/showeval/test/test_showEval.py

@@ -1,4 +1,3 @@
-from runestone.conftest import selenium_utils
 import time
 
 import pytest