Fix test failures on using ChromeDriver-BrowserStack (#78)

Cadasta · Feb 13, 2018 · 3a969a1 · 3a969a1
1 parent 9ed3cbc
commit 3a969a1
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 8 deletions.
diff --git a/cadasta/test/__init__.py b/cadasta/test/__init__.py
@@ -1 +1 @@
-__version__ = '0.4.0'
+__version__ = '0.4.1'
diff --git a/cadasta/test/account_tests/registration_util.py b/cadasta/test/account_tests/registration_util.py
@@ -1,4 +1,5 @@
-from selenium.common.exceptions import ElementNotInteractableException
+from selenium.common.exceptions import (ElementNotInteractableException,
+                                        NoSuchElementException)
 
 from ..base_test import SeleniumTestCase
 
@@ -20,5 +21,5 @@ def switch_to_email_or_phone(self, field):
         try:
             self.wd.BY_LINK(
                 'I want to register with my {}'.format(field)).click()
-        except ElementNotInteractableException:
+        except (ElementNotInteractableException, NoSuchElementException):
             pass
diff --git a/cadasta/test/account_tests/test_registration.py b/cadasta/test/account_tests/test_registration.py
@@ -381,7 +381,7 @@ def test_user_can_invoke_resending_of_confirmation_email(self):
 
         try:
             self.wd.BY_LINK('I want to verify my email').click()
-        except ElementNotInteractableException:
+        except (ElementNotInteractableException, NoSuchElementException):
             pass
         self.update_form_field('email', self.email)
         self.wd.BY_XPATH('//button[contains(.,"Send Verification")]').click()
@@ -423,7 +423,7 @@ def test_user_can_invoke_resending_of_verification_token(self):
 
         try:
             self.wd.BY_LINK('I want to verify my phone').click()
-        except ElementNotInteractableException:
+        except (ElementNotInteractableException, NoSuchElementException):
             pass
         self.update_form_field('phone', self.phone)
         self.wd.BY_XPATH('//button[contains(.,"Send Verification")]').click()

diff --git a/cadasta/test/account_tests/test_updating.py b/cadasta/test/account_tests/test_updating.py
@@ -2,7 +2,8 @@
 import re
 
 from os.path import abspath, dirname, join
-from selenium.common.exceptions import ElementNotInteractableException
+from selenium.common.exceptions import (ElementNotInteractableException,
+                                        NoSuchElementException)
 from selenium.webdriver.common.by import By
 from selenium.webdriver.support.select import Select
 
@@ -85,7 +86,7 @@ def test_user_can_invoke_password_reset_by_email(self):
         self.assert_url_path('/account/password/reset/')
         try:
             self.wd.BY_LINK('I want to reset password with my email').click()
-        except ElementNotInteractableException:
+        except (ElementNotInteractableException, NoSuchElementException):
             pass
         self.update_form_field('email', self.email_user['email'])
         self.wd.BY_XPATH('//*[@type="submit"]').click()
@@ -100,7 +101,7 @@ def test_user_can_invoke_password_reset_by_phone(self):
         self.assert_url_path('/account/password/reset/')
         try:
             self.wd.BY_LINK('I want to reset password with my phone').click()
-        except ElementNotInteractableException:
+        except (ElementNotInteractableException, NoSuchElementException):
             pass
         self.update_form_field('phone', self.phone_user['phone'])
         self.wd.BY_XPATH('//*[@type="submit"]').click()