From c07cb1905cefb01f2eabca3be16f0f61092c9680 Mon Sep 17 00:00:00 2001 From: raeeschachar Date: Thu, 23 Jun 2016 01:14:36 +0500 Subject: [PATCH] Fixed test default sort preference failing on chrome --- common/test/acceptance/pages/lms/discussion.py | 10 +++++++--- .../acceptance/tests/discussion/test_discussion.py | 2 -- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/common/test/acceptance/pages/lms/discussion.py b/common/test/acceptance/pages/lms/discussion.py index f02322b05b..a4315acf2f 100644 --- a/common/test/acceptance/pages/lms/discussion.py +++ b/common/test/acceptance/pages/lms/discussion.py @@ -380,14 +380,18 @@ class DiscussionSortPreferencePage(CoursePage): """ Return the text of option that is selected for sorting. """ - options = self.q(css="body.discussion .forum-nav-sort-control option") - return options.filter(lambda el: el.is_selected())[0].get_attribute("value") + # Using this workaround (execute script) to make this test work with Chrome browser + selected_value = self.browser.execute_script( + 'var selected_value = $(".forum-nav-sort-control").val(); return selected_value') + return selected_value def change_sort_preference(self, sort_by): """ Change the option of sorting by clicking on new option. """ - self.q(css="body.discussion .forum-nav-sort-control option[value='{0}']".format(sort_by)).click() + self.q(css=".forum-nav-sort-control option[value='{0}']".format(sort_by)).click() + # Click initiates an ajax call, waiting for it to complete + self.wait_for_ajax() def refresh_page(self): """ diff --git a/common/test/acceptance/tests/discussion/test_discussion.py b/common/test/acceptance/tests/discussion/test_discussion.py index 055285a39f..73858ac547 100644 --- a/common/test/acceptance/tests/discussion/test_discussion.py +++ b/common/test/acceptance/tests/discussion/test_discussion.py @@ -1228,7 +1228,6 @@ class DiscussionSortPreferenceTest(UniqueCourseTest): self.sort_page = DiscussionSortPreferencePage(self.browser, self.course_id) self.sort_page.visit() - @flaky # TODO fix this, see TNL-4682 def test_default_sort_preference(self): """ Test to check the default sorting preference of user. (Default = date ) @@ -1247,7 +1246,6 @@ class DiscussionSortPreferenceTest(UniqueCourseTest): selected_sort = self.sort_page.get_selected_sort_preference() self.assertEqual(selected_sort, sort_type) - @flaky # TODO fix this, see TNL-4682 def test_last_preference_saved(self): """ Test that user last preference is saved.