diff --git a/common/test/acceptance/tests/studio/base_studio_test.py b/common/test/acceptance/tests/studio/base_studio_test.py index 96f1fb706e..458aaa2c9f 100644 --- a/common/test/acceptance/tests/studio/base_studio_test.py +++ b/common/test/acceptance/tests/studio/base_studio_test.py @@ -3,12 +3,12 @@ Base classes used by studio tests. """ from bok_choy.web_app_test import WebAppTest from bok_choy.page_object import XSS_INJECTION -from ...pages.studio.auto_auth import AutoAuthPage -from ...fixtures.course import CourseFixture -from ...fixtures.library import LibraryFixture -from ..helpers import UniqueCourseTest -from ...pages.studio.overview import CourseOutlinePage -from ...pages.studio.utils import verify_ordering +from common.test.acceptance.pages.studio.auto_auth import AutoAuthPage +from common.test.acceptance.fixtures.course import CourseFixture +from common.test.acceptance.fixtures.library import LibraryFixture +from common.test.acceptance.tests.helpers import UniqueCourseTest +from common.test.acceptance.pages.studio.overview import CourseOutlinePage +from common.test.acceptance.pages.studio.utils import verify_ordering class StudioCourseTest(UniqueCourseTest): diff --git a/common/test/acceptance/tests/studio/test_import_export.py b/common/test/acceptance/tests/studio/test_import_export.py index d23c7d9ac2..58d8c7f2b9 100644 --- a/common/test/acceptance/tests/studio/test_import_export.py +++ b/common/test/acceptance/tests/studio/test_import_export.py @@ -9,14 +9,14 @@ from flaky import flaky from abc import abstractmethod from bok_choy.promise import EmptyPromise -from .base_studio_test import StudioLibraryTest, StudioCourseTest -from ...fixtures.course import XBlockFixtureDesc -from ...pages.studio.import_export import ExportLibraryPage, ExportCoursePage, ImportLibraryPage, ImportCoursePage -from ...pages.studio.library import LibraryEditPage -from ...pages.studio.container import ContainerPage -from ...pages.studio.overview import CourseOutlinePage -from ...pages.lms.courseware import CoursewarePage -from ...pages.lms.staff_view import StaffPage +from common.test.acceptance.tests.studio.base_studio_test import StudioLibraryTest, StudioCourseTest +from common.test.acceptance.fixtures.course import XBlockFixtureDesc +from common.test.acceptance.pages.studio.import_export import ExportLibraryPage, ExportCoursePage, ImportLibraryPage, ImportCoursePage +from common.test.acceptance.pages.studio.library import LibraryEditPage +from common.test.acceptance.pages.studio.container import ContainerPage +from common.test.acceptance.pages.studio.overview import CourseOutlinePage +from common.test.acceptance.pages.lms.courseware import CoursewarePage +from common.test.acceptance.pages.lms.staff_view import StaffPage class ExportTestMixin(object): diff --git a/common/test/acceptance/tests/studio/test_studio_bad_data.py b/common/test/acceptance/tests/studio/test_studio_bad_data.py index 17e738f7a4..d53f1115e9 100644 --- a/common/test/acceptance/tests/studio/test_studio_bad_data.py +++ b/common/test/acceptance/tests/studio/test_studio_bad_data.py @@ -1,6 +1,6 @@ from base_studio_test import ContainerBase -from ...fixtures.course import XBlockFixtureDesc -from ...pages.studio.utils import verify_ordering +from common.test.acceptance.fixtures.course import XBlockFixtureDesc +from common.test.acceptance.pages.studio.utils import verify_ordering class BadComponentTest(ContainerBase): diff --git a/common/test/acceptance/tests/studio/test_studio_components.py b/common/test/acceptance/tests/studio/test_studio_components.py index 5146f240c7..226d15708b 100644 --- a/common/test/acceptance/tests/studio/test_studio_components.py +++ b/common/test/acceptance/tests/studio/test_studio_components.py @@ -3,10 +3,10 @@ Acceptance tests for adding components in Studio. """ import ddt -from .base_studio_test import ContainerBase -from ...fixtures.course import XBlockFixtureDesc -from ...pages.studio.container import ContainerPage -from ...pages.studio.utils import add_component, add_components +from common.test.acceptance.tests.studio.base_studio_test import ContainerBase +from common.test.acceptance.fixtures.course import XBlockFixtureDesc +from common.test.acceptance.pages.studio.container import ContainerPage +from common.test.acceptance.pages.studio.utils import add_component, add_components from common.test.acceptance.pages.studio.settings_advanced import AdvancedSettingsPage diff --git a/common/test/acceptance/tests/studio/test_studio_container.py b/common/test/acceptance/tests/studio/test_studio_container.py index fdf0630552..55e60bb203 100644 --- a/common/test/acceptance/tests/studio/test_studio_container.py +++ b/common/test/acceptance/tests/studio/test_studio_container.py @@ -6,14 +6,14 @@ for displaying containers within units. from nose.plugins.attrib import attr from unittest import skip -from ...fixtures.course import XBlockFixtureDesc -from ...pages.studio.component_editor import ComponentEditorView, ComponentVisibilityEditorView -from ...pages.studio.container import ContainerPage -from ...pages.studio.html_component_editor import HtmlComponentEditorView -from ...pages.studio.utils import add_discussion, drag -from ...pages.lms.courseware import CoursewarePage -from ...pages.lms.staff_view import StaffPage -from ...tests.helpers import create_user_partition_json +from common.test.acceptance.fixtures.course import XBlockFixtureDesc +from common.test.acceptance.pages.studio.component_editor import ComponentEditorView, ComponentVisibilityEditorView +from common.test.acceptance.pages.studio.container import ContainerPage +from common.test.acceptance.pages.studio.html_component_editor import HtmlComponentEditorView +from common.test.acceptance.pages.studio.utils import add_discussion, drag +from common.test.acceptance.pages.lms.courseware import CoursewarePage +from common.test.acceptance.pages.lms.staff_view import StaffPage +from common.test.acceptance.tests.helpers import create_user_partition_json import datetime from bok_choy.promise import Promise, EmptyPromise diff --git a/common/test/acceptance/tests/studio/test_studio_course_create.py b/common/test/acceptance/tests/studio/test_studio_course_create.py index 943ac036a7..b8441dab8b 100644 --- a/common/test/acceptance/tests/studio/test_studio_course_create.py +++ b/common/test/acceptance/tests/studio/test_studio_course_create.py @@ -5,9 +5,9 @@ import uuid from bok_choy.web_app_test import WebAppTest from nose.plugins.attrib import attr -from ...pages.studio.auto_auth import AutoAuthPage -from ...pages.studio.index import DashboardPage -from ...pages.studio.overview import CourseOutlinePage +from common.test.acceptance.pages.studio.auto_auth import AutoAuthPage +from common.test.acceptance.pages.studio.index import DashboardPage +from common.test.acceptance.pages.studio.overview import CourseOutlinePage @attr('shard_8') diff --git a/common/test/acceptance/tests/studio/test_studio_home.py b/common/test/acceptance/tests/studio/test_studio_home.py index 9ad7b45f3f..9dd4e6e136 100644 --- a/common/test/acceptance/tests/studio/test_studio_home.py +++ b/common/test/acceptance/tests/studio/test_studio_home.py @@ -6,14 +6,14 @@ from flaky import flaky from opaque_keys.edx.locator import LibraryLocator from uuid import uuid4 -from ...fixtures import PROGRAMS_STUB_URL -from ...fixtures.config import ConfigModelFixture -from ...fixtures.programs import ProgramsFixture, ProgramsConfigMixin -from ...pages.studio.auto_auth import AutoAuthPage -from ...pages.studio.library import LibraryEditPage -from ...pages.studio.index import DashboardPage, DashboardPageWithPrograms -from ...pages.lms.account_settings import AccountSettingsPage -from ..helpers import ( +from common.test.acceptance.fixtures import PROGRAMS_STUB_URL +from common.test.acceptance.fixtures.config import ConfigModelFixture +from common.test.acceptance.fixtures.programs import ProgramsFixture, ProgramsConfigMixin +from common.test.acceptance.pages.studio.auto_auth import AutoAuthPage +from common.test.acceptance.pages.studio.library import LibraryEditPage +from common.test.acceptance.pages.studio.index import DashboardPage, DashboardPageWithPrograms +from common.test.acceptance.pages.lms.account_settings import AccountSettingsPage +from common.test.acceptance.tests.helpers import ( select_option_by_text, get_selected_option_text ) diff --git a/common/test/acceptance/tests/studio/test_studio_library_container.py b/common/test/acceptance/tests/studio/test_studio_library_container.py index c62ed47494..27aa0ef850 100644 --- a/common/test/acceptance/tests/studio/test_studio_library_container.py +++ b/common/test/acceptance/tests/studio/test_studio_library_container.py @@ -5,12 +5,12 @@ import ddt from nose.plugins.attrib import attr import textwrap -from .base_studio_test import StudioLibraryTest -from ...fixtures.course import CourseFixture -from ..helpers import UniqueCourseTest, TestWithSearchIndexMixin -from ...pages.studio.library import StudioLibraryContentEditor, StudioLibraryContainerXBlockWrapper -from ...pages.studio.overview import CourseOutlinePage -from ...fixtures.course import XBlockFixtureDesc +from common.test.acceptance.tests.studio.base_studio_test import StudioLibraryTest +from common.test.acceptance.fixtures.course import CourseFixture +from common.test.acceptance.tests.helpers import UniqueCourseTest, TestWithSearchIndexMixin +from common.test.acceptance.pages.studio.library import StudioLibraryContentEditor, StudioLibraryContainerXBlockWrapper +from common.test.acceptance.pages.studio.overview import CourseOutlinePage +from common.test.acceptance.fixtures.course import XBlockFixtureDesc SECTION_NAME = 'Test Section' SUBSECTION_NAME = 'Test Subsection' diff --git a/common/test/acceptance/tests/studio/test_studio_settings_certificates.py b/common/test/acceptance/tests/studio/test_studio_settings_certificates.py index 9e6814e6f3..f56e75546e 100644 --- a/common/test/acceptance/tests/studio/test_studio_settings_certificates.py +++ b/common/test/acceptance/tests/studio/test_studio_settings_certificates.py @@ -6,11 +6,11 @@ import uuid from nose.plugins.attrib import attr -from .base_studio_test import StudioCourseTest -from ...pages.lms.create_mode import ModeCreationPage -from ...pages.studio.settings_certificates import CertificatesPage -from ...pages.studio.settings_advanced import AdvancedSettingsPage -from ..helpers import skip_if_browser +from common.test.acceptance.tests.studio.base_studio_test import StudioCourseTest +from common.test.acceptance.pages.lms.create_mode import ModeCreationPage +from common.test.acceptance.pages.studio.settings_certificates import CertificatesPage +from common.test.acceptance.pages.studio.settings_advanced import AdvancedSettingsPage +from common.test.acceptance.tests.helpers import skip_if_browser @attr('shard_8') 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 7ef047b48d..835ea93e94 100644 --- a/common/test/acceptance/tests/studio/test_studio_settings_details.py +++ b/common/test/acceptance/tests/studio/test_studio_settings_details.py @@ -6,12 +6,12 @@ from flaky import flaky from nose.plugins.attrib import attr from unittest import skip -from ...fixtures.config import ConfigModelFixture -from ...fixtures.course import CourseFixture -from ...pages.studio.settings import SettingsPage -from ...pages.studio.overview import CourseOutlinePage -from ...tests.studio.base_studio_test import StudioCourseTest -from ..helpers import ( +from common.test.acceptance.fixtures.config import ConfigModelFixture +from common.test.acceptance.fixtures.course import CourseFixture +from common.test.acceptance.pages.studio.settings import SettingsPage +from common.test.acceptance.pages.studio.overview import CourseOutlinePage +from common.test.acceptance.tests.studio.base_studio_test import StudioCourseTest +from common.test.acceptance.tests.helpers import ( generate_course_key, select_option_by_value, is_option_value_selected,