fixed flake8, added explicit scroll to elements before move+click in …

…safe_click functions
freedomofpress · Nov 24, 2018 · f0b66a0 · f0b66a0
1 parent 6c8ae75
commit f0b66a0
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 3 deletions.
diff --git a/securedrop/tests/functional/functional_test.py b/securedrop/tests/functional/functional_test.py
@@ -387,8 +387,10 @@ def safe_click_by_id(self, id):
                       el.is_displayed,
                       timeout=self.sleep_time)
 
+        el.location_once_scrolled_into_view
         actions = ActionChains(self.driver)
-        actions.move_to_element(el).perform()
+        actions.move_to_element(el)
+        actions.perform()
 
         el.click()
 
@@ -403,6 +405,7 @@ def safe_click_by_css_selector(self, selector):
                       el.is_displayed,
                       timeout=self.sleep_time)
 
+        el.location_once_scrolled_into_view
         actions = ActionChains(self.driver)
         actions.move_to_element(el).perform()
 

diff --git a/securedrop/tests/functional/journalist_navigation_steps.py b/securedrop/tests/functional/journalist_navigation_steps.py
@@ -817,10 +817,14 @@ def _admin_visits_reset_2fa_hotp(self):
             '#reset-two-factor-hotp')[0]
         assert ('/admin/reset-2fa-hotp' in
                 hotp_reset_button.get_attribute('action'))
-        self.wait_for(lambda: hotp_reset_button.is_enabled(), 
+        self.wait_for(lambda: hotp_reset_button.is_enabled(),
                       timeout=self.sleep_time)
+
+        hotp_reset_button.location_once_scrolled_into_view
+        actions = ActionChains(self.driver)
+        actions.move_to_element(hotp_reset_button)
+        actions.perform()
         hotp_reset_button.click()
-
 
     def _admin_accepts_2fa_js_alert(self):
         self._alert_wait()