Merge pull request #830 from bjones1/fix_tests

Fix tests

Author: bnmnetp

runestone/activecode/test/test_activecode.py

@@ -90,6 +90,8 @@ def test_activity_count(self):
         rb.click()
         pb = self.driver.find_element_by_id("subchapterprogress")
         self.assertIsNotNone(pb)
+        # Wait for the JS to run. Increase this delay if the next assertion fails.
+        time.sleep(1)
         total = self.driver.find_element_by_id("scprogresstotal").text.strip()
         self.assertEqual(2, int(total))
         possible = self.driver.find_element_by_id("scprogressposs").text.strip()

runestone/parsons/test/test_parsons.py

@@ -171,7 +171,7 @@ def wait_and_close_alert(self, timeout = 3):
             WebDriverWait(self.driver, timeout).until(EC.alert_is_present(),
                                    'Timed out waiting for PA creation ' +
                                    'confirmation popup to appear.')
-            alert = self.driver.switch_to_alert()
+            alert = self.driver.switch_to.alert
             alert.accept()
             return True
         except TimeoutException:

runestone/unittest_base.py

@@ -4,6 +4,7 @@
 import platform
 import subprocess
 from selenium import webdriver
+from selenium.webdriver.chrome.options import Options
 from pyvirtualdisplay import Display
 
 # Select an unused port for serving web pages to the test suite.
@@ -51,11 +52,9 @@ def setUpModule(self):
         else:
             self.display = None
         #self.driver = webdriver.PhantomJS() # use this for Jenkins auto testing
-        # options = webdriver.ChromeOptions()
-        # options.add_argument("headless")
-        # options.add_argument("window-size=1200x800")
-        #self.driver = webdriver.Chrome(chrome_options=options)  # good for development.
-        self.driver = webdriver.Chrome()  # good for development.
+        options = Options()
+        options.add_argument("--window-size=1200,800")
+        self.driver = webdriver.Chrome(chrome_options=options)  # good for development.
 
         # Make this accessible
         global mf