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

Improved testing 8

Author: bnmnetp

runestone/shortanswer/js/shortanswer.js

@@ -35,9 +35,9 @@ export default class ShortAnswer extends RunestoneBase {
                 this.mathjax = true;
             }
             this.renderHTML();
-            this.checkServer("shortanswer");
             this.caption = "shortanswer";
             this.addCaption("runestone");
+            this.checkServer("shortanswer", true);
         }
     }
 

runestone/shortanswer/test/_sources/index.rst

@@ -17,12 +17,12 @@ Testing: Short Answer Questions
 Short Answer
 ------------
 
-.. shortanswer:: question1
+.. shortanswer:: test_short_answer_1
 
    What are the colors in the rainbow?
 
 
-.. shortanswer:: question2
+.. shortanswer:: test_short_answer_2
    :optional:
    :mathjax:
 

runestone/shortanswer/test/test_shortanswer.py

@@ -2,65 +2,66 @@
 Test Short Answer question directive
 """
 
+import pytest
+
 __author__ = "yasinovskyy"
 
-from time import sleep
-from runestone.unittest_base import module_fixture_maker, RunestoneTestCase
-
-setUpModule, tearDownModule = module_fixture_maker(__file__)
-
-
-class ShortAnswerQuestion_Tests(RunestoneTestCase):
-    def test_sa1(self):
-        """No input. Button not clicked"""
-        self.driver.get(self.host + "/index.html")
-        t1 = self.driver.find_element_by_id("question1")
-
-        fb = t1.find_element_by_id("question1_feedback")
-        self.assertIsNotNone(fb)
-        cnamestr = fb.get_attribute("class")
-        self.assertIn("alert-danger", cnamestr)
-
-    def test_sa2(self):
-        """No input. Button clicked"""
-        self.driver.get(self.host + "/index.html")
-        sleep(2)
-        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-success", cnamestr)
-
-    def test_sa3(self):
-        """Answer entered"""
-        self.driver.get(self.host + "/index.html")
-        t1 = self.driver.find_element_by_id("question1")
-        ta = t1.find_element_by_id("question1_solution")
-        ta.send_keys("My answer")
-
-        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-success", cnamestr)
-
-    def test_sa4(self):
-        """Answer entered and cleared"""
-        self.driver.get(self.host + "/index.html")
-        t1 = self.driver.find_element_by_id("question1")
-        ta = t1.find_element_by_id("question1_solution")
-        ta.send_keys("My answer")
-
-        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-success", cnamestr)
+DIV_ID = "test_short_answer_1"
+
+
+@pytest.fixture
+def selenium_utils_1(selenium_utils):
+    selenium_utils.get("index.html")
+    selenium_utils.wait_until_ready(DIV_ID)
+    return selenium_utils
+
+
+def test_sa1(selenium_utils_1):
+    """No input. Button not clicked"""
+    self = selenium_utils_1
+    t1 = self.driver.find_element_by_id(DIV_ID)
+
+    fb = t1.find_element_by_id(f"{DIV_ID}_feedback")
+    assert "alert-danger" in fb.get_attribute("class")
+
+
+def test_sa2(selenium_utils_1):
+    """No input. Button clicked"""
+    t1 = selenium_utils_1.driver.find_element_by_id(DIV_ID)
+
+    btn_check = t1.find_element_by_tag_name("button")
+    btn_check.click()
+
+    fb = t1.find_element_by_id(f"{DIV_ID}_feedback")
+    assert "alert-success" in fb.get_attribute("class")
+
+
+def test_sa3(selenium_utils_1):
+    """Answer entered"""
+    t1 = selenium_utils_1.driver.find_element_by_id(DIV_ID)
+    ta = t1.find_element_by_id(f"{DIV_ID}_solution")
+    ta.clear()
+    ta.send_keys("My answer")
+
+    btn_check = t1.find_element_by_tag_name("button")
+    btn_check.click()
+
+    fb = t1.find_element_by_id(f"{DIV_ID}_feedback")
+    assert fb is not None
+    assert "alert-success" in fb.get_attribute("class")
+
+
+# TODO: this is the same as ``_test_sa3``.
+def test_sa4(selenium_utils_1):
+    """Answer entered and cleared"""
+    t1 = selenium_utils_1.driver.find_element_by_id(DIV_ID)
+    ta = t1.find_element_by_id(f"{DIV_ID}_solution")
+    ta.clear()
+    ta.send_keys("My answer")
+
+    btn_check = t1.find_element_by_tag_name("button")
+    btn_check.click()
+
+    fb = t1.find_element_by_id(f"{DIV_ID}_feedback")
+    assert fb is not None
+    assert "alert-success" in fb.get_attribute("class")