Commit 9b48eaf2 by shaunagm Committed by GitHub

Merge pull request #13118 from shaunagm/master

Change relative paths to absolute paths in in acceptance test imports
parents 88920510 f8d28889
...@@ -5,15 +5,15 @@ Helper functions and classes for discussion tests. ...@@ -5,15 +5,15 @@ Helper functions and classes for discussion tests.
from uuid import uuid4 from uuid import uuid4
import json import json
from ...fixtures import LMS_BASE_URL from common.test.acceptance.fixtures import LMS_BASE_URL
from ...fixtures.course import CourseFixture from common.test.acceptance.fixtures.course import CourseFixture
from ...fixtures.discussion import ( from common.test.acceptance.fixtures.discussion import (
SingleThreadViewFixture, SingleThreadViewFixture,
Thread, Thread,
Response, Response,
) )
from ...pages.lms.discussion import DiscussionTabSingleThreadPage from common.test.acceptance.pages.lms.discussion import DiscussionTabSingleThreadPage
from ...tests.helpers import UniqueCourseTest from common.test.acceptance.tests.helpers import UniqueCourseTest
class BaseDiscussionMixin(object): class BaseDiscussionMixin(object):
......
...@@ -8,13 +8,13 @@ from datetime import datetime ...@@ -8,13 +8,13 @@ from datetime import datetime
from pytz import UTC, utc from pytz import UTC, utc
from bok_choy.promise import EmptyPromise from bok_choy.promise import EmptyPromise
from nose.plugins.attrib import attr from nose.plugins.attrib import attr
from .helpers import CohortTestMixin from common.test.acceptance.tests.discussion.helpers import CohortTestMixin
from ..helpers import UniqueCourseTest, EventsTestMixin, create_user_partition_json from common.test.acceptance.tests.helpers import UniqueCourseTest, EventsTestMixin, create_user_partition_json
from xmodule.partitions.partitions import Group from xmodule.partitions.partitions import Group
from ...fixtures.course import CourseFixture, XBlockFixtureDesc from common.test.acceptance.fixtures.course import CourseFixture, XBlockFixtureDesc
from ...pages.lms.auto_auth import AutoAuthPage from common.test.acceptance.pages.lms.auto_auth import AutoAuthPage
from ...pages.lms.instructor_dashboard import InstructorDashboardPage, DataDownloadPage from common.test.acceptance.pages.lms.instructor_dashboard import InstructorDashboardPage, DataDownloadPage
from ...pages.studio.settings_group_configurations import GroupConfigurationsPage from common.test.acceptance.pages.studio.settings_group_configurations import GroupConfigurationsPage
import os import os
import unicodecsv import unicodecsv
......
...@@ -3,14 +3,17 @@ Tests related to the cohorting feature. ...@@ -3,14 +3,17 @@ Tests related to the cohorting feature.
""" """
from uuid import uuid4 from uuid import uuid4
from .helpers import BaseDiscussionMixin, BaseDiscussionTestCase from common.test.acceptance.tests.discussion.helpers import BaseDiscussionMixin, BaseDiscussionTestCase
from .helpers import CohortTestMixin from common.test.acceptance.tests.discussion.helpers import CohortTestMixin
from ..helpers import UniqueCourseTest from common.test.acceptance.tests.helpers import UniqueCourseTest
from ...pages.lms.auto_auth import AutoAuthPage from common.test.acceptance.pages.lms.auto_auth import AutoAuthPage
from ...fixtures.course import (CourseFixture, XBlockFixtureDesc) from common.test.acceptance.fixtures.course import (CourseFixture, XBlockFixtureDesc)
from ...pages.lms.discussion import (DiscussionTabSingleThreadPage, InlineDiscussionThreadPage, InlineDiscussionPage) from common.test.acceptance.pages.lms.discussion import (
from ...pages.lms.courseware import CoursewarePage DiscussionTabSingleThreadPage,
InlineDiscussionThreadPage,
InlineDiscussionPage)
from common.test.acceptance.pages.lms.courseware import CoursewarePage
from nose.plugins.attrib import attr from nose.plugins.attrib import attr
......
...@@ -8,11 +8,11 @@ from uuid import uuid4 ...@@ -8,11 +8,11 @@ from uuid import uuid4
from nose.plugins.attrib import attr from nose.plugins.attrib import attr
from pytz import UTC from pytz import UTC
from .helpers import BaseDiscussionTestCase from common.test.acceptance.tests.discussion.helpers import BaseDiscussionTestCase
from ..helpers import UniqueCourseTest from common.test.acceptance.tests.helpers import UniqueCourseTest
from ...pages.lms.auto_auth import AutoAuthPage from common.test.acceptance.pages.lms.auto_auth import AutoAuthPage
from ...pages.lms.courseware import CoursewarePage from common.test.acceptance.pages.lms.courseware import CoursewarePage
from ...pages.lms.discussion import ( from common.test.acceptance.pages.lms.discussion import (
DiscussionTabSingleThreadPage, DiscussionTabSingleThreadPage,
InlineDiscussionPage, InlineDiscussionPage,
InlineDiscussionThreadPage, InlineDiscussionThreadPage,
...@@ -20,10 +20,10 @@ from ...pages.lms.discussion import ( ...@@ -20,10 +20,10 @@ from ...pages.lms.discussion import (
DiscussionTabHomePage, DiscussionTabHomePage,
DiscussionSortPreferencePage, DiscussionSortPreferencePage,
) )
from ...pages.lms.learner_profile import LearnerProfilePage from common.test.acceptance.pages.lms.learner_profile import LearnerProfilePage
from ...fixtures.course import CourseFixture, XBlockFixtureDesc from common.test.acceptance.fixtures.course import CourseFixture, XBlockFixtureDesc
from ...fixtures.discussion import ( from common.test.acceptance.fixtures.discussion import (
SingleThreadViewFixture, SingleThreadViewFixture,
UserProfileViewFixture, UserProfileViewFixture,
SearchResultFixture, SearchResultFixture,
...@@ -33,8 +33,8 @@ from ...fixtures.discussion import ( ...@@ -33,8 +33,8 @@ from ...fixtures.discussion import (
SearchResult, SearchResult,
MultipleThreadFixture) MultipleThreadFixture)
from .helpers import BaseDiscussionMixin from common.test.acceptance.tests.discussion.helpers import BaseDiscussionMixin
from ..helpers import skip_if_browser from common.test.acceptance.tests.helpers import skip_if_browser
THREAD_CONTENT_WITH_LATEX = """Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt THREAD_CONTENT_WITH_LATEX = """Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt
......
...@@ -29,7 +29,7 @@ from selenium.webdriver.support import expected_conditions as EC ...@@ -29,7 +29,7 @@ from selenium.webdriver.support import expected_conditions as EC
from unittest import TestCase from unittest import TestCase
from ..pages.common import BASE_URL from common.test.acceptance.pages.common import BASE_URL
MAX_EVENTS_IN_FAILURE_OUTPUT = 20 MAX_EVENTS_IN_FAILURE_OUTPUT = 20
......
...@@ -10,11 +10,11 @@ from bok_choy.page_object import XSS_INJECTION ...@@ -10,11 +10,11 @@ from bok_choy.page_object import XSS_INJECTION
from datetime import datetime from datetime import datetime
from pytz import timezone, utc from pytz import timezone, utc
from ...pages.lms.account_settings import AccountSettingsPage from common.test.acceptance.pages.lms.account_settings import AccountSettingsPage
from ...pages.lms.auto_auth import AutoAuthPage from common.test.acceptance.pages.lms.auto_auth import AutoAuthPage
from ...pages.lms.dashboard import DashboardPage 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): class AccountSettingsTestMixin(EventsTestMixin, WebAppTest):
......
...@@ -5,17 +5,17 @@ End-to-end tests for the courseware unit bookmarks. ...@@ -5,17 +5,17 @@ End-to-end tests for the courseware unit bookmarks.
import json import json
from nose.plugins.attrib import attr from nose.plugins.attrib import attr
import requests import requests
from ...pages.studio.auto_auth import AutoAuthPage as StudioAutoAuthPage from common.test.acceptance.pages.studio.auto_auth import AutoAuthPage as StudioAutoAuthPage
from ...pages.lms.auto_auth import AutoAuthPage as LmsAutoAuthPage from common.test.acceptance.pages.lms.auto_auth import AutoAuthPage as LmsAutoAuthPage
from ...pages.lms.bookmarks import BookmarksPage from common.test.acceptance.pages.lms.bookmarks import BookmarksPage
from ...pages.lms.courseware import CoursewarePage from common.test.acceptance.pages.lms.courseware import CoursewarePage
from ...pages.lms.course_nav import CourseNavPage from common.test.acceptance.pages.lms.course_nav import CourseNavPage
from ...pages.studio.overview import CourseOutlinePage from common.test.acceptance.pages.studio.overview import CourseOutlinePage
from ...pages.common.logout import LogoutPage from common.test.acceptance.pages.common.logout import LogoutPage
from ...pages.common import BASE_URL from common.test.acceptance.pages.common import BASE_URL
from ...fixtures.course import CourseFixture, XBlockFixtureDesc from common.test.acceptance.fixtures.course import CourseFixture, XBlockFixtureDesc
from ..helpers import EventsTestMixin, UniqueCourseTest, is_404_page from common.test.acceptance.tests.helpers import EventsTestMixin, UniqueCourseTest, is_404_page
class BookmarksTestMixin(EventsTestMixin, UniqueCourseTest): class BookmarksTestMixin(EventsTestMixin, UniqueCourseTest):
......
""" """
Acceptance tests for the certificate web view feature. 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 nose.plugins.attrib import attr
from ...fixtures.course import CourseFixture, XBlockFixtureDesc, CourseUpdateDesc from common.test.acceptance.fixtures.course import CourseFixture, XBlockFixtureDesc, CourseUpdateDesc
from ...fixtures.certificates import CertificateConfigFixture from common.test.acceptance.fixtures.certificates import CertificateConfigFixture
from ...pages.lms.auto_auth import AutoAuthPage from common.test.acceptance.pages.lms.auto_auth import AutoAuthPage
from ...pages.lms.certificate_page import CertificatePage from common.test.acceptance.pages.lms.certificate_page import CertificatePage
from ...pages.lms.course_info import CourseInfoPage from common.test.acceptance.pages.lms.course_info import CourseInfoPage
from ...pages.lms.tab_nav import TabNavPage from common.test.acceptance.pages.lms.tab_nav import TabNavPage
from ...pages.lms.course_nav import CourseNavPage from common.test.acceptance.pages.lms.course_nav import CourseNavPage
from ...pages.lms.progress import ProgressPage from common.test.acceptance.pages.lms.progress import ProgressPage
@attr('shard_5') @attr('shard_5')
......
...@@ -2,12 +2,12 @@ ...@@ -2,12 +2,12 @@
Bok choy acceptance tests for conditionals in the LMS Bok choy acceptance tests for conditionals in the LMS
""" """
from capa.tests.response_xml_factory import StringResponseXMLFactory from capa.tests.response_xml_factory import StringResponseXMLFactory
from ..helpers import UniqueCourseTest from common.test.acceptance.tests.helpers import UniqueCourseTest
from ...fixtures.course import CourseFixture, XBlockFixtureDesc from common.test.acceptance.fixtures.course import CourseFixture, XBlockFixtureDesc
from ...pages.lms.courseware import CoursewarePage from common.test.acceptance.pages.lms.courseware import CoursewarePage
from ...pages.lms.conditional import ConditionalPage, POLL_ANSWER from common.test.acceptance.pages.lms.conditional import ConditionalPage, POLL_ANSWER
from ...pages.lms.problem import ProblemPage from common.test.acceptance.pages.lms.problem import ProblemPage
from ...pages.studio.auto_auth import AutoAuthPage from common.test.acceptance.pages.studio.auto_auth import AutoAuthPage
class ConditionalTest(UniqueCourseTest): class ConditionalTest(UniqueCourseTest):
......
...@@ -9,13 +9,13 @@ from datetime import datetime ...@@ -9,13 +9,13 @@ from datetime import datetime
from flaky import flaky from flaky import flaky
from nose.plugins.attrib import attr from nose.plugins.attrib import attr
from ...pages.common.logout import LogoutPage from common.test.acceptance.pages.common.logout import LogoutPage
from ...pages.lms.account_settings import AccountSettingsPage from common.test.acceptance.pages.lms.account_settings import AccountSettingsPage
from ...pages.lms.auto_auth import AutoAuthPage from common.test.acceptance.pages.lms.auto_auth import AutoAuthPage
from ...pages.lms.learner_profile import LearnerProfilePage from common.test.acceptance.pages.lms.learner_profile import LearnerProfilePage
from ...pages.lms.dashboard import DashboardPage from common.test.acceptance.pages.lms.dashboard import DashboardPage
from ..helpers import EventsTestMixin from common.test.acceptance.tests.helpers import EventsTestMixin
class LearnerProfileTestMixin(EventsTestMixin): class LearnerProfileTestMixin(EventsTestMixin):
......
...@@ -6,15 +6,15 @@ import ddt ...@@ -6,15 +6,15 @@ import ddt
import textwrap import textwrap
from nose.plugins.attrib import attr from nose.plugins.attrib import attr
from ..helpers import UniqueCourseTest, TestWithSearchIndexMixin from common.test.acceptance.tests.helpers import UniqueCourseTest, TestWithSearchIndexMixin
from ...pages.studio.auto_auth import AutoAuthPage from common.test.acceptance.pages.studio.auto_auth import AutoAuthPage
from ...pages.studio.overview import CourseOutlinePage from common.test.acceptance.pages.studio.overview import CourseOutlinePage
from ...pages.studio.library import StudioLibraryContentEditor, StudioLibraryContainerXBlockWrapper from common.test.acceptance.pages.studio.library import StudioLibraryContentEditor, StudioLibraryContainerXBlockWrapper
from ...pages.lms.courseware import CoursewarePage from common.test.acceptance.pages.lms.courseware import CoursewarePage
from ...pages.lms.library import LibraryContentXBlockWrapper from common.test.acceptance.pages.lms.library import LibraryContentXBlockWrapper
from ...pages.common.logout import LogoutPage from common.test.acceptance.pages.common.logout import LogoutPage
from ...fixtures.course import CourseFixture, XBlockFixtureDesc from common.test.acceptance.fixtures.course import CourseFixture, XBlockFixtureDesc
from ...fixtures.library import LibraryFixture from common.test.acceptance.fixtures.library import LibraryFixture
SECTION_NAME = 'Test Section' SECTION_NAME = 'Test Section'
SUBSECTION_NAME = 'Test Subsection' SUBSECTION_NAME = 'Test Subsection'
......
...@@ -11,7 +11,7 @@ import pytz ...@@ -11,7 +11,7 @@ import pytz
import urllib import urllib
from bok_choy.promise import EmptyPromise from bok_choy.promise import EmptyPromise
from ..helpers import ( from common.test.acceptance.tests.helpers import (
UniqueCourseTest, UniqueCourseTest,
EventsTestMixin, EventsTestMixin,
load_data_str, load_data_str,
...@@ -21,25 +21,25 @@ from ..helpers import ( ...@@ -21,25 +21,25 @@ from ..helpers import (
select_option_by_text, select_option_by_text,
get_selected_option_text get_selected_option_text
) )
from ...pages.lms import BASE_URL from common.test.acceptance.pages.lms import BASE_URL
from ...pages.lms.account_settings import AccountSettingsPage from common.test.acceptance.pages.lms.account_settings import AccountSettingsPage
from ...pages.lms.auto_auth import AutoAuthPage from common.test.acceptance.pages.lms.auto_auth import AutoAuthPage
from ...pages.lms.create_mode import ModeCreationPage from common.test.acceptance.pages.lms.create_mode import ModeCreationPage
from ...pages.common.logout import LogoutPage from common.test.acceptance.pages.common.logout import LogoutPage
from ...pages.lms.course_info import CourseInfoPage from common.test.acceptance.pages.lms.course_info import CourseInfoPage
from ...pages.lms.tab_nav import TabNavPage from common.test.acceptance.pages.lms.tab_nav import TabNavPage
from ...pages.lms.course_nav import CourseNavPage from common.test.acceptance.pages.lms.course_nav import CourseNavPage
from ...pages.lms.progress import ProgressPage from common.test.acceptance.pages.lms.progress import ProgressPage
from ...pages.lms.dashboard import DashboardPage from common.test.acceptance.pages.lms.dashboard import DashboardPage
from ...pages.lms.problem import ProblemPage from common.test.acceptance.pages.lms.problem import ProblemPage
from ...pages.lms.video.video import VideoPage from common.test.acceptance.pages.lms.video.video import VideoPage
from ...pages.lms.courseware import CoursewarePage from common.test.acceptance.pages.lms.courseware import CoursewarePage
from ...pages.studio.settings import SettingsPage from common.test.acceptance.pages.studio.settings import SettingsPage
from ...pages.lms.login_and_register import CombinedLoginAndRegisterPage, ResetPasswordPage from common.test.acceptance.pages.lms.login_and_register import CombinedLoginAndRegisterPage, ResetPasswordPage
from ...pages.lms.track_selection import TrackSelectionPage from common.test.acceptance.pages.lms.track_selection import TrackSelectionPage
from ...pages.lms.pay_and_verify import PaymentAndVerificationFlow, FakePaymentPage from common.test.acceptance.pages.lms.pay_and_verify import PaymentAndVerificationFlow, FakePaymentPage
from ...pages.lms.course_wiki import CourseWikiPage, CourseWikiEditPage from common.test.acceptance.pages.lms.course_wiki import CourseWikiPage, CourseWikiEditPage
from ...fixtures.course import CourseFixture, XBlockFixtureDesc, CourseUpdateDesc from common.test.acceptance.fixtures.course import CourseFixture, XBlockFixtureDesc, CourseUpdateDesc
@attr('shard_8') @attr('shard_8')
......
...@@ -5,12 +5,12 @@ End-to-end tests for the LMS. ...@@ -5,12 +5,12 @@ End-to-end tests for the LMS.
from unittest import expectedFailure from unittest import expectedFailure
from ..helpers import UniqueCourseTest from common.test.acceptance.tests.helpers import UniqueCourseTest
from ...pages.lms.auto_auth import AutoAuthPage from common.test.acceptance.pages.lms.auto_auth import AutoAuthPage
from ...pages.lms.course_info import CourseInfoPage from common.test.acceptance.pages.lms.course_info import CourseInfoPage
from ...pages.lms.tab_nav import TabNavPage from common.test.acceptance.pages.lms.tab_nav import TabNavPage
from ...pages.xblock.acid import AcidView from common.test.acceptance.pages.xblock.acid import AcidView
from ...fixtures.course import CourseFixture, XBlockFixtureDesc from common.test.acceptance.fixtures.course import CourseFixture, XBlockFixtureDesc
class XBlockAcidBase(UniqueCourseTest): class XBlockAcidBase(UniqueCourseTest):
......
...@@ -5,22 +5,22 @@ Test courseware search ...@@ -5,22 +5,22 @@ Test courseware search
import json import json
import uuid import uuid
from ..helpers import remove_file from common.test.acceptance.tests.helpers import remove_file
from ...pages.common.logout import LogoutPage from common.test.acceptance.pages.common.logout import LogoutPage
from ...pages.studio.overview import CourseOutlinePage from common.test.acceptance.pages.studio.overview import CourseOutlinePage
from ...pages.lms.courseware_search import CoursewareSearchPage from common.test.acceptance.pages.lms.courseware_search import CoursewareSearchPage
from ...pages.lms.staff_view import StaffPage from common.test.acceptance.pages.lms.staff_view import StaffPage
from ...fixtures.course import XBlockFixtureDesc from common.test.acceptance.fixtures.course import XBlockFixtureDesc
from nose.plugins.attrib import attr 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 common.test.acceptance.pages.studio.settings_group_configurations import GroupConfigurationsPage
from ...pages.studio.auto_auth import AutoAuthPage as StudioAutoAuthPage from common.test.acceptance.pages.studio.auto_auth import AutoAuthPage as StudioAutoAuthPage
from ...fixtures import LMS_BASE_URL from common.test.acceptance.fixtures import LMS_BASE_URL
from ...pages.studio.component_editor import ComponentVisibilityEditorView from common.test.acceptance.pages.studio.component_editor import ComponentVisibilityEditorView
from ...pages.lms.instructor_dashboard import InstructorDashboardPage from common.test.acceptance.pages.lms.instructor_dashboard import InstructorDashboardPage
from bok_choy.promise import EmptyPromise from bok_choy.promise import EmptyPromise
......
...@@ -6,11 +6,11 @@ import json ...@@ -6,11 +6,11 @@ import json
import uuid import uuid
from bok_choy.web_app_test import WebAppTest from bok_choy.web_app_test import WebAppTest
from ..helpers import remove_file from common.test.acceptance.tests.helpers import remove_file
from ...pages.common.logout import LogoutPage from common.test.acceptance.pages.common.logout import LogoutPage
from ...pages.studio.auto_auth import AutoAuthPage from common.test.acceptance.pages.studio.auto_auth import AutoAuthPage
from ...pages.lms.discovery import CourseDiscoveryPage from common.test.acceptance.pages.lms.discovery import CourseDiscoveryPage
from ...fixtures.course import CourseFixture from common.test.acceptance.fixtures.course import CourseFixture
class CourseDiscoveryTest(WebAppTest): class CourseDiscoveryTest(WebAppTest):
......
...@@ -9,19 +9,19 @@ from datetime import datetime, timedelta ...@@ -9,19 +9,19 @@ from datetime import datetime, timedelta
import ddt import ddt
from capa.tests.response_xml_factory import MultipleChoiceResponseXMLFactory from capa.tests.response_xml_factory import MultipleChoiceResponseXMLFactory
from ..helpers import UniqueCourseTest, EventsTestMixin from common.test.acceptance.tests.helpers import UniqueCourseTest, EventsTestMixin
from ...pages.studio.auto_auth import AutoAuthPage from common.test.acceptance.pages.studio.auto_auth import AutoAuthPage
from ...pages.lms.create_mode import ModeCreationPage from common.test.acceptance.pages.lms.create_mode import ModeCreationPage
from ...pages.studio.overview import CourseOutlinePage from common.test.acceptance.pages.studio.overview import CourseOutlinePage
from ...pages.lms.courseware import CoursewarePage, CoursewareSequentialTabPage from common.test.acceptance.pages.lms.courseware import CoursewarePage, CoursewareSequentialTabPage
from ...pages.lms.course_nav import CourseNavPage from common.test.acceptance.pages.lms.course_nav import CourseNavPage
from ...pages.lms.problem import ProblemPage from common.test.acceptance.pages.lms.problem import ProblemPage
from ...pages.common.logout import LogoutPage from common.test.acceptance.pages.common.logout import LogoutPage
from ...pages.lms.staff_view import StaffPage from common.test.acceptance.pages.lms.staff_view import StaffPage
from ...pages.lms.track_selection import TrackSelectionPage from common.test.acceptance.pages.lms.track_selection import TrackSelectionPage
from ...pages.lms.pay_and_verify import PaymentAndVerificationFlow, FakePaymentPage from common.test.acceptance.pages.lms.pay_and_verify import PaymentAndVerificationFlow, FakePaymentPage
from ...pages.lms.dashboard import DashboardPage from common.test.acceptance.pages.lms.dashboard import DashboardPage
from ...fixtures.course import CourseFixture, XBlockFixtureDesc from common.test.acceptance.fixtures.course import CourseFixture, XBlockFixtureDesc
class CoursewareTest(UniqueCourseTest): class CoursewareTest(UniqueCourseTest):
......
...@@ -5,15 +5,15 @@ import json ...@@ -5,15 +5,15 @@ import json
from nose.plugins.attrib import attr from nose.plugins.attrib import attr
from ..helpers import UniqueCourseTest, remove_file from common.test.acceptance.tests.helpers import UniqueCourseTest, remove_file
from ...pages.common.logout import LogoutPage from common.test.acceptance.pages.common.logout import LogoutPage
from ...pages.common.utils import click_css from common.test.acceptance.pages.common.utils import click_css
from ...pages.studio.utils import add_html_component, type_in_codemirror from common.test.acceptance.pages.studio.utils import add_html_component, type_in_codemirror
from ...pages.studio.auto_auth import AutoAuthPage from common.test.acceptance.pages.studio.auto_auth import AutoAuthPage
from ...pages.studio.overview import CourseOutlinePage from common.test.acceptance.pages.studio.overview import CourseOutlinePage
from ...pages.studio.container import ContainerPage from common.test.acceptance.pages.studio.container import ContainerPage
from ...pages.lms.courseware_search import CoursewareSearchPage from common.test.acceptance.pages.lms.courseware_search import CoursewareSearchPage
from ...fixtures.course import CourseFixture, XBlockFixtureDesc from common.test.acceptance.fixtures.course import CourseFixture, XBlockFixtureDesc
@attr('shard_5') @attr('shard_5')
......
...@@ -5,10 +5,10 @@ End-to-end tests for the main LMS Dashboard (aka, Student Dashboard). ...@@ -5,10 +5,10 @@ End-to-end tests for the main LMS Dashboard (aka, Student Dashboard).
import datetime import datetime
from nose.plugins.attrib import attr from nose.plugins.attrib import attr
from ..helpers import UniqueCourseTest, generate_course_key from common.test.acceptance.tests.helpers import UniqueCourseTest, generate_course_key
from ...fixtures.course import CourseFixture from common.test.acceptance.fixtures.course import CourseFixture
from ...pages.lms.auto_auth import AutoAuthPage from common.test.acceptance.pages.lms.auto_auth import AutoAuthPage
from ...pages.lms.dashboard import DashboardPage from common.test.acceptance.pages.lms.dashboard import DashboardPage
DEFAULT_SHORT_DATE_FORMAT = "%b %d, %Y" DEFAULT_SHORT_DATE_FORMAT = "%b %d, %Y"
DEFAULT_DAY_AND_TIME_FORMAT = "%A at %-I%P" DEFAULT_DAY_AND_TIME_FORMAT = "%A at %-I%P"
......
...@@ -5,15 +5,15 @@ import os ...@@ -5,15 +5,15 @@ import os
import json import json
from bok_choy.web_app_test import WebAppTest from bok_choy.web_app_test import WebAppTest
from ..helpers import generate_course_key from common.test.acceptance.tests.helpers import generate_course_key
from ...pages.common.logout import LogoutPage from common.test.acceptance.pages.common.logout import LogoutPage
from ...pages.common.utils import click_css from common.test.acceptance.pages.common.utils import click_css
from ...pages.studio.utils import add_html_component, type_in_codemirror from common.test.acceptance.pages.studio.utils import add_html_component, type_in_codemirror
from ...pages.studio.auto_auth import AutoAuthPage from common.test.acceptance.pages.studio.auto_auth import AutoAuthPage
from ...pages.studio.overview import CourseOutlinePage from common.test.acceptance.pages.studio.overview import CourseOutlinePage
from ...pages.studio.container import ContainerPage from common.test.acceptance.pages.studio.container import ContainerPage
from ...pages.lms.dashboard_search import DashboardSearchPage from common.test.acceptance.pages.lms.dashboard_search import DashboardSearchPage
from ...fixtures.course import CourseFixture, XBlockFixtureDesc from common.test.acceptance.fixtures.course import CourseFixture, XBlockFixtureDesc
class DashboardSearchTest(WebAppTest): class DashboardSearchTest(WebAppTest):
......
...@@ -6,13 +6,13 @@ import random ...@@ -6,13 +6,13 @@ import random
from uuid import uuid4 from uuid import uuid4
from datetime import datetime from datetime import datetime
from nose.plugins.attrib import attr from nose.plugins.attrib import attr
from ..helpers import UniqueCourseTest, EventsTestMixin from common.test.acceptance.tests.helpers import UniqueCourseTest, EventsTestMixin
from ...fixtures.course import CourseFixture, XBlockFixtureDesc from common.test.acceptance.fixtures.course import CourseFixture, XBlockFixtureDesc
from ...pages.lms.auto_auth import AutoAuthPage from common.test.acceptance.pages.lms.auto_auth import AutoAuthPage
from ...pages.lms.course_nav import CourseNavPage from common.test.acceptance.pages.lms.course_nav import CourseNavPage
from ...pages.lms.courseware import CoursewarePage from common.test.acceptance.pages.lms.courseware import CoursewarePage
from ...pages.lms.edxnotes import EdxNotesUnitPage, EdxNotesPage, EdxNotesPageNoContent from common.test.acceptance.pages.lms.edxnotes import EdxNotesUnitPage, EdxNotesPage, EdxNotesPageNoContent
from ...fixtures.edxnotes import EdxNotesFixture, Note, Range from common.test.acceptance.fixtures.edxnotes import EdxNotesFixture, Note, Range
from flaky import flaky from flaky import flaky
......
...@@ -4,11 +4,11 @@ Bok choy acceptance tests for Entrance exams in the LMS ...@@ -4,11 +4,11 @@ Bok choy acceptance tests for Entrance exams in the LMS
""" """
from textwrap import dedent from textwrap import dedent
from ..helpers import UniqueCourseTest from common.test.acceptance.tests.helpers import UniqueCourseTest
from ...pages.studio.auto_auth import AutoAuthPage from common.test.acceptance.pages.studio.auto_auth import AutoAuthPage
from ...pages.lms.courseware import CoursewarePage from common.test.acceptance.pages.lms.courseware import CoursewarePage
from ...pages.lms.problem import ProblemPage from common.test.acceptance.pages.lms.problem import ProblemPage
from ...fixtures.course import CourseFixture, XBlockFixtureDesc from common.test.acceptance.fixtures.course import CourseFixture, XBlockFixtureDesc
class EntranceExamTest(UniqueCourseTest): class EntranceExamTest(UniqueCourseTest):
......
...@@ -4,14 +4,14 @@ End-to-end tests for the gating feature. ...@@ -4,14 +4,14 @@ End-to-end tests for the gating feature.
""" """
from textwrap import dedent from textwrap import dedent
from ..helpers import UniqueCourseTest from common.test.acceptance.tests.helpers import UniqueCourseTest
from ...pages.studio.auto_auth import AutoAuthPage from common.test.acceptance.pages.studio.auto_auth import AutoAuthPage
from ...pages.studio.overview import CourseOutlinePage from common.test.acceptance.pages.studio.overview import CourseOutlinePage
from ...pages.lms.courseware import CoursewarePage from common.test.acceptance.pages.lms.courseware import CoursewarePage
from ...pages.lms.problem import ProblemPage from common.test.acceptance.pages.lms.problem import ProblemPage
from ...pages.lms.staff_view import StaffPage from common.test.acceptance.pages.lms.staff_view import StaffPage
from ...pages.common.logout import LogoutPage from common.test.acceptance.pages.common.logout import LogoutPage
from ...fixtures.course import CourseFixture, XBlockFixtureDesc from common.test.acceptance.fixtures.course import CourseFixture, XBlockFixtureDesc
class GatingTest(UniqueCourseTest): class GatingTest(UniqueCourseTest):
......
...@@ -6,7 +6,7 @@ what students see @ edx.org because we redirect requests to a separate web appli ...@@ -6,7 +6,7 @@ what students see @ edx.org because we redirect requests to a separate web appli
import datetime import datetime
from bok_choy.web_app_test import WebAppTest 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): class BaseLmsIndexTest(WebAppTest):
......
...@@ -8,21 +8,21 @@ import ddt ...@@ -8,21 +8,21 @@ import ddt
from nose.plugins.attrib import attr from nose.plugins.attrib import attr
from bok_choy.promise import EmptyPromise from bok_choy.promise import EmptyPromise
from ..helpers import UniqueCourseTest, get_modal_alert, EventsTestMixin from common.test.acceptance.tests.helpers import UniqueCourseTest, get_modal_alert, EventsTestMixin
from ...pages.common.logout import LogoutPage from common.test.acceptance.pages.common.logout import LogoutPage
from ...pages.lms.auto_auth import AutoAuthPage from common.test.acceptance.pages.lms.auto_auth import AutoAuthPage
from ...pages.studio.overview import CourseOutlinePage from common.test.acceptance.pages.studio.overview import CourseOutlinePage
from ...pages.lms.create_mode import ModeCreationPage from common.test.acceptance.pages.lms.create_mode import ModeCreationPage
from ...pages.lms.courseware import CoursewarePage from common.test.acceptance.pages.lms.courseware import CoursewarePage
from ...pages.lms.instructor_dashboard import InstructorDashboardPage from common.test.acceptance.pages.lms.instructor_dashboard import InstructorDashboardPage
from ...fixtures.course import CourseFixture, XBlockFixtureDesc from common.test.acceptance.fixtures.course import CourseFixture, XBlockFixtureDesc
from ...pages.lms.dashboard import DashboardPage from common.test.acceptance.pages.lms.dashboard import DashboardPage
from ...pages.lms.problem import ProblemPage from common.test.acceptance.pages.lms.problem import ProblemPage
from ...pages.lms.track_selection import TrackSelectionPage from common.test.acceptance.pages.lms.track_selection import TrackSelectionPage
from ...pages.lms.pay_and_verify import PaymentAndVerificationFlow, FakePaymentPage from common.test.acceptance.pages.lms.pay_and_verify import PaymentAndVerificationFlow, FakePaymentPage
from ...pages.lms.login_and_register import CombinedLoginAndRegisterPage from common.test.acceptance.pages.lms.login_and_register import CombinedLoginAndRegisterPage
from common.test.acceptance.tests.helpers import disable_animations 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): class BaseInstructorDashboardTest(EventsTestMixin, UniqueCourseTest):
......
...@@ -4,10 +4,10 @@ Test for matlab problems ...@@ -4,10 +4,10 @@ Test for matlab problems
""" """
import time import time
from ...pages.lms.matlab_problem import MatlabProblemPage from common.test.acceptance.pages.lms.matlab_problem import MatlabProblemPage
from ...fixtures.course import XBlockFixtureDesc from common.test.acceptance.fixtures.course import XBlockFixtureDesc
from ...fixtures.xqueue import XQueueResponseFixture from common.test.acceptance.fixtures.xqueue import XQueueResponseFixture
from .test_lms_problems import ProblemsTest from common.test.acceptance.tests.lms.test_lms_problems import ProblemsTest
from textwrap import dedent from textwrap import dedent
......
...@@ -6,13 +6,13 @@ See also old lettuce tests in lms/djangoapps/courseware/features/problems.featur ...@@ -6,13 +6,13 @@ See also old lettuce tests in lms/djangoapps/courseware/features/problems.featur
""" """
from textwrap import dedent from textwrap import dedent
from ..helpers import UniqueCourseTest from common.test.acceptance.tests.helpers import UniqueCourseTest
from ...pages.studio.auto_auth import AutoAuthPage from common.test.acceptance.pages.studio.auto_auth import AutoAuthPage
from ...pages.lms.courseware import CoursewarePage from common.test.acceptance.pages.lms.courseware import CoursewarePage
from ...pages.lms.problem import ProblemPage from common.test.acceptance.pages.lms.problem import ProblemPage
from ...pages.lms.login_and_register import CombinedLoginAndRegisterPage from common.test.acceptance.pages.lms.login_and_register import CombinedLoginAndRegisterPage
from ...fixtures.course import CourseFixture, XBlockFixtureDesc from common.test.acceptance.fixtures.course import CourseFixture, XBlockFixtureDesc
from ..helpers import EventsTestMixin from common.test.acceptance.tests.helpers import EventsTestMixin
class ProblemsTest(UniqueCourseTest): class ProblemsTest(UniqueCourseTest):
......
...@@ -4,21 +4,21 @@ Test courseware search ...@@ -4,21 +4,21 @@ Test courseware search
import json import json
from ..helpers import remove_file from common.test.acceptance.tests.helpers import remove_file
from ...pages.common.logout import LogoutPage from common.test.acceptance.pages.common.logout import LogoutPage
from ...pages.studio.overview import CourseOutlinePage from common.test.acceptance.pages.studio.overview import CourseOutlinePage
from ...pages.lms.courseware_search import CoursewareSearchPage from common.test.acceptance.pages.lms.courseware_search import CoursewareSearchPage
from ...pages.lms.course_nav import CourseNavPage from common.test.acceptance.pages.lms.course_nav import CourseNavPage
from ...fixtures.course import XBlockFixtureDesc from common.test.acceptance.fixtures.course import XBlockFixtureDesc
from ..helpers import create_user_partition_json from common.test.acceptance.tests.helpers import create_user_partition_json
from xmodule.partitions.partitions import Group from xmodule.partitions.partitions import Group
from nose.plugins.attrib import attr 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') @attr('shard_1')
......
...@@ -6,12 +6,12 @@ Tests the "preview" selector in the LMS that allows changing between Staff, Stud ...@@ -6,12 +6,12 @@ Tests the "preview" selector in the LMS that allows changing between Staff, Stud
from nose.plugins.attrib import attr from nose.plugins.attrib import attr
from ..helpers import UniqueCourseTest, create_user_partition_json from common.test.acceptance.tests.helpers import UniqueCourseTest, create_user_partition_json
from ...pages.studio.auto_auth import AutoAuthPage from common.test.acceptance.pages.studio.auto_auth import AutoAuthPage
from ...pages.lms.courseware import CoursewarePage from common.test.acceptance.pages.lms.courseware import CoursewarePage
from ...pages.lms.instructor_dashboard import InstructorDashboardPage from common.test.acceptance.pages.lms.instructor_dashboard import InstructorDashboardPage
from ...pages.lms.staff_view import StaffPage from common.test.acceptance.pages.lms.staff_view import StaffPage
from ...fixtures.course import CourseFixture, XBlockFixtureDesc from common.test.acceptance.fixtures.course import CourseFixture, XBlockFixtureDesc
from bok_choy.promise import EmptyPromise from bok_choy.promise import EmptyPromise
from xmodule.partitions.partitions import Group from xmodule.partitions.partitions import Group
from textwrap import dedent from textwrap import dedent
......
"""Acceptance tests for LMS-hosted Programs pages""" """Acceptance tests for LMS-hosted Programs pages"""
from nose.plugins.attrib import attr from nose.plugins.attrib import attr
from ...fixtures.catalog import CatalogFixture, CatalogConfigMixin from common.test.acceptance.fixtures.catalog import CatalogFixture, CatalogConfigMixin
from ...fixtures.programs import ProgramsFixture, ProgramsConfigMixin from common.test.acceptance.fixtures.programs import ProgramsFixture, ProgramsConfigMixin
from ...fixtures.course import CourseFixture from common.test.acceptance.fixtures.course import CourseFixture
from ..helpers import UniqueCourseTest from common.test.acceptance.tests.helpers import UniqueCourseTest
from ...pages.lms.auto_auth import AutoAuthPage from common.test.acceptance.pages.lms.auto_auth import AutoAuthPage
from ...pages.lms.programs import ProgramListingPage, ProgramDetailsPage 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.catalog.tests import factories as catalog_factories
from openedx.core.djangoapps.programs.tests import factories as program_factories from openedx.core.djangoapps.programs.tests import factories as program_factories
......
...@@ -3,12 +3,12 @@ Base classes used by studio tests. ...@@ -3,12 +3,12 @@ Base classes used by studio tests.
""" """
from bok_choy.web_app_test import WebAppTest from bok_choy.web_app_test import WebAppTest
from bok_choy.page_object import XSS_INJECTION from bok_choy.page_object import XSS_INJECTION
from ...pages.studio.auto_auth import AutoAuthPage from common.test.acceptance.pages.studio.auto_auth import AutoAuthPage
from ...fixtures.course import CourseFixture from common.test.acceptance.fixtures.course import CourseFixture
from ...fixtures.library import LibraryFixture from common.test.acceptance.fixtures.library import LibraryFixture
from ..helpers import UniqueCourseTest from common.test.acceptance.tests.helpers import UniqueCourseTest
from ...pages.studio.overview import CourseOutlinePage from common.test.acceptance.pages.studio.overview import CourseOutlinePage
from ...pages.studio.utils import verify_ordering from common.test.acceptance.pages.studio.utils import verify_ordering
class StudioCourseTest(UniqueCourseTest): class StudioCourseTest(UniqueCourseTest):
......
...@@ -9,14 +9,18 @@ from flaky import flaky ...@@ -9,14 +9,18 @@ from flaky import flaky
from abc import abstractmethod from abc import abstractmethod
from bok_choy.promise import EmptyPromise from bok_choy.promise import EmptyPromise
from .base_studio_test import StudioLibraryTest, StudioCourseTest from common.test.acceptance.tests.studio.base_studio_test import StudioLibraryTest, StudioCourseTest
from ...fixtures.course import XBlockFixtureDesc from common.test.acceptance.fixtures.course import XBlockFixtureDesc
from ...pages.studio.import_export import ExportLibraryPage, ExportCoursePage, ImportLibraryPage, ImportCoursePage from common.test.acceptance.pages.studio.import_export import (
from ...pages.studio.library import LibraryEditPage ExportLibraryPage,
from ...pages.studio.container import ContainerPage ExportCoursePage,
from ...pages.studio.overview import CourseOutlinePage ImportLibraryPage,
from ...pages.lms.courseware import CoursewarePage ImportCoursePage)
from ...pages.lms.staff_view import StaffPage 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): class ExportTestMixin(object):
......
...@@ -3,10 +3,10 @@ Acceptance tests for Studio related to the acid xblock. ...@@ -3,10 +3,10 @@ Acceptance tests for Studio related to the acid xblock.
""" """
from bok_choy.web_app_test import WebAppTest from bok_choy.web_app_test import WebAppTest
from ...pages.studio.auto_auth import AutoAuthPage from common.test.acceptance.pages.studio.auto_auth import AutoAuthPage
from ...pages.studio.overview import CourseOutlinePage from common.test.acceptance.pages.studio.overview import CourseOutlinePage
from ...pages.xblock.acid import AcidView from common.test.acceptance.pages.xblock.acid import AcidView
from ...fixtures.course import CourseFixture, XBlockFixtureDesc from common.test.acceptance.fixtures.course import CourseFixture, XBlockFixtureDesc
class XBlockAcidBase(WebAppTest): class XBlockAcidBase(WebAppTest):
......
...@@ -5,11 +5,11 @@ Acceptance tests for Studio related to the asset index page. ...@@ -5,11 +5,11 @@ Acceptance tests for Studio related to the asset index page.
from flaky import flaky from flaky import flaky
from unittest import skip 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 common.test.acceptance.tests.studio.base_studio_test import StudioCourseTest
from ...fixtures.base import StudioApiLoginError from common.test.acceptance.fixtures.base import StudioApiLoginError
from ..helpers import skip_if_browser from common.test.acceptance.tests.helpers import skip_if_browser
@skip('FEDX-88') @skip('FEDX-88')
......
from base_studio_test import ContainerBase from base_studio_test import ContainerBase
from ...fixtures.course import XBlockFixtureDesc from common.test.acceptance.fixtures.course import XBlockFixtureDesc
from ...pages.studio.utils import verify_ordering from common.test.acceptance.pages.studio.utils import verify_ordering
class BadComponentTest(ContainerBase): class BadComponentTest(ContainerBase):
......
...@@ -3,10 +3,10 @@ Acceptance tests for adding components in Studio. ...@@ -3,10 +3,10 @@ Acceptance tests for adding components in Studio.
""" """
import ddt import ddt
from .base_studio_test import ContainerBase from common.test.acceptance.tests.studio.base_studio_test import ContainerBase
from ...fixtures.course import XBlockFixtureDesc from common.test.acceptance.fixtures.course import XBlockFixtureDesc
from ...pages.studio.container import ContainerPage from common.test.acceptance.pages.studio.container import ContainerPage
from ...pages.studio.utils import add_component, add_components from common.test.acceptance.pages.studio.utils import add_component, add_components
from common.test.acceptance.pages.studio.settings_advanced import AdvancedSettingsPage from common.test.acceptance.pages.studio.settings_advanced import AdvancedSettingsPage
......
...@@ -6,14 +6,14 @@ for displaying containers within units. ...@@ -6,14 +6,14 @@ for displaying containers within units.
from nose.plugins.attrib import attr from nose.plugins.attrib import attr
from unittest import skip from unittest import skip
from ...fixtures.course import XBlockFixtureDesc from common.test.acceptance.fixtures.course import XBlockFixtureDesc
from ...pages.studio.component_editor import ComponentEditorView, ComponentVisibilityEditorView from common.test.acceptance.pages.studio.component_editor import ComponentEditorView, ComponentVisibilityEditorView
from ...pages.studio.container import ContainerPage from common.test.acceptance.pages.studio.container import ContainerPage
from ...pages.studio.html_component_editor import HtmlComponentEditorView from common.test.acceptance.pages.studio.html_component_editor import HtmlComponentEditorView
from ...pages.studio.utils import add_discussion, drag from common.test.acceptance.pages.studio.utils import add_discussion, drag
from ...pages.lms.courseware import CoursewarePage from common.test.acceptance.pages.lms.courseware import CoursewarePage
from ...pages.lms.staff_view import StaffPage from common.test.acceptance.pages.lms.staff_view import StaffPage
from ...tests.helpers import create_user_partition_json from common.test.acceptance.tests.helpers import create_user_partition_json
import datetime import datetime
from bok_choy.promise import Promise, EmptyPromise from bok_choy.promise import Promise, EmptyPromise
......
...@@ -5,9 +5,9 @@ import uuid ...@@ -5,9 +5,9 @@ import uuid
from bok_choy.web_app_test import WebAppTest from bok_choy.web_app_test import WebAppTest
from nose.plugins.attrib import attr from nose.plugins.attrib import attr
from ...pages.studio.auto_auth import AutoAuthPage from common.test.acceptance.pages.studio.auto_auth import AutoAuthPage
from ...pages.studio.index import DashboardPage from common.test.acceptance.pages.studio.index import DashboardPage
from ...pages.studio.overview import CourseOutlinePage from common.test.acceptance.pages.studio.overview import CourseOutlinePage
@attr('shard_8') @attr('shard_8')
......
...@@ -3,11 +3,11 @@ Acceptance tests for course in studio ...@@ -3,11 +3,11 @@ Acceptance tests for course in studio
""" """
from nose.plugins.attrib import attr from nose.plugins.attrib import attr
from .base_studio_test import StudioCourseTest from common.test.acceptance.tests.studio.base_studio_test import StudioCourseTest
from ...pages.studio.auto_auth import AutoAuthPage from common.test.acceptance.pages.studio.auto_auth import AutoAuthPage
from ...pages.studio.users import CourseTeamPage from common.test.acceptance.pages.studio.users import CourseTeamPage
from ...pages.studio.index import DashboardPage from common.test.acceptance.pages.studio.index import DashboardPage
@attr('shard_2') @attr('shard_2')
......
...@@ -4,9 +4,9 @@ Test the Studio help links. ...@@ -4,9 +4,9 @@ Test the Studio help links.
from flaky import flaky from flaky import flaky
from .base_studio_test import StudioCourseTest from common.test.acceptance.tests.studio.base_studio_test import StudioCourseTest
from ...pages.studio.index import DashboardPage from common.test.acceptance.pages.studio.index import DashboardPage
from ...pages.studio.utils import click_studio_help, studio_help_links from common.test.acceptance.pages.studio.utils import click_studio_help, studio_help_links
class StudioHelpTest(StudioCourseTest): class StudioHelpTest(StudioCourseTest):
......
...@@ -6,14 +6,12 @@ from flaky import flaky ...@@ -6,14 +6,12 @@ from flaky import flaky
from opaque_keys.edx.locator import LibraryLocator from opaque_keys.edx.locator import LibraryLocator
from uuid import uuid4 from uuid import uuid4
from ...fixtures import PROGRAMS_STUB_URL from common.test.acceptance.fixtures.programs import ProgramsFixture, ProgramsConfigMixin
from ...fixtures.config import ConfigModelFixture from common.test.acceptance.pages.studio.auto_auth import AutoAuthPage
from ...fixtures.programs import ProgramsFixture, ProgramsConfigMixin from common.test.acceptance.pages.studio.library import LibraryEditPage
from ...pages.studio.auto_auth import AutoAuthPage from common.test.acceptance.pages.studio.index import DashboardPage, DashboardPageWithPrograms
from ...pages.studio.library import LibraryEditPage from common.test.acceptance.pages.lms.account_settings import AccountSettingsPage
from ...pages.studio.index import DashboardPage, DashboardPageWithPrograms from common.test.acceptance.tests.helpers import (
from ...pages.lms.account_settings import AccountSettingsPage
from ..helpers import (
select_option_by_text, select_option_by_text,
get_selected_option_text get_selected_option_text
) )
......
...@@ -5,12 +5,12 @@ from ddt import ddt, data ...@@ -5,12 +5,12 @@ from ddt import ddt, data
from nose.plugins.attrib import attr from nose.plugins.attrib import attr
from flaky import flaky from flaky import flaky
from .base_studio_test import StudioLibraryTest from common.test.acceptance.tests.studio.base_studio_test import StudioLibraryTest
from ...fixtures.course import XBlockFixtureDesc from common.test.acceptance.fixtures.course import XBlockFixtureDesc
from ...pages.studio.auto_auth import AutoAuthPage from common.test.acceptance.pages.studio.auto_auth import AutoAuthPage
from ...pages.studio.utils import add_component from common.test.acceptance.pages.studio.utils import add_component
from ...pages.studio.library import LibraryEditPage from common.test.acceptance.pages.studio.library import LibraryEditPage
from ...pages.studio.users import LibraryUsersPage from common.test.acceptance.pages.studio.users import LibraryUsersPage
@attr('shard_2') @attr('shard_2')
......
...@@ -5,12 +5,12 @@ import ddt ...@@ -5,12 +5,12 @@ import ddt
from nose.plugins.attrib import attr from nose.plugins.attrib import attr
import textwrap import textwrap
from .base_studio_test import StudioLibraryTest from common.test.acceptance.tests.studio.base_studio_test import StudioLibraryTest
from ...fixtures.course import CourseFixture from common.test.acceptance.fixtures.course import CourseFixture
from ..helpers import UniqueCourseTest, TestWithSearchIndexMixin from common.test.acceptance.tests.helpers import UniqueCourseTest, TestWithSearchIndexMixin
from ...pages.studio.library import StudioLibraryContentEditor, StudioLibraryContainerXBlockWrapper from common.test.acceptance.pages.studio.library import StudioLibraryContentEditor, StudioLibraryContainerXBlockWrapper
from ...pages.studio.overview import CourseOutlinePage from common.test.acceptance.pages.studio.overview import CourseOutlinePage
from ...fixtures.course import XBlockFixtureDesc from common.test.acceptance.fixtures.course import XBlockFixtureDesc
SECTION_NAME = 'Test Section' SECTION_NAME = 'Test Section'
SUBSECTION_NAME = 'Test Subsection' SUBSECTION_NAME = 'Test Subsection'
......
...@@ -8,18 +8,18 @@ from pytz import UTC ...@@ -8,18 +8,18 @@ from pytz import UTC
from bok_choy.promise import EmptyPromise from bok_choy.promise import EmptyPromise
from nose.plugins.attrib import attr from nose.plugins.attrib import attr
from ...pages.studio.settings_advanced import AdvancedSettingsPage from common.test.acceptance.pages.studio.settings_advanced import AdvancedSettingsPage
from ...pages.studio.overview import CourseOutlinePage, ContainerPage, ExpandCollapseLinkState from common.test.acceptance.pages.studio.overview import CourseOutlinePage, ContainerPage, ExpandCollapseLinkState
from ...pages.studio.utils import add_discussion, drag, verify_ordering from common.test.acceptance.pages.studio.utils import add_discussion, drag, verify_ordering
from ...pages.lms.courseware import CoursewarePage from common.test.acceptance.pages.lms.courseware import CoursewarePage
from ...pages.lms.course_nav import CourseNavPage from common.test.acceptance.pages.lms.course_nav import CourseNavPage
from ...pages.lms.staff_view import StaffPage from common.test.acceptance.pages.lms.staff_view import StaffPage
from ...fixtures.config import ConfigModelFixture from common.test.acceptance.fixtures.config import ConfigModelFixture
from ...fixtures.course import XBlockFixtureDesc from common.test.acceptance.fixtures.course import XBlockFixtureDesc
from base_studio_test import StudioCourseTest from base_studio_test import StudioCourseTest
from ..helpers import load_data_str from common.test.acceptance.tests.helpers import load_data_str
from ...pages.lms.progress import ProgressPage from common.test.acceptance.pages.lms.progress import ProgressPage
SECTION_NAME = 'Test Section' SECTION_NAME = 'Test Section'
......
...@@ -6,11 +6,11 @@ import random ...@@ -6,11 +6,11 @@ import random
from bok_choy.promise import EmptyPromise from bok_choy.promise import EmptyPromise
from nose.tools import assert_in from nose.tools import assert_in
from ...pages.studio.index import DashboardPage from common.test.acceptance.pages.studio.index import DashboardPage
from ...pages.studio.course_rerun import CourseRerunPage from common.test.acceptance.pages.studio.course_rerun import CourseRerunPage
from ...pages.studio.overview import CourseOutlinePage from common.test.acceptance.pages.studio.overview import CourseOutlinePage
from ...pages.lms.courseware import CoursewarePage from common.test.acceptance.pages.lms.courseware import CoursewarePage
from ...fixtures.course import XBlockFixtureDesc from common.test.acceptance.fixtures.course import XBlockFixtureDesc
from base_studio_test import StudioCourseTest from base_studio_test import StudioCourseTest
......
...@@ -10,13 +10,13 @@ from nose.plugins.attrib import attr ...@@ -10,13 +10,13 @@ from nose.plugins.attrib import attr
from base_studio_test import StudioCourseTest from base_studio_test import StudioCourseTest
from bok_choy.promise import EmptyPromise 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 common.test.acceptance.tests.helpers import create_user_partition_json, element_has_text
from ...pages.studio.overview import CourseOutlinePage from common.test.acceptance.pages.studio.overview import CourseOutlinePage
from ...pages.studio.settings import SettingsPage from common.test.acceptance.pages.studio.settings import SettingsPage
from ...pages.studio.settings_advanced import AdvancedSettingsPage from common.test.acceptance.pages.studio.settings_advanced import AdvancedSettingsPage
from ...pages.studio.settings_group_configurations import GroupConfigurationsPage from common.test.acceptance.pages.studio.settings_group_configurations import GroupConfigurationsPage
from ...pages.lms.courseware import CoursewarePage from common.test.acceptance.pages.lms.courseware import CoursewarePage
from common.test.acceptance.pages.studio.utils import get_input_value from common.test.acceptance.pages.studio.utils import get_input_value
from textwrap import dedent from textwrap import dedent
from xmodule.partitions.partitions import Group from xmodule.partitions.partitions import Group
......
...@@ -6,11 +6,11 @@ import uuid ...@@ -6,11 +6,11 @@ import uuid
from nose.plugins.attrib import attr from nose.plugins.attrib import attr
from .base_studio_test import StudioCourseTest from common.test.acceptance.tests.studio.base_studio_test import StudioCourseTest
from ...pages.lms.create_mode import ModeCreationPage from common.test.acceptance.pages.lms.create_mode import ModeCreationPage
from ...pages.studio.settings_certificates import CertificatesPage from common.test.acceptance.pages.studio.settings_certificates import CertificatesPage
from ...pages.studio.settings_advanced import AdvancedSettingsPage from common.test.acceptance.pages.studio.settings_advanced import AdvancedSettingsPage
from ..helpers import skip_if_browser from common.test.acceptance.tests.helpers import skip_if_browser
@attr('shard_8') @attr('shard_8')
......
...@@ -6,12 +6,12 @@ from flaky import flaky ...@@ -6,12 +6,12 @@ from flaky import flaky
from nose.plugins.attrib import attr from nose.plugins.attrib import attr
from unittest import skip from unittest import skip
from ...fixtures.config import ConfigModelFixture from common.test.acceptance.fixtures.config import ConfigModelFixture
from ...fixtures.course import CourseFixture from common.test.acceptance.fixtures.course import CourseFixture
from ...pages.studio.settings import SettingsPage from common.test.acceptance.pages.studio.settings import SettingsPage
from ...pages.studio.overview import CourseOutlinePage from common.test.acceptance.pages.studio.overview import CourseOutlinePage
from ...tests.studio.base_studio_test import StudioCourseTest from common.test.acceptance.tests.studio.base_studio_test import StudioCourseTest
from ..helpers import ( from common.test.acceptance.tests.helpers import (
generate_course_key, generate_course_key,
select_option_by_value, select_option_by_value,
is_option_value_selected, is_option_value_selected,
......
...@@ -10,15 +10,15 @@ from selenium.webdriver.support.ui import Select ...@@ -10,15 +10,15 @@ from selenium.webdriver.support.ui import Select
from xmodule.partitions.partitions import Group from xmodule.partitions.partitions import Group
from bok_choy.promise import Promise, EmptyPromise from bok_choy.promise import Promise, EmptyPromise
from ...fixtures.course import XBlockFixtureDesc from common.test.acceptance.fixtures.course import XBlockFixtureDesc
from ...pages.studio.component_editor import ComponentEditorView from common.test.acceptance.pages.studio.component_editor import ComponentEditorView
from ...pages.studio.overview import CourseOutlinePage, CourseOutlineUnit from common.test.acceptance.pages.studio.overview import CourseOutlinePage, CourseOutlineUnit
from ...pages.studio.container import ContainerPage from common.test.acceptance.pages.studio.container import ContainerPage
from ...pages.studio.settings_group_configurations import GroupConfigurationsPage from common.test.acceptance.pages.studio.settings_group_configurations import GroupConfigurationsPage
from ...pages.studio.utils import add_advanced_component from common.test.acceptance.pages.studio.utils import add_advanced_component
from ...pages.xblock.utils import wait_for_xblock_initialization from common.test.acceptance.pages.xblock.utils import wait_for_xblock_initialization
from ...pages.lms.courseware import CoursewarePage from common.test.acceptance.pages.lms.courseware import CoursewarePage
from ..helpers import create_user_partition_json from common.test.acceptance.tests.helpers import create_user_partition_json
from base_studio_test import StudioCourseTest from base_studio_test import StudioCourseTest
......
...@@ -2,9 +2,9 @@ ...@@ -2,9 +2,9 @@
Acceptance tests for Studio related to the textbooks. Acceptance tests for Studio related to the textbooks.
""" """
from common.test.acceptance.tests.studio.base_studio_test import StudioCourseTest from common.test.acceptance.tests.studio.base_studio_test import StudioCourseTest
from ...pages.studio.textbook_upload import TextbookUploadPage from common.test.acceptance.pages.studio.textbook_upload import TextbookUploadPage
from ...pages.lms.textbook_view import TextbookViewPage from common.test.acceptance.pages.lms.textbook_view import TextbookViewPage
from ...tests.helpers import disable_animations from common.test.acceptance.tests.helpers import disable_animations
from nose.plugins.attrib import attr from nose.plugins.attrib import attr
......
...@@ -3,13 +3,13 @@ ...@@ -3,13 +3,13 @@
E2E tests for the LMS. E2E tests for the LMS.
""" """
from .helpers import UniqueCourseTest from common.test.acceptance.tests.helpers import UniqueCourseTest
from ..pages.studio.auto_auth import AutoAuthPage from common.test.acceptance.pages.studio.auto_auth import AutoAuthPage
from ..pages.lms.courseware import CoursewarePage from common.test.acceptance.pages.lms.courseware import CoursewarePage
from ..pages.lms.annotation_component import AnnotationComponentPage from common.test.acceptance.pages.lms.annotation_component import AnnotationComponentPage
from ..fixtures.course import CourseFixture, XBlockFixtureDesc from common.test.acceptance.fixtures.course import CourseFixture, XBlockFixtureDesc
from textwrap import dedent from textwrap import dedent
from ..tests.helpers import disable_animations from common.test.acceptance.tests.helpers import disable_animations
def _correctness(choice, target): def _correctness(choice, target):
......
...@@ -7,15 +7,15 @@ from nose.plugins.attrib import attr ...@@ -7,15 +7,15 @@ from nose.plugins.attrib import attr
from studio.base_studio_test import ContainerBase from studio.base_studio_test import ContainerBase
from ..pages.studio.settings_group_configurations import GroupConfigurationsPage from common.test.acceptance.pages.studio.settings_group_configurations import GroupConfigurationsPage
from ..pages.studio.auto_auth import AutoAuthPage as StudioAutoAuthPage from common.test.acceptance.pages.studio.auto_auth import AutoAuthPage as StudioAutoAuthPage
from ..fixtures.course import XBlockFixtureDesc from common.test.acceptance.fixtures.course import XBlockFixtureDesc
from ..fixtures import LMS_BASE_URL from common.test.acceptance.fixtures import LMS_BASE_URL
from ..pages.studio.component_editor import ComponentVisibilityEditorView from common.test.acceptance.pages.studio.component_editor import ComponentVisibilityEditorView
from ..pages.lms.instructor_dashboard import InstructorDashboardPage from common.test.acceptance.pages.lms.instructor_dashboard import InstructorDashboardPage
from ..pages.lms.courseware import CoursewarePage from common.test.acceptance.pages.lms.courseware import CoursewarePage
from ..pages.lms.auto_auth import AutoAuthPage as LmsAutoAuthPage from common.test.acceptance.pages.lms.auto_auth import AutoAuthPage as LmsAutoAuthPage
from ..tests.lms.test_lms_user_preview import verify_expected_problem_visibility from common.test.acceptance.tests.lms.test_lms_user_preview import verify_expected_problem_visibility
from bok_choy.promise import EmptyPromise from bok_choy.promise import EmptyPromise
from bok_choy.page_object import XSS_INJECTION from bok_choy.page_object import XSS_INJECTION
......
...@@ -4,7 +4,7 @@ ...@@ -4,7 +4,7 @@
Acceptance tests for CMS Video Editor. Acceptance tests for CMS Video Editor.
""" """
from nose.plugins.attrib import attr from nose.plugins.attrib import attr
from .test_studio_video_module import CMSVideoBaseTest from common.test.acceptance.tests.video.test_studio_video_module import CMSVideoBaseTest
@attr('shard_6') @attr('shard_6')
......
...@@ -8,11 +8,11 @@ import os ...@@ -8,11 +8,11 @@ import os
from mock import patch from mock import patch
from nose.plugins.attrib import attr from nose.plugins.attrib import attr
from unittest import skipIf from unittest import skipIf
from ...pages.studio.auto_auth import AutoAuthPage from common.test.acceptance.pages.studio.auto_auth import AutoAuthPage
from ...pages.studio.overview import CourseOutlinePage from common.test.acceptance.pages.studio.overview import CourseOutlinePage
from ...pages.studio.video.video import VideoComponentPage from common.test.acceptance.pages.studio.video.video import VideoComponentPage
from ...fixtures.course import CourseFixture, XBlockFixtureDesc from common.test.acceptance.fixtures.course import CourseFixture, XBlockFixtureDesc
from ..helpers import UniqueCourseTest, is_youtube_available, YouTubeStubConfig from common.test.acceptance.tests.helpers import UniqueCourseTest, is_youtube_available, YouTubeStubConfig
@skipIf(is_youtube_available() is False, 'YouTube is not available!') @skipIf(is_youtube_available() is False, 'YouTube is not available!')
......
...@@ -19,7 +19,7 @@ front-end validation will not pass. ...@@ -19,7 +19,7 @@ front-end validation will not pass.
t_not_exist - this file does not exist on YouTube; it exists locally t_not_exist - this file does not exist on YouTube; it exists locally
""" """
from nose.plugins.attrib import attr from nose.plugins.attrib import attr
from .test_studio_video_module import CMSVideoBaseTest from common.test.acceptance.tests.video.test_studio_video_module import CMSVideoBaseTest
@attr('shard_6') @attr('shard_6')
......
...@@ -5,9 +5,9 @@ import json ...@@ -5,9 +5,9 @@ import json
from nose.plugins.attrib import attr from nose.plugins.attrib import attr
import ddt import ddt
from ..helpers import EventsTestMixin from common.test.acceptance.tests.helpers import EventsTestMixin
from .test_video_module import VideoBaseTest from common.test.acceptance.tests.video.test_video_module import VideoBaseTest
from ...pages.lms.video.video import _parse_time_str from common.test.acceptance.pages.lms.video.video import _parse_time_str
from openedx.core.lib.tests.assertions.events import assert_event_matches, assert_events_equal from openedx.core.lib.tests.assertions.events import assert_event_matches, assert_events_equal
from opaque_keys.edx.keys import UsageKey, CourseKey from opaque_keys.edx.keys import UsageKey, CourseKey
......
...@@ -4,7 +4,7 @@ ...@@ -4,7 +4,7 @@
Acceptance tests for CMS Video Handout. Acceptance tests for CMS Video Handout.
""" """
from nose.plugins.attrib import attr from nose.plugins.attrib import attr
from .test_studio_video_module import CMSVideoBaseTest from common.test.acceptance.tests.video.test_studio_video_module import CMSVideoBaseTest
@attr('shard_5') @attr('shard_5')
......
...@@ -4,12 +4,12 @@ Acceptance tests for licensing of the Video module ...@@ -4,12 +4,12 @@ Acceptance tests for licensing of the Video module
""" """
from __future__ import unicode_literals from __future__ import unicode_literals
from nose.plugins.attrib import attr from nose.plugins.attrib import attr
from ..studio.base_studio_test import StudioCourseTest from common.test.acceptance.tests.studio.base_studio_test import StudioCourseTest
#from ..helpers import UniqueCourseTest #from common.test.acceptance.tests.helpers import UniqueCourseTest
from ...pages.studio.overview import CourseOutlinePage from common.test.acceptance.pages.studio.overview import CourseOutlinePage
from ...pages.lms.courseware import CoursewarePage from common.test.acceptance.pages.lms.courseware import CoursewarePage
from ...fixtures.course import XBlockFixtureDesc from common.test.acceptance.fixtures.course import XBlockFixtureDesc
@attr('shard_2') @attr('shard_2')
......
...@@ -10,15 +10,15 @@ from nose.plugins.attrib import attr ...@@ -10,15 +10,15 @@ from nose.plugins.attrib import attr
from unittest import skipIf, skip from unittest import skipIf, skip
from selenium.webdriver.common.by import By from selenium.webdriver.common.by import By
from selenium.webdriver.common.action_chains import ActionChains from selenium.webdriver.common.action_chains import ActionChains
from ..helpers import UniqueCourseTest, is_youtube_available, YouTubeStubConfig from common.test.acceptance.tests.helpers import UniqueCourseTest, is_youtube_available, YouTubeStubConfig
from ...pages.lms.video.video import VideoPage from common.test.acceptance.pages.lms.video.video import VideoPage
from ...pages.lms.tab_nav import TabNavPage from common.test.acceptance.pages.lms.tab_nav import TabNavPage
from ...pages.lms.courseware import CoursewarePage from common.test.acceptance.pages.lms.courseware import CoursewarePage
from ...pages.lms.course_nav import CourseNavPage from common.test.acceptance.pages.lms.course_nav import CourseNavPage
from ...pages.lms.auto_auth import AutoAuthPage from common.test.acceptance.pages.lms.auto_auth import AutoAuthPage
from ...pages.lms.course_info import CourseInfoPage from common.test.acceptance.pages.lms.course_info import CourseInfoPage
from ...fixtures.course import CourseFixture, XBlockFixtureDesc from common.test.acceptance.fixtures.course import CourseFixture, XBlockFixtureDesc
from ..helpers import skip_if_browser from common.test.acceptance.tests.helpers import skip_if_browser
from flaky import flaky from flaky import flaky
......
""" """
Acceptance tests for Video Times(Start, End and Finish) functionality. Acceptance tests for Video Times(Start, End and Finish) functionality.
""" """
from .test_video_module import VideoBaseTest from common.test.acceptance.tests.video.test_video_module import VideoBaseTest
class VideoTimesTest(VideoBaseTest): class VideoTimesTest(VideoBaseTest):
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment