Removes xfail on the test_journalist_interface_ui_modal functional test

securedrop/tests/functional/functional_test.py

@@ -28,6 +28,8 @@
 from selenium.webdriver.remote.remote_connection import LOGGER
 from selenium.webdriver.support import expected_conditions
 from selenium.webdriver.support.ui import WebDriverWait
+from selenium.webdriver.common.action_chains import ActionChains
+from selenium.webdriver.common.keys import Keys
 from sqlalchemy.exc import IntegrityError
 from tbselenium.tbdriver import TorBrowserDriver
 from tbselenium.utils import disable_js
@@ -77,6 +79,28 @@ def _unused_port(self):
         s.close()
         return port
 
+    def set_tbb_securitylevel(self, toLevel):
+        if self.torbrowser_driver is None:
+            self.create_torbrowser_driver()
+        driver = self.torbrowser_driver
+
+        driver.get("about:config")
+        accept_risk_button = driver.find_element_by_id("warningButton")
+        if accept_risk_button:
+            accept_risk_button.click()
+        ActionChains(driver).send_keys(Keys.RETURN).\
+            send_keys("extensions.torbutton.security_slider").perform()
+        time.sleep(2)
+        ActionChains(driver).send_keys(Keys.TAB).\
+            send_keys(Keys.RETURN).perform()
+        time.sleep(2)
+        alert = driver.switch_to.alert
+        time.sleep(2)
+        alert.send_keys(str(toLevel))
+        time.sleep(2)
+        alert.accept()
+        time.sleep(2)
+
     def create_torbrowser_driver(self):
         logging.info("Creating TorBrowserDriver")
         log_file = open(LOGFILE_PATH, "a")

securedrop/tests/functional/test_journalist.py

@@ -19,7 +19,6 @@
 from . import functional_test
 from . import journalist_navigation_steps
 from . import source_navigation_steps
-import pytest
 
 
 class TestJournalist(
@@ -59,14 +58,17 @@ def test_journalist_uses_index_delete_collections_button_modal(self):
         self._journalist_logs_in()
         self._journalist_uses_delete_collections_button_confirmation()
 
-    @pytest.mark.xfail(reason="Filter widget not displayed in TBB 9.0.1")
     def test_journalist_interface_ui_with_modal(self):
         self._source_visits_source_homepage()
         self._source_chooses_to_submit_documents()
         self._source_continues_to_submit_page()
         self._source_submits_a_file()
         self._source_logs_out()
 
+        # Toggle security slider to force prefs change
+        self.set_tbb_securitylevel(1)
+        self.set_tbb_securitylevel(4)
+
         self._journalist_logs_in()
         self._journalist_uses_js_filter_by_sources()
         self._journalist_source_selection_honors_filter()