From 5d50e76eafeae06f33392291177683341b14bb54 Mon Sep 17 00:00:00 2001 From: Shauna Gordon-McKeon Date: Wed, 27 Jul 2016 16:26:58 -0400 Subject: [PATCH] Switch relative to absolute urls in imports (tests/studio part 2) --- .../tests/studio/test_studio_acid_xblock.py | 8 ++++---- .../tests/studio/test_studio_asset.py | 8 ++++---- .../tests/studio/test_studio_course_team.py | 8 ++++---- .../tests/studio/test_studio_help.py | 6 +++--- .../tests/studio/test_studio_library.py | 12 +++++------ .../tests/studio/test_studio_outline.py | 20 +++++++++---------- .../tests/studio/test_studio_rerun.py | 10 +++++----- .../tests/studio/test_studio_settings.py | 12 +++++------ .../tests/studio/test_studio_split_test.py | 18 ++++++++--------- .../tests/studio/test_studio_textbooks.py | 6 +++--- 10 files changed, 54 insertions(+), 54 deletions(-) diff --git a/common/test/acceptance/tests/studio/test_studio_acid_xblock.py b/common/test/acceptance/tests/studio/test_studio_acid_xblock.py index 2f6eb27065..0fce165b3c 100644 --- a/common/test/acceptance/tests/studio/test_studio_acid_xblock.py +++ b/common/test/acceptance/tests/studio/test_studio_acid_xblock.py @@ -3,10 +3,10 @@ Acceptance tests for Studio related to the acid xblock. """ from bok_choy.web_app_test import WebAppTest -from ...pages.studio.auto_auth import AutoAuthPage -from ...pages.studio.overview import CourseOutlinePage -from ...pages.xblock.acid import AcidView -from ...fixtures.course import CourseFixture, XBlockFixtureDesc +from common.test.acceptance.pages.studio.auto_auth import AutoAuthPage +from common.test.acceptance.pages.studio.overview import CourseOutlinePage +from common.test.acceptance.pages.xblock.acid import AcidView +from common.test.acceptance.fixtures.course import CourseFixture, XBlockFixtureDesc class XBlockAcidBase(WebAppTest): diff --git a/common/test/acceptance/tests/studio/test_studio_asset.py b/common/test/acceptance/tests/studio/test_studio_asset.py index 61403bd99f..4457ad5e85 100644 --- a/common/test/acceptance/tests/studio/test_studio_asset.py +++ b/common/test/acceptance/tests/studio/test_studio_asset.py @@ -5,11 +5,11 @@ Acceptance tests for Studio related to the asset index page. from flaky import flaky from unittest import skip -from ...pages.studio.asset_index import AssetIndexPage +from common.test.acceptance.pages.studio.asset_index import AssetIndexPage -from .base_studio_test import StudioCourseTest -from ...fixtures.base import StudioApiLoginError -from ..helpers import skip_if_browser +from common.test.acceptance.tests.studio.base_studio_test import StudioCourseTest +from common.test.acceptance.fixtures.base import StudioApiLoginError +from common.test.acceptance.tests.helpers import skip_if_browser @skip('FEDX-88') diff --git a/common/test/acceptance/tests/studio/test_studio_course_team.py b/common/test/acceptance/tests/studio/test_studio_course_team.py index 42580b00ae..9a76bdf8c8 100644 --- a/common/test/acceptance/tests/studio/test_studio_course_team.py +++ b/common/test/acceptance/tests/studio/test_studio_course_team.py @@ -3,11 +3,11 @@ Acceptance tests for course in studio """ from nose.plugins.attrib import attr -from .base_studio_test import StudioCourseTest -from ...pages.studio.auto_auth import AutoAuthPage +from common.test.acceptance.tests.studio.base_studio_test import StudioCourseTest +from common.test.acceptance.pages.studio.auto_auth import AutoAuthPage -from ...pages.studio.users import CourseTeamPage -from ...pages.studio.index import DashboardPage +from common.test.acceptance.pages.studio.users import CourseTeamPage +from common.test.acceptance.pages.studio.index import DashboardPage @attr('shard_2') diff --git a/common/test/acceptance/tests/studio/test_studio_help.py b/common/test/acceptance/tests/studio/test_studio_help.py index 799913cc7d..8cf7bb62da 100644 --- a/common/test/acceptance/tests/studio/test_studio_help.py +++ b/common/test/acceptance/tests/studio/test_studio_help.py @@ -4,9 +4,9 @@ Test the Studio help links. from flaky import flaky -from .base_studio_test import StudioCourseTest -from ...pages.studio.index import DashboardPage -from ...pages.studio.utils import click_studio_help, studio_help_links +from common.test.acceptance.tests.studio.base_studio_test import StudioCourseTest +from common.test.acceptance.pages.studio.index import DashboardPage +from common.test.acceptance.pages.studio.utils import click_studio_help, studio_help_links class StudioHelpTest(StudioCourseTest): diff --git a/common/test/acceptance/tests/studio/test_studio_library.py b/common/test/acceptance/tests/studio/test_studio_library.py index d6f012a8be..c6049c178d 100644 --- a/common/test/acceptance/tests/studio/test_studio_library.py +++ b/common/test/acceptance/tests/studio/test_studio_library.py @@ -5,12 +5,12 @@ from ddt import ddt, data from nose.plugins.attrib import attr from flaky import flaky -from .base_studio_test import StudioLibraryTest -from ...fixtures.course import XBlockFixtureDesc -from ...pages.studio.auto_auth import AutoAuthPage -from ...pages.studio.utils import add_component -from ...pages.studio.library import LibraryEditPage -from ...pages.studio.users import LibraryUsersPage +from common.test.acceptance.tests.studio.base_studio_test import StudioLibraryTest +from common.test.acceptance.fixtures.course import XBlockFixtureDesc +from common.test.acceptance.pages.studio.auto_auth import AutoAuthPage +from common.test.acceptance.pages.studio.utils import add_component +from common.test.acceptance.pages.studio.library import LibraryEditPage +from common.test.acceptance.pages.studio.users import LibraryUsersPage @attr('shard_2') diff --git a/common/test/acceptance/tests/studio/test_studio_outline.py b/common/test/acceptance/tests/studio/test_studio_outline.py index d7cd119d69..934311eece 100644 --- a/common/test/acceptance/tests/studio/test_studio_outline.py +++ b/common/test/acceptance/tests/studio/test_studio_outline.py @@ -8,18 +8,18 @@ from pytz import UTC from bok_choy.promise import EmptyPromise from nose.plugins.attrib import attr -from ...pages.studio.settings_advanced import AdvancedSettingsPage -from ...pages.studio.overview import CourseOutlinePage, ContainerPage, ExpandCollapseLinkState -from ...pages.studio.utils import add_discussion, drag, verify_ordering -from ...pages.lms.courseware import CoursewarePage -from ...pages.lms.course_nav import CourseNavPage -from ...pages.lms.staff_view import StaffPage -from ...fixtures.config import ConfigModelFixture -from ...fixtures.course import XBlockFixtureDesc +from common.test.acceptance.pages.studio.settings_advanced import AdvancedSettingsPage +from common.test.acceptance.pages.studio.overview import CourseOutlinePage, ContainerPage, ExpandCollapseLinkState +from common.test.acceptance.pages.studio.utils import add_discussion, drag, verify_ordering +from common.test.acceptance.pages.lms.courseware import CoursewarePage +from common.test.acceptance.pages.lms.course_nav import CourseNavPage +from common.test.acceptance.pages.lms.staff_view import StaffPage +from common.test.acceptance.fixtures.config import ConfigModelFixture +from common.test.acceptance.fixtures.course import XBlockFixtureDesc from base_studio_test import StudioCourseTest -from ..helpers import load_data_str -from ...pages.lms.progress import ProgressPage +from common.test.acceptance.tests.helpers import load_data_str +from common.test.acceptance.pages.lms.progress import ProgressPage SECTION_NAME = 'Test Section' diff --git a/common/test/acceptance/tests/studio/test_studio_rerun.py b/common/test/acceptance/tests/studio/test_studio_rerun.py index 858b056ec6..3ddbefbd62 100644 --- a/common/test/acceptance/tests/studio/test_studio_rerun.py +++ b/common/test/acceptance/tests/studio/test_studio_rerun.py @@ -6,11 +6,11 @@ import random from bok_choy.promise import EmptyPromise from nose.tools import assert_in -from ...pages.studio.index import DashboardPage -from ...pages.studio.course_rerun import CourseRerunPage -from ...pages.studio.overview import CourseOutlinePage -from ...pages.lms.courseware import CoursewarePage -from ...fixtures.course import XBlockFixtureDesc +from common.test.acceptance.pages.studio.index import DashboardPage +from common.test.acceptance.pages.studio.course_rerun import CourseRerunPage +from common.test.acceptance.pages.studio.overview import CourseOutlinePage +from common.test.acceptance.pages.lms.courseware import CoursewarePage +from common.test.acceptance.fixtures.course import XBlockFixtureDesc from base_studio_test import StudioCourseTest diff --git a/common/test/acceptance/tests/studio/test_studio_settings.py b/common/test/acceptance/tests/studio/test_studio_settings.py index 1c738eb4e1..b0dd155311 100644 --- a/common/test/acceptance/tests/studio/test_studio_settings.py +++ b/common/test/acceptance/tests/studio/test_studio_settings.py @@ -10,13 +10,13 @@ from nose.plugins.attrib import attr from base_studio_test import StudioCourseTest from bok_choy.promise import EmptyPromise -from ...fixtures.course import XBlockFixtureDesc +from common.test.acceptance.fixtures.course import XBlockFixtureDesc from common.test.acceptance.tests.helpers import create_user_partition_json, element_has_text -from ...pages.studio.overview import CourseOutlinePage -from ...pages.studio.settings import SettingsPage -from ...pages.studio.settings_advanced import AdvancedSettingsPage -from ...pages.studio.settings_group_configurations import GroupConfigurationsPage -from ...pages.lms.courseware import CoursewarePage +from common.test.acceptance.pages.studio.overview import CourseOutlinePage +from common.test.acceptance.pages.studio.settings import SettingsPage +from common.test.acceptance.pages.studio.settings_advanced import AdvancedSettingsPage +from common.test.acceptance.pages.studio.settings_group_configurations import GroupConfigurationsPage +from common.test.acceptance.pages.lms.courseware import CoursewarePage from common.test.acceptance.pages.studio.utils import get_input_value from textwrap import dedent from xmodule.partitions.partitions import Group diff --git a/common/test/acceptance/tests/studio/test_studio_split_test.py b/common/test/acceptance/tests/studio/test_studio_split_test.py index 7c5ca25773..137dcb1dc2 100644 --- a/common/test/acceptance/tests/studio/test_studio_split_test.py +++ b/common/test/acceptance/tests/studio/test_studio_split_test.py @@ -10,15 +10,15 @@ from selenium.webdriver.support.ui import Select from xmodule.partitions.partitions import Group from bok_choy.promise import Promise, EmptyPromise -from ...fixtures.course import XBlockFixtureDesc -from ...pages.studio.component_editor import ComponentEditorView -from ...pages.studio.overview import CourseOutlinePage, CourseOutlineUnit -from ...pages.studio.container import ContainerPage -from ...pages.studio.settings_group_configurations import GroupConfigurationsPage -from ...pages.studio.utils import add_advanced_component -from ...pages.xblock.utils import wait_for_xblock_initialization -from ...pages.lms.courseware import CoursewarePage -from ..helpers import create_user_partition_json +from common.test.acceptance.fixtures.course import XBlockFixtureDesc +from common.test.acceptance.pages.studio.component_editor import ComponentEditorView +from common.test.acceptance.pages.studio.overview import CourseOutlinePage, CourseOutlineUnit +from common.test.acceptance.pages.studio.container import ContainerPage +from common.test.acceptance.pages.studio.settings_group_configurations import GroupConfigurationsPage +from common.test.acceptance.pages.studio.utils import add_advanced_component +from common.test.acceptance.pages.xblock.utils import wait_for_xblock_initialization +from common.test.acceptance.pages.lms.courseware import CoursewarePage +from common.test.acceptance.tests.helpers import create_user_partition_json from base_studio_test import StudioCourseTest diff --git a/common/test/acceptance/tests/studio/test_studio_textbooks.py b/common/test/acceptance/tests/studio/test_studio_textbooks.py index 9c90200282..2d95277638 100644 --- a/common/test/acceptance/tests/studio/test_studio_textbooks.py +++ b/common/test/acceptance/tests/studio/test_studio_textbooks.py @@ -2,9 +2,9 @@ Acceptance tests for Studio related to the textbooks. """ from common.test.acceptance.tests.studio.base_studio_test import StudioCourseTest -from ...pages.studio.textbook_upload import TextbookUploadPage -from ...pages.lms.textbook_view import TextbookViewPage -from ...tests.helpers import disable_animations +from common.test.acceptance.pages.studio.textbook_upload import TextbookUploadPage +from common.test.acceptance.pages.lms.textbook_view import TextbookViewPage +from common.test.acceptance.tests.helpers import disable_animations from nose.plugins.attrib import attr