From c8dc10b2d7f2ccd012fe5c2827066350e1655f35 Mon Sep 17 00:00:00 2001 From: Saleem Latif Date: Thu, 10 Sep 2015 12:12:58 +0500 Subject: [PATCH] added wait for loading js files --- common/test/acceptance/pages/studio/settings.py | 10 ++++++++++ .../tests/studio/test_studio_settings_details.py | 1 - 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/common/test/acceptance/pages/studio/settings.py b/common/test/acceptance/pages/studio/settings.py index 1f5b2fc10d..9e0c3d90d7 100644 --- a/common/test/acceptance/pages/studio/settings.py +++ b/common/test/acceptance/pages/studio/settings.py @@ -4,11 +4,13 @@ Course Schedule and Details Settings page. """ from __future__ import unicode_literals from bok_choy.promise import EmptyPromise +from bok_choy.javascript import requirejs from .course_page import CoursePage from .utils import press_the_notification_button +@requirejs('js/factories/settings') class SettingsPage(CoursePage): """ Course Schedule and Details Settings page. @@ -22,6 +24,13 @@ class SettingsPage(CoursePage): def is_browser_on_page(self): return self.q(css='body.view-settings').present + def wait_for_require_js(self): + """ + Wait for require-js to load javascript files. + """ + if hasattr(self, 'wait_for_js'): + self.wait_for_js() # pylint: disable=no-member + def refresh_and_wait_for_load(self): """ Refresh the page and wait for all resources to load. @@ -182,4 +191,5 @@ class SettingsPage(CoursePage): lambda: self.q(css='body.view-settings').present, 'Page is refreshed' ).fulfill() + self.wait_for_require_js() self.wait_for_ajax() diff --git a/common/test/acceptance/tests/studio/test_studio_settings_details.py b/common/test/acceptance/tests/studio/test_studio_settings_details.py index 5faa002e43..0e68e69708 100644 --- a/common/test/acceptance/tests/studio/test_studio_settings_details.py +++ b/common/test/acceptance/tests/studio/test_studio_settings_details.py @@ -40,7 +40,6 @@ class SettingsMilestonesTest(StudioCourseTest): self.assertTrue(self.settings_detail.pre_requisite_course_options) - @skip # TODO: fix this. SOL-449 def test_prerequisite_course_save_successfully(self): """ Scenario: Selecting course from Pre-Requisite course drop down save the selected course as pre-requisite