From 89ed6f1c2ba50bfb7a789d9355d9d8d89bb82279 Mon Sep 17 00:00:00 2001 From: Shauna Gordon-McKeon Date: Thu, 28 Jul 2016 10:26:41 -0400 Subject: [PATCH] Switch relative to absolute urls in imports (tests/lms part 1) --- .../tests/lms/test_account_settings.py | 8 ++-- .../acceptance/tests/lms/test_bookmarks.py | 20 +++++----- .../tests/lms/test_certificate_web_view.py | 18 ++++----- .../acceptance/tests/lms/test_conditional.py | 12 +++--- .../tests/lms/test_learner_profile.py | 12 +++--- .../test/acceptance/tests/lms/test_library.py | 18 ++++----- common/test/acceptance/tests/lms/test_lms.py | 40 +++++++++---------- .../tests/lms/test_lms_acid_xblock.py | 12 +++--- .../test_lms_cohorted_courseware_search.py | 24 +++++------ .../tests/lms/test_lms_course_discovery.py | 10 ++--- .../tests/lms/test_lms_courseware.py | 26 ++++++------ .../tests/lms/test_lms_courseware_search.py | 18 ++++----- 12 files changed, 109 insertions(+), 109 deletions(-) diff --git a/common/test/acceptance/tests/lms/test_account_settings.py b/common/test/acceptance/tests/lms/test_account_settings.py index 39984ce4e1..9ffadd658c 100644 --- a/common/test/acceptance/tests/lms/test_account_settings.py +++ b/common/test/acceptance/tests/lms/test_account_settings.py @@ -10,11 +10,11 @@ from bok_choy.page_object import XSS_INJECTION from datetime import datetime from pytz import timezone, utc -from ...pages.lms.account_settings import AccountSettingsPage -from ...pages.lms.auto_auth import AutoAuthPage -from ...pages.lms.dashboard import DashboardPage +from common.test.acceptance.pages.lms.account_settings import AccountSettingsPage +from common.test.acceptance.pages.lms.auto_auth import AutoAuthPage +from common.test.acceptance.pages.lms.dashboard import DashboardPage -from ..helpers import EventsTestMixin +from common.test.acceptance.tests.helpers import EventsTestMixin class AccountSettingsTestMixin(EventsTestMixin, WebAppTest): diff --git a/common/test/acceptance/tests/lms/test_bookmarks.py b/common/test/acceptance/tests/lms/test_bookmarks.py index bcc46458ad..ef36dddd97 100644 --- a/common/test/acceptance/tests/lms/test_bookmarks.py +++ b/common/test/acceptance/tests/lms/test_bookmarks.py @@ -5,17 +5,17 @@ End-to-end tests for the courseware unit bookmarks. import json from nose.plugins.attrib import attr import requests -from ...pages.studio.auto_auth import AutoAuthPage as StudioAutoAuthPage -from ...pages.lms.auto_auth import AutoAuthPage as LmsAutoAuthPage -from ...pages.lms.bookmarks import BookmarksPage -from ...pages.lms.courseware import CoursewarePage -from ...pages.lms.course_nav import CourseNavPage -from ...pages.studio.overview import CourseOutlinePage -from ...pages.common.logout import LogoutPage -from ...pages.common import BASE_URL +from common.test.acceptance.pages.studio.auto_auth import AutoAuthPage as StudioAutoAuthPage +from common.test.acceptance.pages.lms.auto_auth import AutoAuthPage as LmsAutoAuthPage +from common.test.acceptance.pages.lms.bookmarks import BookmarksPage +from common.test.acceptance.pages.lms.courseware import CoursewarePage +from common.test.acceptance.pages.lms.course_nav import CourseNavPage +from common.test.acceptance.pages.studio.overview import CourseOutlinePage +from common.test.acceptance.pages.common.logout import LogoutPage +from common.test.acceptance.pages.common import BASE_URL -from ...fixtures.course import CourseFixture, XBlockFixtureDesc -from ..helpers import EventsTestMixin, UniqueCourseTest, is_404_page +from common.test.acceptance.fixtures.course import CourseFixture, XBlockFixtureDesc +from common.test.acceptance.tests.helpers import EventsTestMixin, UniqueCourseTest, is_404_page class BookmarksTestMixin(EventsTestMixin, UniqueCourseTest): diff --git a/common/test/acceptance/tests/lms/test_certificate_web_view.py b/common/test/acceptance/tests/lms/test_certificate_web_view.py index 4cd964d890..deb07e623f 100644 --- a/common/test/acceptance/tests/lms/test_certificate_web_view.py +++ b/common/test/acceptance/tests/lms/test_certificate_web_view.py @@ -1,16 +1,16 @@ """ Acceptance tests for the certificate web view feature. """ -from ..helpers import UniqueCourseTest, EventsTestMixin, load_data_str, get_element_padding +from common.test.acceptance.tests.helpers import UniqueCourseTest, EventsTestMixin, load_data_str, get_element_padding from nose.plugins.attrib import attr -from ...fixtures.course import CourseFixture, XBlockFixtureDesc, CourseUpdateDesc -from ...fixtures.certificates import CertificateConfigFixture -from ...pages.lms.auto_auth import AutoAuthPage -from ...pages.lms.certificate_page import CertificatePage -from ...pages.lms.course_info import CourseInfoPage -from ...pages.lms.tab_nav import TabNavPage -from ...pages.lms.course_nav import CourseNavPage -from ...pages.lms.progress import ProgressPage +from common.test.acceptance.fixtures.course import CourseFixture, XBlockFixtureDesc, CourseUpdateDesc +from common.test.acceptance.fixtures.certificates import CertificateConfigFixture +from common.test.acceptance.pages.lms.auto_auth import AutoAuthPage +from common.test.acceptance.pages.lms.certificate_page import CertificatePage +from common.test.acceptance.pages.lms.course_info import CourseInfoPage +from common.test.acceptance.pages.lms.tab_nav import TabNavPage +from common.test.acceptance.pages.lms.course_nav import CourseNavPage +from common.test.acceptance.pages.lms.progress import ProgressPage @attr('shard_5') diff --git a/common/test/acceptance/tests/lms/test_conditional.py b/common/test/acceptance/tests/lms/test_conditional.py index 7d02665248..3b7cf2afe2 100644 --- a/common/test/acceptance/tests/lms/test_conditional.py +++ b/common/test/acceptance/tests/lms/test_conditional.py @@ -2,12 +2,12 @@ Bok choy acceptance tests for conditionals in the LMS """ from capa.tests.response_xml_factory import StringResponseXMLFactory -from ..helpers import UniqueCourseTest -from ...fixtures.course import CourseFixture, XBlockFixtureDesc -from ...pages.lms.courseware import CoursewarePage -from ...pages.lms.conditional import ConditionalPage, POLL_ANSWER -from ...pages.lms.problem import ProblemPage -from ...pages.studio.auto_auth import AutoAuthPage +from common.test.acceptance.tests.helpers import UniqueCourseTest +from common.test.acceptance.fixtures.course import CourseFixture, XBlockFixtureDesc +from common.test.acceptance.pages.lms.courseware import CoursewarePage +from common.test.acceptance.pages.lms.conditional import ConditionalPage, POLL_ANSWER +from common.test.acceptance.pages.lms.problem import ProblemPage +from common.test.acceptance.pages.studio.auto_auth import AutoAuthPage class ConditionalTest(UniqueCourseTest): diff --git a/common/test/acceptance/tests/lms/test_learner_profile.py b/common/test/acceptance/tests/lms/test_learner_profile.py index 98860ea92b..9699c223db 100644 --- a/common/test/acceptance/tests/lms/test_learner_profile.py +++ b/common/test/acceptance/tests/lms/test_learner_profile.py @@ -9,13 +9,13 @@ from datetime import datetime from flaky import flaky from nose.plugins.attrib import attr -from ...pages.common.logout import LogoutPage -from ...pages.lms.account_settings import AccountSettingsPage -from ...pages.lms.auto_auth import AutoAuthPage -from ...pages.lms.learner_profile import LearnerProfilePage -from ...pages.lms.dashboard import DashboardPage +from common.test.acceptance.pages.common.logout import LogoutPage +from common.test.acceptance.pages.lms.account_settings import AccountSettingsPage +from common.test.acceptance.pages.lms.auto_auth import AutoAuthPage +from common.test.acceptance.pages.lms.learner_profile import LearnerProfilePage +from common.test.acceptance.pages.lms.dashboard import DashboardPage -from ..helpers import EventsTestMixin +from common.test.acceptance.tests.helpers import EventsTestMixin class LearnerProfileTestMixin(EventsTestMixin): diff --git a/common/test/acceptance/tests/lms/test_library.py b/common/test/acceptance/tests/lms/test_library.py index 8b8dd1da31..7904a21fca 100644 --- a/common/test/acceptance/tests/lms/test_library.py +++ b/common/test/acceptance/tests/lms/test_library.py @@ -6,15 +6,15 @@ import ddt import textwrap from nose.plugins.attrib import attr -from ..helpers import UniqueCourseTest, TestWithSearchIndexMixin -from ...pages.studio.auto_auth import AutoAuthPage -from ...pages.studio.overview import CourseOutlinePage -from ...pages.studio.library import StudioLibraryContentEditor, StudioLibraryContainerXBlockWrapper -from ...pages.lms.courseware import CoursewarePage -from ...pages.lms.library import LibraryContentXBlockWrapper -from ...pages.common.logout import LogoutPage -from ...fixtures.course import CourseFixture, XBlockFixtureDesc -from ...fixtures.library import LibraryFixture +from common.test.acceptance.tests.helpers import UniqueCourseTest, TestWithSearchIndexMixin +from common.test.acceptance.pages.studio.auto_auth import AutoAuthPage +from common.test.acceptance.pages.studio.overview import CourseOutlinePage +from common.test.acceptance.pages.studio.library import StudioLibraryContentEditor, StudioLibraryContainerXBlockWrapper +from common.test.acceptance.pages.lms.courseware import CoursewarePage +from common.test.acceptance.pages.lms.library import LibraryContentXBlockWrapper +from common.test.acceptance.pages.common.logout import LogoutPage +from common.test.acceptance.fixtures.course import CourseFixture, XBlockFixtureDesc +from common.test.acceptance.fixtures.library import LibraryFixture SECTION_NAME = 'Test Section' SUBSECTION_NAME = 'Test Subsection' diff --git a/common/test/acceptance/tests/lms/test_lms.py b/common/test/acceptance/tests/lms/test_lms.py index e71b752456..224b9fc9dc 100644 --- a/common/test/acceptance/tests/lms/test_lms.py +++ b/common/test/acceptance/tests/lms/test_lms.py @@ -11,7 +11,7 @@ import pytz import urllib from bok_choy.promise import EmptyPromise -from ..helpers import ( +from common.test.acceptance.tests.helpers import ( UniqueCourseTest, EventsTestMixin, load_data_str, @@ -21,25 +21,25 @@ from ..helpers import ( select_option_by_text, get_selected_option_text ) -from ...pages.lms import BASE_URL -from ...pages.lms.account_settings import AccountSettingsPage -from ...pages.lms.auto_auth import AutoAuthPage -from ...pages.lms.create_mode import ModeCreationPage -from ...pages.common.logout import LogoutPage -from ...pages.lms.course_info import CourseInfoPage -from ...pages.lms.tab_nav import TabNavPage -from ...pages.lms.course_nav import CourseNavPage -from ...pages.lms.progress import ProgressPage -from ...pages.lms.dashboard import DashboardPage -from ...pages.lms.problem import ProblemPage -from ...pages.lms.video.video import VideoPage -from ...pages.lms.courseware import CoursewarePage -from ...pages.studio.settings import SettingsPage -from ...pages.lms.login_and_register import CombinedLoginAndRegisterPage, ResetPasswordPage -from ...pages.lms.track_selection import TrackSelectionPage -from ...pages.lms.pay_and_verify import PaymentAndVerificationFlow, FakePaymentPage -from ...pages.lms.course_wiki import CourseWikiPage, CourseWikiEditPage -from ...fixtures.course import CourseFixture, XBlockFixtureDesc, CourseUpdateDesc +from common.test.acceptance.pages.lms import BASE_URL +from common.test.acceptance.pages.lms.account_settings import AccountSettingsPage +from common.test.acceptance.pages.lms.auto_auth import AutoAuthPage +from common.test.acceptance.pages.lms.create_mode import ModeCreationPage +from common.test.acceptance.pages.common.logout import LogoutPage +from common.test.acceptance.pages.lms.course_info import CourseInfoPage +from common.test.acceptance.pages.lms.tab_nav import TabNavPage +from common.test.acceptance.pages.lms.course_nav import CourseNavPage +from common.test.acceptance.pages.lms.progress import ProgressPage +from common.test.acceptance.pages.lms.dashboard import DashboardPage +from common.test.acceptance.pages.lms.problem import ProblemPage +from common.test.acceptance.pages.lms.video.video import VideoPage +from common.test.acceptance.pages.lms.courseware import CoursewarePage +from common.test.acceptance.pages.studio.settings import SettingsPage +from common.test.acceptance.pages.lms.login_and_register import CombinedLoginAndRegisterPage, ResetPasswordPage +from common.test.acceptance.pages.lms.track_selection import TrackSelectionPage +from common.test.acceptance.pages.lms.pay_and_verify import PaymentAndVerificationFlow, FakePaymentPage +from common.test.acceptance.pages.lms.course_wiki import CourseWikiPage, CourseWikiEditPage +from common.test.acceptance.fixtures.course import CourseFixture, XBlockFixtureDesc, CourseUpdateDesc @attr('shard_8') diff --git a/common/test/acceptance/tests/lms/test_lms_acid_xblock.py b/common/test/acceptance/tests/lms/test_lms_acid_xblock.py index 13ffbb9fa8..1179a645d5 100644 --- a/common/test/acceptance/tests/lms/test_lms_acid_xblock.py +++ b/common/test/acceptance/tests/lms/test_lms_acid_xblock.py @@ -5,12 +5,12 @@ End-to-end tests for the LMS. from unittest import expectedFailure -from ..helpers import UniqueCourseTest -from ...pages.lms.auto_auth import AutoAuthPage -from ...pages.lms.course_info import CourseInfoPage -from ...pages.lms.tab_nav import TabNavPage -from ...pages.xblock.acid import AcidView -from ...fixtures.course import CourseFixture, XBlockFixtureDesc +from common.test.acceptance.tests.helpers import UniqueCourseTest +from common.test.acceptance.pages.lms.auto_auth import AutoAuthPage +from common.test.acceptance.pages.lms.course_info import CourseInfoPage +from common.test.acceptance.pages.lms.tab_nav import TabNavPage +from common.test.acceptance.pages.xblock.acid import AcidView +from common.test.acceptance.fixtures.course import CourseFixture, XBlockFixtureDesc class XBlockAcidBase(UniqueCourseTest): diff --git a/common/test/acceptance/tests/lms/test_lms_cohorted_courseware_search.py b/common/test/acceptance/tests/lms/test_lms_cohorted_courseware_search.py index 2f129b70bf..f4c27c44fe 100644 --- a/common/test/acceptance/tests/lms/test_lms_cohorted_courseware_search.py +++ b/common/test/acceptance/tests/lms/test_lms_cohorted_courseware_search.py @@ -5,22 +5,22 @@ Test courseware search import json import uuid -from ..helpers import remove_file -from ...pages.common.logout import LogoutPage -from ...pages.studio.overview import CourseOutlinePage -from ...pages.lms.courseware_search import CoursewareSearchPage -from ...pages.lms.staff_view import StaffPage -from ...fixtures.course import XBlockFixtureDesc +from common.test.acceptance.tests.helpers import remove_file +from common.test.acceptance.pages.common.logout import LogoutPage +from common.test.acceptance.pages.studio.overview import CourseOutlinePage +from common.test.acceptance.pages.lms.courseware_search import CoursewareSearchPage +from common.test.acceptance.pages.lms.staff_view import StaffPage +from common.test.acceptance.fixtures.course import XBlockFixtureDesc from nose.plugins.attrib import attr -from ..studio.base_studio_test import ContainerBase +from common.test.acceptance.tests.studio.base_studio_test import ContainerBase -from ...pages.studio.settings_group_configurations import GroupConfigurationsPage -from ...pages.studio.auto_auth import AutoAuthPage as StudioAutoAuthPage -from ...fixtures import LMS_BASE_URL -from ...pages.studio.component_editor import ComponentVisibilityEditorView -from ...pages.lms.instructor_dashboard import InstructorDashboardPage +from common.test.acceptance.pages.studio.settings_group_configurations import GroupConfigurationsPage +from common.test.acceptance.pages.studio.auto_auth import AutoAuthPage as StudioAutoAuthPage +from common.test.acceptance.fixtures import LMS_BASE_URL +from common.test.acceptance.pages.studio.component_editor import ComponentVisibilityEditorView +from common.test.acceptance.pages.lms.instructor_dashboard import InstructorDashboardPage from bok_choy.promise import EmptyPromise diff --git a/common/test/acceptance/tests/lms/test_lms_course_discovery.py b/common/test/acceptance/tests/lms/test_lms_course_discovery.py index 9f232f35fe..1bbc1e9ce3 100644 --- a/common/test/acceptance/tests/lms/test_lms_course_discovery.py +++ b/common/test/acceptance/tests/lms/test_lms_course_discovery.py @@ -6,11 +6,11 @@ import json import uuid from bok_choy.web_app_test import WebAppTest -from ..helpers import remove_file -from ...pages.common.logout import LogoutPage -from ...pages.studio.auto_auth import AutoAuthPage -from ...pages.lms.discovery import CourseDiscoveryPage -from ...fixtures.course import CourseFixture +from common.test.acceptance.tests.helpers import remove_file +from common.test.acceptance.pages.common.logout import LogoutPage +from common.test.acceptance.pages.studio.auto_auth import AutoAuthPage +from common.test.acceptance.pages.lms.discovery import CourseDiscoveryPage +from common.test.acceptance.fixtures.course import CourseFixture class CourseDiscoveryTest(WebAppTest): diff --git a/common/test/acceptance/tests/lms/test_lms_courseware.py b/common/test/acceptance/tests/lms/test_lms_courseware.py index 1fe74e5771..1e57302cb7 100644 --- a/common/test/acceptance/tests/lms/test_lms_courseware.py +++ b/common/test/acceptance/tests/lms/test_lms_courseware.py @@ -9,19 +9,19 @@ from datetime import datetime, timedelta import ddt from capa.tests.response_xml_factory import MultipleChoiceResponseXMLFactory -from ..helpers import UniqueCourseTest, EventsTestMixin -from ...pages.studio.auto_auth import AutoAuthPage -from ...pages.lms.create_mode import ModeCreationPage -from ...pages.studio.overview import CourseOutlinePage -from ...pages.lms.courseware import CoursewarePage, CoursewareSequentialTabPage -from ...pages.lms.course_nav import CourseNavPage -from ...pages.lms.problem import ProblemPage -from ...pages.common.logout import LogoutPage -from ...pages.lms.staff_view import StaffPage -from ...pages.lms.track_selection import TrackSelectionPage -from ...pages.lms.pay_and_verify import PaymentAndVerificationFlow, FakePaymentPage -from ...pages.lms.dashboard import DashboardPage -from ...fixtures.course import CourseFixture, XBlockFixtureDesc +from common.test.acceptance.tests.helpers import UniqueCourseTest, EventsTestMixin +from common.test.acceptance.pages.studio.auto_auth import AutoAuthPage +from common.test.acceptance.pages.lms.create_mode import ModeCreationPage +from common.test.acceptance.pages.studio.overview import CourseOutlinePage +from common.test.acceptance.pages.lms.courseware import CoursewarePage, CoursewareSequentialTabPage +from common.test.acceptance.pages.lms.course_nav import CourseNavPage +from common.test.acceptance.pages.lms.problem import ProblemPage +from common.test.acceptance.pages.common.logout import LogoutPage +from common.test.acceptance.pages.lms.staff_view import StaffPage +from common.test.acceptance.pages.lms.track_selection import TrackSelectionPage +from common.test.acceptance.pages.lms.pay_and_verify import PaymentAndVerificationFlow, FakePaymentPage +from common.test.acceptance.pages.lms.dashboard import DashboardPage +from common.test.acceptance.fixtures.course import CourseFixture, XBlockFixtureDesc class CoursewareTest(UniqueCourseTest): diff --git a/common/test/acceptance/tests/lms/test_lms_courseware_search.py b/common/test/acceptance/tests/lms/test_lms_courseware_search.py index bc29f3cda1..e566ed44fa 100644 --- a/common/test/acceptance/tests/lms/test_lms_courseware_search.py +++ b/common/test/acceptance/tests/lms/test_lms_courseware_search.py @@ -5,15 +5,15 @@ import json from nose.plugins.attrib import attr -from ..helpers import UniqueCourseTest, remove_file -from ...pages.common.logout import LogoutPage -from ...pages.common.utils import click_css -from ...pages.studio.utils import add_html_component, type_in_codemirror -from ...pages.studio.auto_auth import AutoAuthPage -from ...pages.studio.overview import CourseOutlinePage -from ...pages.studio.container import ContainerPage -from ...pages.lms.courseware_search import CoursewareSearchPage -from ...fixtures.course import CourseFixture, XBlockFixtureDesc +from common.test.acceptance.tests.helpers import UniqueCourseTest, remove_file +from common.test.acceptance.pages.common.logout import LogoutPage +from common.test.acceptance.pages.common.utils import click_css +from common.test.acceptance.pages.studio.utils import add_html_component, type_in_codemirror +from common.test.acceptance.pages.studio.auto_auth import AutoAuthPage +from common.test.acceptance.pages.studio.overview import CourseOutlinePage +from common.test.acceptance.pages.studio.container import ContainerPage +from common.test.acceptance.pages.lms.courseware_search import CoursewareSearchPage +from common.test.acceptance.fixtures.course import CourseFixture, XBlockFixtureDesc @attr('shard_5')