From 05e9e56d564ae6c193289877bbb4ba63e12cf29b Mon Sep 17 00:00:00 2001 From: Jeremy Bowman Date: Thu, 24 Oct 2019 13:19:18 -0400 Subject: [PATCH] Fix CSS selector under Python 3 BOM-991 (#22124) --- common/test/acceptance/pages/studio/container.py | 2 +- common/test/acceptance/pages/xblock/acid.py | 2 -- common/test/acceptance/pages/xblock/utils.py | 4 ++-- 3 files changed, 3 insertions(+), 5 deletions(-) diff --git a/common/test/acceptance/pages/studio/container.py b/common/test/acceptance/pages/studio/container.py index 364de9f309..914f6781fa 100644 --- a/common/test/acceptance/pages/studio/container.py +++ b/common/test/acceptance/pages/studio/container.py @@ -660,7 +660,7 @@ class XBlockWrapper(PageObject): @property def editor_selector(self): - return '.xblock-studio_view' + return u'.xblock-studio_view' def _click_button(self, button_name): """ diff --git a/common/test/acceptance/pages/xblock/acid.py b/common/test/acceptance/pages/xblock/acid.py index cde54949b7..0ca60260cb 100644 --- a/common/test/acceptance/pages/xblock/acid.py +++ b/common/test/acceptance/pages/xblock/acid.py @@ -25,8 +25,6 @@ class AcidView(PageObject): is on the page. """ super(AcidView, self).__init__(browser) - if isinstance(context_selector, six.text_type): - context_selector = context_selector.encode('utf-8') self.context_selector = context_selector def is_browser_on_page(self): diff --git a/common/test/acceptance/pages/xblock/utils.py b/common/test/acceptance/pages/xblock/utils.py index d6e5297e92..c83557a473 100644 --- a/common/test/acceptance/pages/xblock/utils.py +++ b/common/test/acceptance/pages/xblock/utils.py @@ -12,7 +12,7 @@ def wait_for_xblock_initialization(page, xblock_css): """ def _is_finished_loading(): # Wait for the xblock javascript to finish initializing - is_done = page.browser.execute_script(u"return $({!r}).data('initialized')".format(xblock_css)) - return (is_done, is_done) + is_done = page.browser.execute_script(u"return $('{}').data('initialized')".format(xblock_css)) + return is_done, is_done return Promise(_is_finished_loading, 'Finished initializing the xblock.').fulfill()