From ed672f079e236e8c7a0ff55462825bd9cd9183a6 Mon Sep 17 00:00:00 2001 From: Christine Lytwynec Date: Fri, 16 May 2014 14:06:47 -0400 Subject: [PATCH] made is_browser_on_page actually check for the right page in AutoAuthPage --- common/test/acceptance/pages/lms/auto_auth.py | 4 +++- common/test/acceptance/pages/studio/auto_auth.py | 4 +++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/common/test/acceptance/pages/lms/auto_auth.py b/common/test/acceptance/pages/lms/auto_auth.py index 6b4b9cc3dd..cdc60771e1 100644 --- a/common/test/acceptance/pages/lms/auto_auth.py +++ b/common/test/acceptance/pages/lms/auto_auth.py @@ -65,7 +65,9 @@ class AutoAuthPage(PageObject): return url def is_browser_on_page(self): - return True + message = self.q(css='BODY').text[0] + match = re.search(r'Logged in user ([^$]+) with password ([^$]+) and user_id ([^$]+)$', message) + return True if match else False def get_user_id(self): """ diff --git a/common/test/acceptance/pages/studio/auto_auth.py b/common/test/acceptance/pages/studio/auto_auth.py index ca141db636..e8beeaca5b 100644 --- a/common/test/acceptance/pages/studio/auto_auth.py +++ b/common/test/acceptance/pages/studio/auto_auth.py @@ -65,7 +65,9 @@ class AutoAuthPage(PageObject): return url def is_browser_on_page(self): - return True + message = self.q(css='BODY').text[0] + match = re.search(r'Logged in user ([^$]+) with password ([^$]+) and user_id ([^$]+)$', message) + return True if match else False def get_user_id(self): message = self.q(css='BODY').text[0].strip()