Merge pull request #1180 from bjones1/more-tests

DRY: Refactor test framework.

Author: bnmnetp

runestone/activecode/test/test_activecode.py

@@ -13,7 +13,7 @@ def find_ac(selenium_utils, div_id):
 
 def click_run(selenium_utils, ac_selenium_element):
     # The run button can sometimes be scrolled to the top of the screen, where it's hidden by the navigation bar. In this case, we can't click it, since Selenium will complain ``Message: element click intercepted: Element <button class="btn btn-success run-button" type="button">...</button> is not clickable at point (460, 17). Other element would receive the click: <div class="navbar-collapse collapse navbar-ex1-collapse">...</div>``. To avoid this, always scroll to the top of the document, guaranteeing that the navbar won't be hiding the run button.
-    selenium_utils.driver.execute_script("window.scrollTo(0, 0);")
+    selenium_utils.scroll_to_top()
     rb = ac_selenium_element.find_element_by_class_name("run-button")
     rb.click()
     # After clicking run, the browser may need some time to load and execute the code. Wait until the run button becomes clickable, indicating the code has finished running.

runestone/shared_conftest.py

@@ -74,6 +74,10 @@ def get(self, relative_url):
             "{}/{}".format(self.host_address, relative_url)
         )
 
+    # Scroll to the top of the window. A button can sometimes be scrolled to the top of the screen, where it's hidden by the navigation bar. In this case, we can't click it, since Selenium will complain ``Message: element click intercepted: Element <button class="btn btn-success run-button" type="button">...</button> is not clickable at point (460, 17). Other element would receive the click: <div class="navbar-collapse collapse navbar-ex1-collapse">...</div>``. To avoid this, scroll to the top of the document, guaranteeing that the navbar won't be hiding the run button.
+    def scroll_to_top(self):
+        self.driver.execute_script("window.scrollTo(0, 0);")
+
     # Wait until a Runestone component has finished rendering itself, given the ID of the component.
     def wait_until_ready(self, id):
         # The component is ready when it has the class below.

runestone/shortanswer/test/test_shortanswer.py

@@ -9,8 +9,7 @@
 
 def get_sa(selenium_utils):
     selenium_utils.wait_until_ready(DIV_ID)
-    # See the notes in ``test_activecode.click_run`` on the need for this call.
-    selenium_utils.driver.execute_script("window.scrollTo(0, 0);")
+    selenium_utils.scroll_to_top()
     return selenium_utils.driver.find_element_by_id(DIV_ID)