diff --git a/AUTHORS b/AUTHORS index df0628bc2c..a4aa63e807 100644 --- a/AUTHORS +++ b/AUTHORS @@ -275,3 +275,4 @@ Alisan Tang Kevin Kim Albert St. Aubin Jr. Casey Litton +Jhony Avella diff --git a/common/test/acceptance/pages/common/logout.py b/common/test/acceptance/pages/common/logout.py index 134a4e8d92..735e46aa81 100644 --- a/common/test/acceptance/pages/common/logout.py +++ b/common/test/acceptance/pages/common/logout.py @@ -2,7 +2,7 @@ Logout Page. """ from bok_choy.page_object import PageObject -from . import BASE_URL +from common.test.acceptance.pages.common import BASE_URL class LogoutPage(PageObject): diff --git a/common/test/acceptance/pages/common/utils.py b/common/test/acceptance/pages/common/utils.py index 8487933f76..392492d056 100644 --- a/common/test/acceptance/pages/common/utils.py +++ b/common/test/acceptance/pages/common/utils.py @@ -2,7 +2,7 @@ Utility methods common to Studio and the LMS. """ from bok_choy.promise import EmptyPromise -from ...tests.helpers import disable_animations +from common.test.acceptance.tests.helpers import disable_animations def wait_for_notification(page): diff --git a/common/test/acceptance/pages/lms/account_settings.py b/common/test/acceptance/pages/lms/account_settings.py index d3e6e38405..72b09b7f81 100644 --- a/common/test/acceptance/pages/lms/account_settings.py +++ b/common/test/acceptance/pages/lms/account_settings.py @@ -1,12 +1,12 @@ """ Base class for account settings page. """ -from . import BASE_URL +from common.test.acceptance.pages.lms import BASE_URL from bok_choy.page_object import PageObject from bok_choy.promise import EmptyPromise -from .fields import FieldsMixin +from common.test.acceptance.pages.lms.fields import FieldsMixin class AccountSettingsPage(FieldsMixin, PageObject): diff --git a/common/test/acceptance/pages/lms/auto_auth.py b/common/test/acceptance/pages/lms/auto_auth.py index 5576a90d39..42ea5ca5c3 100644 --- a/common/test/acceptance/pages/lms/auto_auth.py +++ b/common/test/acceptance/pages/lms/auto_auth.py @@ -5,7 +5,7 @@ Auto-auth page (used to automatically log in during testing). import re import urllib from bok_choy.page_object import PageObject, unguarded, XSS_INJECTION -from . import AUTH_BASE_URL +from common.test.acceptance.pages.lms import AUTH_BASE_URL class AutoAuthPage(PageObject): diff --git a/common/test/acceptance/pages/lms/bookmarks.py b/common/test/acceptance/pages/lms/bookmarks.py index aacbb45800..f76f1d9504 100644 --- a/common/test/acceptance/pages/lms/bookmarks.py +++ b/common/test/acceptance/pages/lms/bookmarks.py @@ -2,8 +2,8 @@ Courseware Boomarks """ from bok_choy.promise import EmptyPromise -from .course_page import CoursePage -from ..common.paging import PaginatedUIMixin +from common.test.acceptance.pages.lms.course_page import CoursePage +from common.test.acceptance.pages.common.paging import PaginatedUIMixin class BookmarksPage(CoursePage, PaginatedUIMixin): diff --git a/common/test/acceptance/pages/lms/certificate_page.py b/common/test/acceptance/pages/lms/certificate_page.py index 6b6781bd0c..0a2d1ac4e0 100644 --- a/common/test/acceptance/pages/lms/certificate_page.py +++ b/common/test/acceptance/pages/lms/certificate_page.py @@ -4,7 +4,7 @@ Module for Certificates pages. """ from bok_choy.page_object import PageObject -from . import BASE_URL +from common.test.acceptance.pages.lms import BASE_URL class CertificatePage(PageObject): diff --git a/common/test/acceptance/pages/lms/course_about.py b/common/test/acceptance/pages/lms/course_about.py index 83ec4ffcd4..a5482c7b77 100644 --- a/common/test/acceptance/pages/lms/course_about.py +++ b/common/test/acceptance/pages/lms/course_about.py @@ -2,8 +2,8 @@ Course about page (with registration button) """ -from .course_page import CoursePage -from .login_and_register import RegisterPage +from common.test.acceptance.pages.lms.course_page import CoursePage +from common.test.acceptance.pages.lms.login_and_register import RegisterPage class CourseAboutPage(CoursePage): diff --git a/common/test/acceptance/pages/lms/course_info.py b/common/test/acceptance/pages/lms/course_info.py index 36f1fd2a3d..eb617bc4fe 100644 --- a/common/test/acceptance/pages/lms/course_info.py +++ b/common/test/acceptance/pages/lms/course_info.py @@ -2,7 +2,7 @@ Course info page. """ -from .course_page import CoursePage +from common.test.acceptance.pages.lms.course_page import CoursePage class CourseInfoPage(CoursePage): diff --git a/common/test/acceptance/pages/lms/course_page.py b/common/test/acceptance/pages/lms/course_page.py index 94943a9424..4c856500ce 100644 --- a/common/test/acceptance/pages/lms/course_page.py +++ b/common/test/acceptance/pages/lms/course_page.py @@ -3,8 +3,8 @@ Base class for pages in courseware. """ from bok_choy.page_object import PageObject -from . import BASE_URL -from .tab_nav import TabNavPage +from common.test.acceptance.pages.lms import BASE_URL +from common.test.acceptance.pages.lms.tab_nav import TabNavPage class CoursePage(PageObject): diff --git a/common/test/acceptance/pages/lms/course_wiki.py b/common/test/acceptance/pages/lms/course_wiki.py index 4a0b56fb27..d5371697d0 100644 --- a/common/test/acceptance/pages/lms/course_wiki.py +++ b/common/test/acceptance/pages/lms/course_wiki.py @@ -2,8 +2,8 @@ Wiki tab on courses """ -from .course_page import CoursePage -from ...pages.studio.utils import type_in_codemirror +from common.test.acceptance.pages.lms.course_page import CoursePage +from common.test.acceptance.pages.studio.utils import type_in_codemirror class CourseWikiPage(CoursePage): diff --git a/common/test/acceptance/pages/lms/courseware.py b/common/test/acceptance/pages/lms/courseware.py index 34629acd99..42af7bb1b9 100644 --- a/common/test/acceptance/pages/lms/courseware.py +++ b/common/test/acceptance/pages/lms/courseware.py @@ -2,7 +2,7 @@ Courseware page. """ -from .course_page import CoursePage +from common.test.acceptance.pages.lms.course_page import CoursePage from bok_choy.promise import EmptyPromise from selenium.webdriver.common.action_chains import ActionChains diff --git a/common/test/acceptance/pages/lms/courseware_search.py b/common/test/acceptance/pages/lms/courseware_search.py index 2b62ec669d..91a263bd54 100644 --- a/common/test/acceptance/pages/lms/courseware_search.py +++ b/common/test/acceptance/pages/lms/courseware_search.py @@ -2,7 +2,7 @@ Courseware search """ -from .course_page import CoursePage +from common.test.acceptance.pages.lms.course_page import CoursePage class CoursewareSearchPage(CoursePage): diff --git a/common/test/acceptance/pages/lms/create_mode.py b/common/test/acceptance/pages/lms/create_mode.py index eb89cf45cf..7c0d9982cd 100644 --- a/common/test/acceptance/pages/lms/create_mode.py +++ b/common/test/acceptance/pages/lms/create_mode.py @@ -4,7 +4,7 @@ import re import urllib from bok_choy.page_object import PageObject -from . import BASE_URL +from common.test.acceptance.pages.lms import BASE_URL class ModeCreationPage(PageObject): diff --git a/common/test/acceptance/pages/lms/dashboard.py b/common/test/acceptance/pages/lms/dashboard.py index 79e7eefc1a..3d8b13e0bf 100644 --- a/common/test/acceptance/pages/lms/dashboard.py +++ b/common/test/acceptance/pages/lms/dashboard.py @@ -3,7 +3,7 @@ Student dashboard page. """ from bok_choy.page_object import PageObject -from . import BASE_URL +from common.test.acceptance.pages.lms import BASE_URL class DashboardPage(PageObject): diff --git a/common/test/acceptance/pages/lms/dashboard_search.py b/common/test/acceptance/pages/lms/dashboard_search.py index ff8cfaaa66..a4d16c4e15 100644 --- a/common/test/acceptance/pages/lms/dashboard_search.py +++ b/common/test/acceptance/pages/lms/dashboard_search.py @@ -3,7 +3,7 @@ Dashboard search """ from bok_choy.page_object import PageObject -from . import BASE_URL +from common.test.acceptance.pages.lms import BASE_URL class DashboardSearchPage(PageObject): diff --git a/common/test/acceptance/pages/lms/discovery.py b/common/test/acceptance/pages/lms/discovery.py index b8aea204cd..59ae95d7d0 100644 --- a/common/test/acceptance/pages/lms/discovery.py +++ b/common/test/acceptance/pages/lms/discovery.py @@ -2,7 +2,7 @@ Course discovery page. """ -from . import BASE_URL +from common.test.acceptance.pages.lms import BASE_URL from bok_choy.page_object import PageObject diff --git a/common/test/acceptance/pages/lms/discussion.py b/common/test/acceptance/pages/lms/discussion.py index a4315acf2f..c266395629 100644 --- a/common/test/acceptance/pages/lms/discussion.py +++ b/common/test/acceptance/pages/lms/discussion.py @@ -4,7 +4,7 @@ from bok_choy.javascript import wait_for_js from bok_choy.page_object import PageObject from bok_choy.promise import EmptyPromise, Promise -from .course_page import CoursePage +from common.test.acceptance.pages.lms.course_page import CoursePage class DiscussionPageMixin(object): diff --git a/common/test/acceptance/pages/lms/edxnotes.py b/common/test/acceptance/pages/lms/edxnotes.py index 4cbd83fc5e..980efdc8c2 100644 --- a/common/test/acceptance/pages/lms/edxnotes.py +++ b/common/test/acceptance/pages/lms/edxnotes.py @@ -1,8 +1,8 @@ from bok_choy.page_object import PageObject, PageLoadError, unguarded from bok_choy.promise import BrokenPromise, EmptyPromise -from .course_page import CoursePage -from ..common.paging import PaginatedUIMixin -from ...tests.helpers import disable_animations +from common.test.acceptance.pages.lms.course_page import CoursePage +from common.test.acceptance.pages.common.paging import PaginatedUIMixin +from common.test.acceptance.tests.helpers import disable_animations from selenium.webdriver.common.action_chains import ActionChains diff --git a/common/test/acceptance/pages/lms/fields.py b/common/test/acceptance/pages/lms/fields.py index e2e88e9f4d..338daa1d51 100644 --- a/common/test/acceptance/pages/lms/fields.py +++ b/common/test/acceptance/pages/lms/fields.py @@ -4,7 +4,7 @@ Mixins for fields. """ from bok_choy.promise import EmptyPromise -from ...tests.helpers import get_selected_option_text, select_option_by_text +from common.test.acceptance.tests.helpers import get_selected_option_text, select_option_by_text class FieldsMixin(object): diff --git a/common/test/acceptance/pages/lms/find_courses.py b/common/test/acceptance/pages/lms/find_courses.py index 564891b1f3..e7a29601c8 100644 --- a/common/test/acceptance/pages/lms/find_courses.py +++ b/common/test/acceptance/pages/lms/find_courses.py @@ -3,7 +3,7 @@ Find courses page (main page of the LMS). """ from bok_choy.page_object import PageObject -from . import BASE_URL +from common.test.acceptance.pages.lms import BASE_URL class FindCoursesPage(PageObject): diff --git a/common/test/acceptance/pages/lms/index.py b/common/test/acceptance/pages/lms/index.py index 7c9633f02f..f124856417 100644 --- a/common/test/acceptance/pages/lms/index.py +++ b/common/test/acceptance/pages/lms/index.py @@ -3,7 +3,7 @@ LMS index (home) page. """ from bok_choy.page_object import PageObject -from . import BASE_URL +from common.test.acceptance.pages.lms import BASE_URL BANNER_SELECTOR = 'section.home header div.outer-wrapper div.title .heading-group h1' INTRO_VIDEO_SELECTOR = 'div.play-intro' diff --git a/common/test/acceptance/pages/lms/instructor_dashboard.py b/common/test/acceptance/pages/lms/instructor_dashboard.py index d056e82262..3c9e6ecb8c 100644 --- a/common/test/acceptance/pages/lms/instructor_dashboard.py +++ b/common/test/acceptance/pages/lms/instructor_dashboard.py @@ -4,10 +4,10 @@ Instructor (2) dashboard page. """ from bok_choy.page_object import PageObject -from .course_page import CoursePage +from common.test.acceptance.pages.lms.course_page import CoursePage import os from bok_choy.promise import EmptyPromise, Promise -from ...tests.helpers import select_option_by_text, get_selected_option_text, get_options +from common.test.acceptance.tests.helpers import select_option_by_text, get_selected_option_text, get_options class InstructorDashboardPage(CoursePage): diff --git a/common/test/acceptance/pages/lms/learner_profile.py b/common/test/acceptance/pages/lms/learner_profile.py index 7d6e08773d..48ae348828 100644 --- a/common/test/acceptance/pages/lms/learner_profile.py +++ b/common/test/acceptance/pages/lms/learner_profile.py @@ -3,11 +3,11 @@ Bok-Choy PageObject class for learner profile page. """ from bok_choy.query import BrowserQuery -from . import BASE_URL +from common.test.acceptance.pages.lms import BASE_URL from bok_choy.page_object import PageObject -from .fields import FieldsMixin +from common.test.acceptance.pages.lms.fields import FieldsMixin from bok_choy.promise import EmptyPromise -from .instructor_dashboard import InstructorDashboardPage +from common.test.acceptance.pages.lms.instructor_dashboard import InstructorDashboardPage from selenium.webdriver import ActionChains diff --git a/common/test/acceptance/pages/lms/login.py b/common/test/acceptance/pages/lms/login.py index b4ca17716c..a67bd797f9 100644 --- a/common/test/acceptance/pages/lms/login.py +++ b/common/test/acceptance/pages/lms/login.py @@ -4,8 +4,8 @@ Login page for the LMS. from bok_choy.page_object import PageObject from bok_choy.promise import EmptyPromise -from . import BASE_URL -from .dashboard import DashboardPage +from common.test.acceptance.pages.lms import BASE_URL +from common.test.acceptance.pages.lms.dashboard import DashboardPage class LoginPage(PageObject): diff --git a/common/test/acceptance/pages/lms/login_and_register.py b/common/test/acceptance/pages/lms/login_and_register.py index 5a861b29aa..be9980770d 100644 --- a/common/test/acceptance/pages/lms/login_and_register.py +++ b/common/test/acceptance/pages/lms/login_and_register.py @@ -3,8 +3,8 @@ from urllib import urlencode from bok_choy.page_object import PageObject, unguarded from bok_choy.promise import Promise, EmptyPromise -from . import BASE_URL -from .dashboard import DashboardPage +from common.test.acceptance.pages.lms import BASE_URL +from common.test.acceptance.pages.lms.dashboard import DashboardPage class RegisterPage(PageObject): diff --git a/common/test/acceptance/pages/lms/pay_and_verify.py b/common/test/acceptance/pages/lms/pay_and_verify.py index 3897610b88..28362eb3b0 100644 --- a/common/test/acceptance/pages/lms/pay_and_verify.py +++ b/common/test/acceptance/pages/lms/pay_and_verify.py @@ -4,8 +4,8 @@ import re from bok_choy.page_object import PageObject from bok_choy.promise import Promise -from . import BASE_URL -from .dashboard import DashboardPage +from common.test.acceptance.pages.lms import BASE_URL +from common.test.acceptance.pages.lms.dashboard import DashboardPage class PaymentAndVerificationFlow(PageObject): diff --git a/common/test/acceptance/pages/lms/programs.py b/common/test/acceptance/pages/lms/programs.py index b20c670dd8..f3290f989e 100644 --- a/common/test/acceptance/pages/lms/programs.py +++ b/common/test/acceptance/pages/lms/programs.py @@ -1,7 +1,7 @@ """LMS-hosted Programs pages""" from bok_choy.page_object import PageObject -from . import BASE_URL +from common.test.acceptance.pages.lms import BASE_URL class ProgramListingPage(PageObject): diff --git a/common/test/acceptance/pages/lms/progress.py b/common/test/acceptance/pages/lms/progress.py index f8b3922c50..3d9ca3da38 100644 --- a/common/test/acceptance/pages/lms/progress.py +++ b/common/test/acceptance/pages/lms/progress.py @@ -1,7 +1,7 @@ """ Student progress page """ -from .course_page import CoursePage +from common.test.acceptance.pages.lms.course_page import CoursePage class ProgressPage(CoursePage): diff --git a/common/test/acceptance/pages/lms/staff_view.py b/common/test/acceptance/pages/lms/staff_view.py index c7725a9709..410dce6ee5 100644 --- a/common/test/acceptance/pages/lms/staff_view.py +++ b/common/test/acceptance/pages/lms/staff_view.py @@ -2,7 +2,7 @@ Staff view of courseware """ from bok_choy.page_object import PageObject -from .courseware import CoursewarePage +from common.test.acceptance.pages.lms.courseware import CoursewarePage class StaffPage(CoursewarePage): diff --git a/common/test/acceptance/pages/lms/teams.py b/common/test/acceptance/pages/lms/teams.py index 2c7df5da27..467b5885b0 100644 --- a/common/test/acceptance/pages/lms/teams.py +++ b/common/test/acceptance/pages/lms/teams.py @@ -3,12 +3,12 @@ Teams pages. """ -from .course_page import CoursePage -from .discussion import InlineDiscussionPage -from ..common.paging import PaginatedUIMixin -from ...pages.common.utils import confirm_prompt +from common.test.acceptance.pages.lms.course_page import CoursePage +from common.test.acceptance.pages.lms.discussion import InlineDiscussionPage +from common.test.acceptance.pages.common.paging import PaginatedUIMixin +from common.test.acceptance.pages.common.utils import confirm_prompt -from .fields import FieldsMixin +from common.test.acceptance.pages.lms.fields import FieldsMixin TOPIC_CARD_CSS = 'div.wrapper-card-core' diff --git a/common/test/acceptance/pages/lms/textbook_view.py b/common/test/acceptance/pages/lms/textbook_view.py index 6b946d96dd..a22ff627b8 100644 --- a/common/test/acceptance/pages/lms/textbook_view.py +++ b/common/test/acceptance/pages/lms/textbook_view.py @@ -2,7 +2,7 @@ Course Textbooks page. """ -from .course_page import CoursePage +from common.test.acceptance.pages.lms.course_page import CoursePage from bok_choy.promise import EmptyPromise diff --git a/common/test/acceptance/pages/lms/track_selection.py b/common/test/acceptance/pages/lms/track_selection.py index 3b701d69e8..30850e018a 100644 --- a/common/test/acceptance/pages/lms/track_selection.py +++ b/common/test/acceptance/pages/lms/track_selection.py @@ -1,8 +1,8 @@ """Track selection page""" from bok_choy.page_object import PageObject -from . import BASE_URL -from .dashboard import DashboardPage -from .pay_and_verify import PaymentAndVerificationFlow +from common.test.acceptance.pages.lms import BASE_URL +from common.test.acceptance.pages.lms.dashboard import DashboardPage +from common.test.acceptance.pages.lms.pay_and_verify import PaymentAndVerificationFlow class TrackSelectionPage(PageObject): diff --git a/common/test/acceptance/pages/studio/asset_index.py b/common/test/acceptance/pages/studio/asset_index.py index bb22782eb3..0437a0a57c 100644 --- a/common/test/acceptance/pages/studio/asset_index.py +++ b/common/test/acceptance/pages/studio/asset_index.py @@ -5,8 +5,8 @@ The Files and Uploads page for a course in Studio import urllib import os from opaque_keys.edx.locator import CourseLocator -from . import BASE_URL -from .course_page import CoursePage +from common.test.acceptance.pages.studio import BASE_URL +from common.test.acceptance.pages.studio.course_page import CoursePage from bok_choy.javascript import wait_for_js, requirejs diff --git a/common/test/acceptance/pages/studio/auto_auth.py b/common/test/acceptance/pages/studio/auto_auth.py index d3759b1136..ef0347c6e2 100644 --- a/common/test/acceptance/pages/studio/auto_auth.py +++ b/common/test/acceptance/pages/studio/auto_auth.py @@ -5,7 +5,7 @@ Auto-auth page (used to automatically log in during testing). import re import urllib from bok_choy.page_object import PageObject -from . import BASE_URL +from common.test.acceptance.pages.studio import BASE_URL class AutoAuthPage(PageObject): diff --git a/common/test/acceptance/pages/studio/component_editor.py b/common/test/acceptance/pages/studio/component_editor.py index 0565163dbd..eb6cce9a29 100644 --- a/common/test/acceptance/pages/studio/component_editor.py +++ b/common/test/acceptance/pages/studio/component_editor.py @@ -1,6 +1,6 @@ from bok_choy.page_object import PageObject from selenium.webdriver.common.keys import Keys -from ..common.utils import click_css +from common.test.acceptance.pages.common.utils import click_css from selenium.webdriver.support.ui import Select diff --git a/common/test/acceptance/pages/studio/container.py b/common/test/acceptance/pages/studio/container.py index 16e17f395d..7c524a650a 100644 --- a/common/test/acceptance/pages/studio/container.py +++ b/common/test/acceptance/pages/studio/container.py @@ -4,11 +4,11 @@ Container page in Studio from bok_choy.page_object import PageObject from bok_choy.promise import Promise, EmptyPromise -from . import BASE_URL +from common.test.acceptance.pages.studio import BASE_URL -from ..common.utils import click_css, confirm_prompt +from common.test.acceptance.pages.common.utils import click_css, confirm_prompt -from .utils import type_in_codemirror +from common.test.acceptance.pages.studio.utils import type_in_codemirror class ContainerPage(PageObject): diff --git a/common/test/acceptance/pages/studio/course_info.py b/common/test/acceptance/pages/studio/course_info.py index eb3b97be96..12b8780085 100644 --- a/common/test/acceptance/pages/studio/course_info.py +++ b/common/test/acceptance/pages/studio/course_info.py @@ -2,7 +2,7 @@ Course Updates page. """ -from .course_page import CoursePage +from common.test.acceptance.pages.studio.course_page import CoursePage class CourseUpdatesPage(CoursePage): diff --git a/common/test/acceptance/pages/studio/course_page.py b/common/test/acceptance/pages/studio/course_page.py index 2c9ffc1288..9d42054c29 100644 --- a/common/test/acceptance/pages/studio/course_page.py +++ b/common/test/acceptance/pages/studio/course_page.py @@ -5,7 +5,7 @@ Base class for pages specific to a course in Studio. import os from opaque_keys.edx.locator import CourseLocator from bok_choy.page_object import PageObject -from . import BASE_URL +from common.test.acceptance.pages.studio import BASE_URL class CoursePage(PageObject): diff --git a/common/test/acceptance/pages/studio/course_rerun.py b/common/test/acceptance/pages/studio/course_rerun.py index 9675b79326..d05252c831 100644 --- a/common/test/acceptance/pages/studio/course_rerun.py +++ b/common/test/acceptance/pages/studio/course_rerun.py @@ -2,8 +2,8 @@ Course rerun page in Studio """ -from .course_page import CoursePage -from .utils import set_input_value +from common.test.acceptance.pages.studio.course_page import CoursePage +from common.test.acceptance.pages.studio.utils import set_input_value class CourseRerunPage(CoursePage): diff --git a/common/test/acceptance/pages/studio/edit_tabs.py b/common/test/acceptance/pages/studio/edit_tabs.py index 4a68d696f4..adc78f3fb3 100644 --- a/common/test/acceptance/pages/studio/edit_tabs.py +++ b/common/test/acceptance/pages/studio/edit_tabs.py @@ -2,7 +2,7 @@ Pages page for a course. """ -from .course_page import CoursePage +from common.test.acceptance.pages.studio.course_page import CoursePage class PagesPage(CoursePage): diff --git a/common/test/acceptance/pages/studio/howitworks.py b/common/test/acceptance/pages/studio/howitworks.py index 2032e65f49..d73933efc5 100644 --- a/common/test/acceptance/pages/studio/howitworks.py +++ b/common/test/acceptance/pages/studio/howitworks.py @@ -3,7 +3,7 @@ Home page for Studio when not logged in. """ from bok_choy.page_object import PageObject -from . import BASE_URL +from common.test.acceptance.pages.studio import BASE_URL class HowitworksPage(PageObject): diff --git a/common/test/acceptance/pages/studio/import_export.py b/common/test/acceptance/pages/studio/import_export.py index cd544c2ba8..30f583a377 100644 --- a/common/test/acceptance/pages/studio/import_export.py +++ b/common/test/acceptance/pages/studio/import_export.py @@ -9,11 +9,11 @@ import os import re import requests -from ..common.utils import click_css +from common.test.acceptance.pages.common.utils import click_css -from .library import LibraryPage -from .course_page import CoursePage -from . import BASE_URL +from common.test.acceptance.pages.studio.library import LibraryPage +from common.test.acceptance.pages.studio.course_page import CoursePage +from common.test.acceptance.pages.studio import BASE_URL class TemplateCheckMixin(object): diff --git a/common/test/acceptance/pages/studio/index.py b/common/test/acceptance/pages/studio/index.py index ed6bd4158a..8de34a71af 100644 --- a/common/test/acceptance/pages/studio/index.py +++ b/common/test/acceptance/pages/studio/index.py @@ -3,7 +3,7 @@ Studio Home page """ from bok_choy.page_object import PageObject -from . import BASE_URL +from common.test.acceptance.pages.studio import BASE_URL from selenium.webdriver import ActionChains diff --git a/common/test/acceptance/pages/studio/library.py b/common/test/acceptance/pages/studio/library.py index 625eaebe8a..1113fb7f5c 100644 --- a/common/test/acceptance/pages/studio/library.py +++ b/common/test/acceptance/pages/studio/library.py @@ -5,15 +5,15 @@ from bok_choy.javascript import js_defined, wait_for_js from bok_choy.page_object import PageObject from bok_choy.promise import EmptyPromise from selenium.webdriver.support.select import Select -from .component_editor import ComponentEditorView -from .container import XBlockWrapper -from ...pages.studio.users import UsersPageMixin -from ...pages.studio.pagination import PaginatedMixin +from common.test.acceptance.pages.studio.component_editor import ComponentEditorView +from common.test.acceptance.pages.studio.container import XBlockWrapper +from common.test.acceptance.pages.studio.users import UsersPageMixin +from common.test.acceptance.pages.studio.pagination import PaginatedMixin from selenium.webdriver.common.keys import Keys -from ..common.utils import confirm_prompt, wait_for_notification +from common.test.acceptance.pages.common.utils import confirm_prompt, wait_for_notification -from . import BASE_URL +from common.test.acceptance.pages.studio import BASE_URL class LibraryPage(PageObject): diff --git a/common/test/acceptance/pages/studio/login.py b/common/test/acceptance/pages/studio/login.py index 37ddd6d35a..0d41660659 100644 --- a/common/test/acceptance/pages/studio/login.py +++ b/common/test/acceptance/pages/studio/login.py @@ -4,7 +4,7 @@ Login page for Studio. from bok_choy.page_object import PageObject from bok_choy.promise import EmptyPromise -from . import BASE_URL +from common.test.acceptance.pages.studio import BASE_URL class LoginPage(PageObject): diff --git a/common/test/acceptance/pages/studio/overview.py b/common/test/acceptance/pages/studio/overview.py index 2ffcb7e520..5c17afabea 100644 --- a/common/test/acceptance/pages/studio/overview.py +++ b/common/test/acceptance/pages/studio/overview.py @@ -10,11 +10,11 @@ from selenium.webdriver import ActionChains from selenium.webdriver.support.ui import Select from selenium.webdriver.common.keys import Keys -from ..common.utils import click_css, confirm_prompt +from common.test.acceptance.pages.common.utils import click_css, confirm_prompt -from .course_page import CoursePage -from .container import ContainerPage -from .utils import set_input_value_and_save, set_input_value +from common.test.acceptance.pages.studio.course_page import CoursePage +from common.test.acceptance.pages.studio.container import ContainerPage +from common.test.acceptance.pages.studio.utils import set_input_value_and_save, set_input_value class CourseOutlineItem(object): diff --git a/common/test/acceptance/pages/studio/settings.py b/common/test/acceptance/pages/studio/settings.py index 78b821d075..2847495a26 100644 --- a/common/test/acceptance/pages/studio/settings.py +++ b/common/test/acceptance/pages/studio/settings.py @@ -7,9 +7,9 @@ import os from bok_choy.promise import EmptyPromise from bok_choy.javascript import requirejs -from .course_page import CoursePage -from .users import wait_for_ajax_or_reload -from .utils import press_the_notification_button +from common.test.acceptance.pages.studio.course_page import CoursePage +from common.test.acceptance.pages.studio.users import wait_for_ajax_or_reload +from common.test.acceptance.pages.studio.utils import press_the_notification_button @requirejs('js/factories/settings') diff --git a/common/test/acceptance/pages/studio/settings_advanced.py b/common/test/acceptance/pages/studio/settings_advanced.py index 699e624696..144c10defe 100644 --- a/common/test/acceptance/pages/studio/settings_advanced.py +++ b/common/test/acceptance/pages/studio/settings_advanced.py @@ -3,8 +3,12 @@ Course Advanced Settings page """ from bok_choy.promise import EmptyPromise -from .course_page import CoursePage -from .utils import press_the_notification_button, type_in_codemirror, get_codemirror_value +from common.test.acceptance.pages.studio.course_page import CoursePage +from common.test.acceptance.pages.studio.utils import ( + press_the_notification_button, + type_in_codemirror, + get_codemirror_value, +) KEY_CSS = '.key h3.title' diff --git a/common/test/acceptance/pages/studio/settings_certificates.py b/common/test/acceptance/pages/studio/settings_certificates.py index 446b5a3971..7e6de2da4b 100644 --- a/common/test/acceptance/pages/studio/settings_certificates.py +++ b/common/test/acceptance/pages/studio/settings_certificates.py @@ -11,7 +11,7 @@ The methods in these classes are organized into several conceptual buckets: import os from bok_choy.promise import EmptyPromise -from .course_page import CoursePage +from common.test.acceptance.pages.studio.course_page import CoursePage from common.test.acceptance.tests.helpers import disable_animations from selenium.webdriver import ActionChains diff --git a/common/test/acceptance/pages/studio/settings_graders.py b/common/test/acceptance/pages/studio/settings_graders.py index 8c9aea9fee..3cb3e516aa 100644 --- a/common/test/acceptance/pages/studio/settings_graders.py +++ b/common/test/acceptance/pages/studio/settings_graders.py @@ -2,7 +2,7 @@ Course Grading Settings page. """ -from .course_page import CoursePage +from common.test.acceptance.pages.studio.course_page import CoursePage class GradingPage(CoursePage): diff --git a/common/test/acceptance/pages/studio/settings_group_configurations.py b/common/test/acceptance/pages/studio/settings_group_configurations.py index b0341cb112..f1d20bb8bf 100644 --- a/common/test/acceptance/pages/studio/settings_group_configurations.py +++ b/common/test/acceptance/pages/studio/settings_group_configurations.py @@ -1,8 +1,8 @@ """ Course Group Configurations page. """ -from ..common.utils import confirm_prompt -from .course_page import CoursePage +from common.test.acceptance.pages.common.utils import confirm_prompt +from common.test.acceptance.pages.studio.course_page import CoursePage class GroupConfigurationsPage(CoursePage): diff --git a/common/test/acceptance/pages/studio/signup.py b/common/test/acceptance/pages/studio/signup.py index fc375a34e4..58d6e96ed0 100644 --- a/common/test/acceptance/pages/studio/signup.py +++ b/common/test/acceptance/pages/studio/signup.py @@ -1,5 +1,5 @@ from bok_choy.page_object import PageObject -from . import BASE_URL +from common.test.acceptance.pages.studio import BASE_URL class SignupPage(PageObject): diff --git a/common/test/acceptance/pages/studio/textbook_upload.py b/common/test/acceptance/pages/studio/textbook_upload.py index e107eaf5b4..6cd3ced995 100644 --- a/common/test/acceptance/pages/studio/textbook_upload.py +++ b/common/test/acceptance/pages/studio/textbook_upload.py @@ -4,8 +4,8 @@ Course Textbooks page. import requests from path import Path as path -from ..common.utils import click_css -from .course_page import CoursePage +from common.test.acceptance.pages.common.utils import click_css +from common.test.acceptance.pages.studio.course_page import CoursePage class TextbookUploadPage(CoursePage): diff --git a/common/test/acceptance/pages/studio/users.py b/common/test/acceptance/pages/studio/users.py index 9fc0401a70..7102641145 100644 --- a/common/test/acceptance/pages/studio/users.py +++ b/common/test/acceptance/pages/studio/users.py @@ -3,9 +3,9 @@ Page classes to test either the Course Team page or the Library Team page. """ from bok_choy.promise import EmptyPromise from bok_choy.page_object import PageObject -from ...tests.helpers import disable_animations -from .course_page import CoursePage -from . import BASE_URL +from common.test.acceptance.tests.helpers import disable_animations +from common.test.acceptance.pages.studio.course_page import CoursePage +from common.test.acceptance.pages.studio import BASE_URL def wait_for_ajax_or_reload(browser): diff --git a/common/test/acceptance/pages/studio/utils.py b/common/test/acceptance/pages/studio/utils.py index d118a35b51..0a07b4cc8d 100644 --- a/common/test/acceptance/pages/studio/utils.py +++ b/common/test/acceptance/pages/studio/utils.py @@ -6,7 +6,7 @@ from selenium.webdriver.common.keys import Keys from bok_choy.javascript import js_defined from bok_choy.promise import EmptyPromise -from ..common.utils import click_css, wait_for_notification +from common.test.acceptance.pages.common.utils import click_css, wait_for_notification @js_defined('window.jQuery') diff --git a/common/test/acceptance/pages/studio/video/video.py b/common/test/acceptance/pages/studio/video/video.py index 79d2aa9462..231e5a37a6 100644 --- a/common/test/acceptance/pages/studio/video/video.py +++ b/common/test/acceptance/pages/studio/video/video.py @@ -6,9 +6,9 @@ import os import requests from bok_choy.promise import EmptyPromise, Promise from bok_choy.javascript import wait_for_js, js_defined -from ....tests.helpers import YouTubeStubConfig -from ...lms.video.video import VideoPage -from ...common.utils import wait_for_notification +from common.test.acceptance.tests.helpers import YouTubeStubConfig +from common.test.acceptance.pages.lms.video.video import VideoPage +from common.test.acceptance.pages.common.utils import wait_for_notification from selenium.webdriver.common.keys import Keys from selenium.webdriver.common.action_chains import ActionChains diff --git a/common/test/acceptance/pages/xblock/acid.py b/common/test/acceptance/pages/xblock/acid.py index a05d689f88..efc9c94293 100644 --- a/common/test/acceptance/pages/xblock/acid.py +++ b/common/test/acceptance/pages/xblock/acid.py @@ -4,7 +4,7 @@ PageObjects related to the AcidBlock from bok_choy.page_object import PageObject from bok_choy.promise import EmptyPromise, BrokenPromise -from .utils import wait_for_xblock_initialization +from common.test.acceptance.pages.xblock.utils import wait_for_xblock_initialization class AcidView(PageObject):