Try a couple of more element visibility tweaks

freedomofpress · May 11, 2019 · a0bc7e2 · a0bc7e2
1 parent edc85e5
commit a0bc7e2
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 1 deletion.
diff --git a/securedrop/tests/functional/functional_test.py b/securedrop/tests/functional/functional_test.py
@@ -300,8 +300,8 @@ def safe_click_all_by_css_selector(self, selector, root=None):
             root = self.driver
         els = self.wait_for(lambda: root.find_elements_by_css_selector(selector))
         for el in els:
-            self.wait_for(lambda: el.is_enabled() and el.is_displayed())
             el.location_once_scrolled_into_view
+            self.wait_for(lambda: el.is_enabled() and el.is_displayed())
             ActionChains(self.driver).move_to_element(el).click().perform()
 
     def _alert_wait(self, timeout=None):

diff --git a/securedrop/tests/functional/source_navigation_steps.py b/securedrop/tests/functional/source_navigation_steps.py
@@ -210,6 +210,7 @@ def _source_deletes_a_journalist_reply(self):
         def confirm_displayed():
             confirm_button_id = "confirm-delete-reply-button-{}".format(reply_filename)
             confirm_button = self.driver.find_element_by_id(confirm_button_id)
+            confirm_button.location_once_scrolled_into_view
             assert confirm_button.is_displayed()
 
         self.wait_for(confirm_displayed)