diff --git a/automation-tests/browserid/pages/base.py b/automation-tests/browserid/pages/base.py index e8cd99b7bf7ec042cfafafe60fc043dbfbcf5edd..adf65cb3f12a96db5466f480834a306addecd56e 100644 --- a/automation-tests/browserid/pages/base.py +++ b/automation-tests/browserid/pages/base.py @@ -7,8 +7,6 @@ class Base(object): - _page_title = 'Mozilla Persona: A Better Way to Sign In' - def __init__(self, selenium, timeout=60): self.selenium = selenium self.timeout = timeout diff --git a/automation-tests/browserid/pages/sign_in.py b/automation-tests/browserid/pages/sign_in.py index 3f374bc2440eaa1f2333d026004ade685f359e1c..ffb54e6563cddc38a364556727a6567c2f1700ac 100644 --- a/automation-tests/browserid/pages/sign_in.py +++ b/automation-tests/browserid/pages/sign_in.py @@ -35,14 +35,7 @@ class SignIn(Base): def __init__(self, selenium, timeout, expect='new'): Base.__init__(self, selenium, timeout) - if self.selenium.title != self._page_title: - for handle in self.selenium.window_handles: - self.selenium.switch_to_window(handle) - WebDriverWait(self.selenium, self.timeout).until(lambda s: s.title) - if self.selenium.title == self._page_title: - break - else: - raise Exception('Popup has not loaded') + selenium.switch_to_window('__persona_dialog') if expect == 'new': WebDriverWait(self.selenium, self.timeout).until(