From 36f4e55e2b9f794dc3feb13bd1f4ab8974153ccc Mon Sep 17 00:00:00 2001 From: Christine Lytwynec Date: Mon, 19 May 2014 12:45:45 -0400 Subject: [PATCH] added check for modal to disappear in _change_lang_promise --- common/test/acceptance/pages/lms/dashboard.py | 6 ++++-- common/test/acceptance/tests/test_lms.py | 2 +- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/common/test/acceptance/pages/lms/dashboard.py b/common/test/acceptance/pages/lms/dashboard.py index 9d56a16c6c..fda5f84f3a 100644 --- a/common/test/acceptance/pages/lms/dashboard.py +++ b/common/test/acceptance/pages/lms/dashboard.py @@ -86,5 +86,7 @@ class DashboardPage(PageObject): def _changed_lang_promise(self, code): def _check_func(): - return self.q(css='select[name="language"] option[value="{}"]'.format(code)).selected - return EmptyPromise(_check_func, "language changed") + language_is_selected = self.q(css='select[name="language"] option[value="{}"]'.format(code)).selected + modal_is_visible = self.q(css='section#change_language.modal').visible + return (language_is_selected and not modal_is_visible) + return EmptyPromise(_check_func, "language changed and modal hidden") diff --git a/common/test/acceptance/tests/test_lms.py b/common/test/acceptance/tests/test_lms.py index 4660723fb4..c97d62694e 100644 --- a/common/test/acceptance/tests/test_lms.py +++ b/common/test/acceptance/tests/test_lms.py @@ -64,7 +64,7 @@ class RegistrationTest(UniqueCourseTest): course_names = dashboard.available_courses self.assertIn(self.course_info['display_name'], course_names) -@skip("TE-399") + class LanguageTest(UniqueCourseTest): """ Tests that the change language functionality on the dashboard works