From 12a619318e61a450a2fcfda56708fd3f4bf6f2a2 Mon Sep 17 00:00:00 2001 From: Shauna Gordon-McKeon Date: Thu, 28 Jul 2016 10:26:46 -0400 Subject: [PATCH] Switch relative to absolute urls in imports (tests/lms part 2) --- .../tests/lms/test_lms_dashboard.py | 8 +++--- .../tests/lms/test_lms_dashboard_search.py | 18 ++++++------ .../acceptance/tests/lms/test_lms_edxnotes.py | 14 +++++----- .../tests/lms/test_lms_entrance_exams.py | 10 +++---- .../acceptance/tests/lms/test_lms_gating.py | 16 +++++------ .../acceptance/tests/lms/test_lms_index.py | 2 +- .../lms/test_lms_instructor_dashboard.py | 28 +++++++++---------- .../tests/lms/test_lms_matlab_problem.py | 8 +++--- .../acceptance/tests/lms/test_lms_problems.py | 14 +++++----- .../test_lms_split_test_courseware_search.py | 18 ++++++------ .../tests/lms/test_lms_user_preview.py | 12 ++++---- .../acceptance/tests/lms/test_programs.py | 12 ++++---- 12 files changed, 80 insertions(+), 80 deletions(-) diff --git a/common/test/acceptance/tests/lms/test_lms_dashboard.py b/common/test/acceptance/tests/lms/test_lms_dashboard.py index 91ed2c6b1e..63788ccb27 100644 --- a/common/test/acceptance/tests/lms/test_lms_dashboard.py +++ b/common/test/acceptance/tests/lms/test_lms_dashboard.py @@ -5,10 +5,10 @@ End-to-end tests for the main LMS Dashboard (aka, Student Dashboard). import datetime from nose.plugins.attrib import attr -from ..helpers import UniqueCourseTest, generate_course_key -from ...fixtures.course import CourseFixture -from ...pages.lms.auto_auth import AutoAuthPage -from ...pages.lms.dashboard import DashboardPage +from common.test.acceptance.tests.helpers import UniqueCourseTest, generate_course_key +from common.test.acceptance.fixtures.course import CourseFixture +from common.test.acceptance.pages.lms.auto_auth import AutoAuthPage +from common.test.acceptance.pages.lms.dashboard import DashboardPage DEFAULT_SHORT_DATE_FORMAT = "%b %d, %Y" DEFAULT_DAY_AND_TIME_FORMAT = "%A at %-I%P" diff --git a/common/test/acceptance/tests/lms/test_lms_dashboard_search.py b/common/test/acceptance/tests/lms/test_lms_dashboard_search.py index fa13aeb8aa..bfe3e43102 100644 --- a/common/test/acceptance/tests/lms/test_lms_dashboard_search.py +++ b/common/test/acceptance/tests/lms/test_lms_dashboard_search.py @@ -5,15 +5,15 @@ import os import json from bok_choy.web_app_test import WebAppTest -from ..helpers import generate_course_key -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.dashboard_search import DashboardSearchPage -from ...fixtures.course import CourseFixture, XBlockFixtureDesc +from common.test.acceptance.tests.helpers import generate_course_key +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.dashboard_search import DashboardSearchPage +from common.test.acceptance.fixtures.course import CourseFixture, XBlockFixtureDesc class DashboardSearchTest(WebAppTest): diff --git a/common/test/acceptance/tests/lms/test_lms_edxnotes.py b/common/test/acceptance/tests/lms/test_lms_edxnotes.py index 64e6a3bf2a..03eb10862e 100644 --- a/common/test/acceptance/tests/lms/test_lms_edxnotes.py +++ b/common/test/acceptance/tests/lms/test_lms_edxnotes.py @@ -6,13 +6,13 @@ import random from uuid import uuid4 from datetime import datetime from nose.plugins.attrib import attr -from ..helpers import UniqueCourseTest, EventsTestMixin -from ...fixtures.course import CourseFixture, XBlockFixtureDesc -from ...pages.lms.auto_auth import AutoAuthPage -from ...pages.lms.course_nav import CourseNavPage -from ...pages.lms.courseware import CoursewarePage -from ...pages.lms.edxnotes import EdxNotesUnitPage, EdxNotesPage, EdxNotesPageNoContent -from ...fixtures.edxnotes import EdxNotesFixture, Note, Range +from common.test.acceptance.tests.helpers import UniqueCourseTest, EventsTestMixin +from common.test.acceptance.fixtures.course import CourseFixture, XBlockFixtureDesc +from common.test.acceptance.pages.lms.auto_auth import AutoAuthPage +from common.test.acceptance.pages.lms.course_nav import CourseNavPage +from common.test.acceptance.pages.lms.courseware import CoursewarePage +from common.test.acceptance.pages.lms.edxnotes import EdxNotesUnitPage, EdxNotesPage, EdxNotesPageNoContent +from common.test.acceptance.fixtures.edxnotes import EdxNotesFixture, Note, Range from flaky import flaky diff --git a/common/test/acceptance/tests/lms/test_lms_entrance_exams.py b/common/test/acceptance/tests/lms/test_lms_entrance_exams.py index b598e60267..f98b566b0d 100644 --- a/common/test/acceptance/tests/lms/test_lms_entrance_exams.py +++ b/common/test/acceptance/tests/lms/test_lms_entrance_exams.py @@ -4,11 +4,11 @@ Bok choy acceptance tests for Entrance exams in the LMS """ from textwrap import dedent -from ..helpers import UniqueCourseTest -from ...pages.studio.auto_auth import AutoAuthPage -from ...pages.lms.courseware import CoursewarePage -from ...pages.lms.problem import ProblemPage -from ...fixtures.course import CourseFixture, XBlockFixtureDesc +from common.test.acceptance.tests.helpers import UniqueCourseTest +from common.test.acceptance.pages.studio.auto_auth import AutoAuthPage +from common.test.acceptance.pages.lms.courseware import CoursewarePage +from common.test.acceptance.pages.lms.problem import ProblemPage +from common.test.acceptance.fixtures.course import CourseFixture, XBlockFixtureDesc class EntranceExamTest(UniqueCourseTest): diff --git a/common/test/acceptance/tests/lms/test_lms_gating.py b/common/test/acceptance/tests/lms/test_lms_gating.py index 32365d31cf..bad8fd4c15 100644 --- a/common/test/acceptance/tests/lms/test_lms_gating.py +++ b/common/test/acceptance/tests/lms/test_lms_gating.py @@ -4,14 +4,14 @@ End-to-end tests for the gating feature. """ from textwrap import dedent -from ..helpers import UniqueCourseTest -from ...pages.studio.auto_auth import AutoAuthPage -from ...pages.studio.overview import CourseOutlinePage -from ...pages.lms.courseware import CoursewarePage -from ...pages.lms.problem import ProblemPage -from ...pages.lms.staff_view import StaffPage -from ...pages.common.logout import LogoutPage -from ...fixtures.course import CourseFixture, XBlockFixtureDesc +from common.test.acceptance.tests.helpers import UniqueCourseTest +from common.test.acceptance.pages.studio.auto_auth import AutoAuthPage +from common.test.acceptance.pages.studio.overview import CourseOutlinePage +from common.test.acceptance.pages.lms.courseware import CoursewarePage +from common.test.acceptance.pages.lms.problem import ProblemPage +from common.test.acceptance.pages.lms.staff_view import StaffPage +from common.test.acceptance.pages.common.logout import LogoutPage +from common.test.acceptance.fixtures.course import CourseFixture, XBlockFixtureDesc class GatingTest(UniqueCourseTest): diff --git a/common/test/acceptance/tests/lms/test_lms_index.py b/common/test/acceptance/tests/lms/test_lms_index.py index a0269ff334..be0a4f4681 100644 --- a/common/test/acceptance/tests/lms/test_lms_index.py +++ b/common/test/acceptance/tests/lms/test_lms_index.py @@ -6,7 +6,7 @@ what students see @ edx.org because we redirect requests to a separate web appli import datetime from bok_choy.web_app_test import WebAppTest -from ...pages.lms.index import IndexPage +from common.test.acceptance.pages.lms.index import IndexPage class BaseLmsIndexTest(WebAppTest): diff --git a/common/test/acceptance/tests/lms/test_lms_instructor_dashboard.py b/common/test/acceptance/tests/lms/test_lms_instructor_dashboard.py index 375d729e1b..77b9840c12 100644 --- a/common/test/acceptance/tests/lms/test_lms_instructor_dashboard.py +++ b/common/test/acceptance/tests/lms/test_lms_instructor_dashboard.py @@ -8,21 +8,21 @@ import ddt from nose.plugins.attrib import attr from bok_choy.promise import EmptyPromise -from ..helpers import UniqueCourseTest, get_modal_alert, EventsTestMixin -from ...pages.common.logout import LogoutPage -from ...pages.lms.auto_auth import AutoAuthPage -from ...pages.studio.overview import CourseOutlinePage -from ...pages.lms.create_mode import ModeCreationPage -from ...pages.lms.courseware import CoursewarePage -from ...pages.lms.instructor_dashboard import InstructorDashboardPage -from ...fixtures.course import CourseFixture, XBlockFixtureDesc -from ...pages.lms.dashboard import DashboardPage -from ...pages.lms.problem import ProblemPage -from ...pages.lms.track_selection import TrackSelectionPage -from ...pages.lms.pay_and_verify import PaymentAndVerificationFlow, FakePaymentPage -from ...pages.lms.login_and_register import CombinedLoginAndRegisterPage +from common.test.acceptance.tests.helpers import UniqueCourseTest, get_modal_alert, EventsTestMixin +from common.test.acceptance.pages.common.logout import LogoutPage +from common.test.acceptance.pages.lms.auto_auth import AutoAuthPage +from common.test.acceptance.pages.studio.overview import CourseOutlinePage +from common.test.acceptance.pages.lms.create_mode import ModeCreationPage +from common.test.acceptance.pages.lms.courseware import CoursewarePage +from common.test.acceptance.pages.lms.instructor_dashboard import InstructorDashboardPage +from common.test.acceptance.fixtures.course import CourseFixture, XBlockFixtureDesc +from common.test.acceptance.pages.lms.dashboard import DashboardPage +from common.test.acceptance.pages.lms.problem import ProblemPage +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.login_and_register import CombinedLoginAndRegisterPage from common.test.acceptance.tests.helpers import disable_animations -from ...fixtures.certificates import CertificateConfigFixture +from common.test.acceptance.fixtures.certificates import CertificateConfigFixture class BaseInstructorDashboardTest(EventsTestMixin, UniqueCourseTest): diff --git a/common/test/acceptance/tests/lms/test_lms_matlab_problem.py b/common/test/acceptance/tests/lms/test_lms_matlab_problem.py index cd698bb178..a880c47b68 100644 --- a/common/test/acceptance/tests/lms/test_lms_matlab_problem.py +++ b/common/test/acceptance/tests/lms/test_lms_matlab_problem.py @@ -4,10 +4,10 @@ Test for matlab problems """ import time -from ...pages.lms.matlab_problem import MatlabProblemPage -from ...fixtures.course import XBlockFixtureDesc -from ...fixtures.xqueue import XQueueResponseFixture -from .test_lms_problems import ProblemsTest +from common.test.acceptance.pages.lms.matlab_problem import MatlabProblemPage +from common.test.acceptance.fixtures.course import XBlockFixtureDesc +from common.test.acceptance.fixtures.xqueue import XQueueResponseFixture +from common.test.acceptance.tests.lms.test_lms_problems import ProblemsTest from textwrap import dedent diff --git a/common/test/acceptance/tests/lms/test_lms_problems.py b/common/test/acceptance/tests/lms/test_lms_problems.py index ccab47dee9..daa0fcb64b 100644 --- a/common/test/acceptance/tests/lms/test_lms_problems.py +++ b/common/test/acceptance/tests/lms/test_lms_problems.py @@ -6,13 +6,13 @@ See also old lettuce tests in lms/djangoapps/courseware/features/problems.featur """ from textwrap import dedent -from ..helpers import UniqueCourseTest -from ...pages.studio.auto_auth import AutoAuthPage -from ...pages.lms.courseware import CoursewarePage -from ...pages.lms.problem import ProblemPage -from ...pages.lms.login_and_register import CombinedLoginAndRegisterPage -from ...fixtures.course import CourseFixture, XBlockFixtureDesc -from ..helpers import EventsTestMixin +from common.test.acceptance.tests.helpers import UniqueCourseTest +from common.test.acceptance.pages.studio.auto_auth import AutoAuthPage +from common.test.acceptance.pages.lms.courseware import CoursewarePage +from common.test.acceptance.pages.lms.problem import ProblemPage +from common.test.acceptance.pages.lms.login_and_register import CombinedLoginAndRegisterPage +from common.test.acceptance.fixtures.course import CourseFixture, XBlockFixtureDesc +from common.test.acceptance.tests.helpers import EventsTestMixin class ProblemsTest(UniqueCourseTest): diff --git a/common/test/acceptance/tests/lms/test_lms_split_test_courseware_search.py b/common/test/acceptance/tests/lms/test_lms_split_test_courseware_search.py index 24513db360..a9d5782a08 100644 --- a/common/test/acceptance/tests/lms/test_lms_split_test_courseware_search.py +++ b/common/test/acceptance/tests/lms/test_lms_split_test_courseware_search.py @@ -4,21 +4,21 @@ Test courseware search import json -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.course_nav import CourseNavPage -from ...fixtures.course import XBlockFixtureDesc -from ..helpers import create_user_partition_json +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.course_nav import CourseNavPage +from common.test.acceptance.fixtures.course import XBlockFixtureDesc +from common.test.acceptance.tests.helpers import create_user_partition_json from xmodule.partitions.partitions import Group 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.auto_auth import AutoAuthPage as StudioAutoAuthPage +from common.test.acceptance.pages.studio.auto_auth import AutoAuthPage as StudioAutoAuthPage @attr('shard_1') diff --git a/common/test/acceptance/tests/lms/test_lms_user_preview.py b/common/test/acceptance/tests/lms/test_lms_user_preview.py index ef0ae96964..9774c1512d 100644 --- a/common/test/acceptance/tests/lms/test_lms_user_preview.py +++ b/common/test/acceptance/tests/lms/test_lms_user_preview.py @@ -6,12 +6,12 @@ Tests the "preview" selector in the LMS that allows changing between Staff, Stud from nose.plugins.attrib import attr -from ..helpers import UniqueCourseTest, create_user_partition_json -from ...pages.studio.auto_auth import AutoAuthPage -from ...pages.lms.courseware import CoursewarePage -from ...pages.lms.instructor_dashboard import InstructorDashboardPage -from ...pages.lms.staff_view import StaffPage -from ...fixtures.course import CourseFixture, XBlockFixtureDesc +from common.test.acceptance.tests.helpers import UniqueCourseTest, create_user_partition_json +from common.test.acceptance.pages.studio.auto_auth import AutoAuthPage +from common.test.acceptance.pages.lms.courseware import CoursewarePage +from common.test.acceptance.pages.lms.instructor_dashboard import InstructorDashboardPage +from common.test.acceptance.pages.lms.staff_view import StaffPage +from common.test.acceptance.fixtures.course import CourseFixture, XBlockFixtureDesc from bok_choy.promise import EmptyPromise from xmodule.partitions.partitions import Group from textwrap import dedent diff --git a/common/test/acceptance/tests/lms/test_programs.py b/common/test/acceptance/tests/lms/test_programs.py index b4f610d449..faa684ea73 100644 --- a/common/test/acceptance/tests/lms/test_programs.py +++ b/common/test/acceptance/tests/lms/test_programs.py @@ -1,12 +1,12 @@ """Acceptance tests for LMS-hosted Programs pages""" from nose.plugins.attrib import attr -from ...fixtures.catalog import CatalogFixture, CatalogConfigMixin -from ...fixtures.programs import ProgramsFixture, ProgramsConfigMixin -from ...fixtures.course import CourseFixture -from ..helpers import UniqueCourseTest -from ...pages.lms.auto_auth import AutoAuthPage -from ...pages.lms.programs import ProgramListingPage, ProgramDetailsPage +from common.test.acceptance.fixtures.catalog import CatalogFixture, CatalogConfigMixin +from common.test.acceptance.fixtures.programs import ProgramsFixture, ProgramsConfigMixin +from common.test.acceptance.fixtures.course import CourseFixture +from common.test.acceptance.tests.helpers import UniqueCourseTest +from common.test.acceptance.pages.lms.auto_auth import AutoAuthPage +from common.test.acceptance.pages.lms.programs import ProgramListingPage, ProgramDetailsPage from openedx.core.djangoapps.catalog.tests import factories as catalog_factories from openedx.core.djangoapps.programs.tests import factories as program_factories