From 69a695760e2ec21ac3f730a8c8c679a9dd77d15d Mon Sep 17 00:00:00 2001
From: Leah Klearman <lklrmn@gmail.com>
Date: Fri, 31 Aug 2012 14:28:32 -0700
Subject: [PATCH] Revert "properly initialize CompleteRegistration object with
selenium object and global timeout"
This reverts commit 1adbe2f70b4727f2f4bb1b68706173e1e9ef7baa.
---
automation-tests/123done/tests/test_change_password.py | 2 +-
automation-tests/123done/tests/test_new_user.py | 2 +-
automation-tests/browserid/pages/complete_registration.py | 2 +-
3 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/automation-tests/123done/tests/test_change_password.py b/automation-tests/123done/tests/test_change_password.py
index 8648fe9aa..344b67cab 100644
--- a/automation-tests/123done/tests/test_change_password.py
+++ b/automation-tests/123done/tests/test_change_password.py
@@ -28,7 +28,7 @@ class TestChangePassword:
# Load the BrowserID link from the email in the browser
from browserid.pages.complete_registration import CompleteRegistration
- CompleteRegistration(mozwebqa, email.verify_user_link)
+ CompleteRegistration(mozwebqa.selenium, email.verify_user_link)
mozwebqa.selenium.get(mozwebqa.server_base_url)
from browserid.pages.account_manager import AccountManager
diff --git a/automation-tests/123done/tests/test_new_user.py b/automation-tests/123done/tests/test_new_user.py
index 1ac70a8f8..832305c51 100644
--- a/automation-tests/123done/tests/test_new_user.py
+++ b/automation-tests/123done/tests/test_new_user.py
@@ -28,7 +28,7 @@ class TestNewAccount:
# Load the BrowserID link from the email in the browser
from browserid.pages.complete_registration import CompleteRegistration
- complete_registration = CompleteRegistration(mozwebqa, email.verify_user_link)
+ complete_registration = CompleteRegistration(mozwebqa.selenium, email.verify_user_link)
home_pg.go_to_home_page()
Assert.equal(home_pg.logged_in_user_email, user['email'])
diff --git a/automation-tests/browserid/pages/complete_registration.py b/automation-tests/browserid/pages/complete_registration.py
index be8c97efa..a08bec829 100644
--- a/automation-tests/browserid/pages/complete_registration.py
+++ b/automation-tests/browserid/pages/complete_registration.py
@@ -25,7 +25,7 @@ class CompleteRegistration(Base):
- url - the confirmation url from the email
- expect - redirect/success/reset/verify (default redirect)
"""
- Base.__init__(self, mozwebqa.selenium, mozwebqa.timeout)
+ Base.__init__(self, mozwebqa)
print "the url" + url
self.selenium.get(url)
--
GitLab