Merge pull request #5043 from edx/christina/cohort-selector

Move tests into appropriate directory structure.

common/test/acceptance/tests/test_discussion.py → common/test/acceptance/tests/discussion/test_discussion.py

@@ -7,10 +7,10 @@ from pytz import UTC
 from uuid import uuid4
 from nose.plugins.attrib import attr
 
-from .helpers import UniqueCourseTest
-from ..pages.lms.auto_auth import AutoAuthPage
-from ..pages.lms.courseware import CoursewarePage
-from ..pages.lms.discussion import (
+from ..helpers import UniqueCourseTest
+from ...pages.lms.auto_auth import AutoAuthPage
+from ...pages.lms.courseware import CoursewarePage
+from ...pages.lms.discussion import (
     DiscussionTabSingleThreadPage,
     InlineDiscussionPage,
     InlineDiscussionThreadPage,
@@ -18,8 +18,8 @@ from ..pages.lms.discussion import (
     DiscussionTabHomePage,
     DiscussionSortPreferencePage,
 )
-from ..fixtures.course import CourseFixture, XBlockFixtureDesc
-from ..fixtures.discussion import (
+from ...fixtures.course import CourseFixture, XBlockFixtureDesc
+from ...fixtures.discussion import (
     SingleThreadViewFixture,
     UserProfileViewFixture,
     SearchResultFixture,

common/test/acceptance/tests/base_studio_test.py → common/test/acceptance/tests/studio/base_studio_test.py

-from ..pages.studio.auto_auth import AutoAuthPage
-from ..fixtures.course import CourseFixture
-from .helpers import UniqueCourseTest
-from ..pages.studio.overview import CourseOutlinePage
-from ..pages.studio.utils import verify_ordering
+from ...pages.studio.auto_auth import AutoAuthPage
+from ...fixtures.course import CourseFixture
+from ..helpers import UniqueCourseTest
+from ...pages.studio.overview import CourseOutlinePage
+from ...pages.studio.utils import verify_ordering
 
 
 class StudioCourseTest(UniqueCourseTest):

common/test/acceptance/tests/test_studio_acid_xblock.py → common/test/acceptance/tests/studio/test_studio_acid_xblock.py

@@ -4,10 +4,10 @@ Acceptance tests for Studio related to the acid xblock.
 from unittest import skip
 from bok_choy.web_app_test import WebAppTest
 
-from ..pages.studio.auto_auth import AutoAuthPage
-from ..pages.studio.overview import CourseOutlinePage
-from ..pages.xblock.acid import AcidView
-from ..fixtures.course import CourseFixture, XBlockFixtureDesc
+from ...pages.studio.auto_auth import AutoAuthPage
+from ...pages.studio.overview import CourseOutlinePage
+from ...pages.xblock.acid import AcidView
+from ...fixtures.course import CourseFixture, XBlockFixtureDesc
 
 
 class XBlockAcidBase(WebAppTest):

common/test/acceptance/tests/test_studio_bad_data.py → common/test/acceptance/tests/studio/test_studio_bad_data.py

-from .base_studio_test import ContainerBase
-from ..fixtures.course import XBlockFixtureDesc
-from ..pages.studio.utils import verify_ordering
+from base_studio_test import ContainerBase
+from ...fixtures.course import XBlockFixtureDesc
+from ...pages.studio.utils import verify_ordering
 
 
 class BadComponentTest(ContainerBase):

common/test/acceptance/tests/test_studio_container.py → common/test/acceptance/tests/studio/test_studio_container.py

@@ -5,16 +5,16 @@ displaying containers within units.
 """
 from nose.plugins.attrib import attr
 
-from ..fixtures.course import XBlockFixtureDesc
-from ..pages.studio.component_editor import ComponentEditorView
-from ..pages.studio.html_component_editor import HtmlComponentEditorView
-from ..pages.studio.utils import add_discussion, drag
-from ..pages.lms.courseware import CoursewarePage
-from ..pages.lms.staff_view import StaffPage
+from ...fixtures.course import XBlockFixtureDesc
+from ...pages.studio.component_editor import ComponentEditorView
+from ...pages.studio.html_component_editor import HtmlComponentEditorView
+from ...pages.studio.utils import add_discussion, drag
+from ...pages.lms.courseware import CoursewarePage
+from ...pages.lms.staff_view import StaffPage
 
 import datetime
 from bok_choy.promise import Promise, EmptyPromise
-from .base_studio_test import ContainerBase
+from base_studio_test import ContainerBase
 
 
 class NestedVerticalTest(ContainerBase):

common/test/acceptance/tests/test_studio_general.py → common/test/acceptance/tests/studio/test_studio_general.py

@@ -5,26 +5,26 @@ Acceptance tests for Studio.
 from unittest import skip
 from bok_choy.web_app_test import WebAppTest
 
-from ..pages.studio.asset_index import AssetIndexPage
-from ..pages.studio.auto_auth import AutoAuthPage
-from ..pages.studio.checklists import ChecklistsPage
-from ..pages.studio.course_import import ImportPage
-from ..pages.studio.course_info import CourseUpdatesPage
-from ..pages.studio.edit_tabs import PagesPage
-from ..pages.studio.export import ExportPage
-from ..pages.studio.howitworks import HowitworksPage
-from ..pages.studio.index import DashboardPage
-from ..pages.studio.login import LoginPage
-from ..pages.studio.manage_users import CourseTeamPage
-from ..pages.studio.overview import CourseOutlinePage
-from ..pages.studio.settings import SettingsPage
-from ..pages.studio.settings_advanced import AdvancedSettingsPage
-from ..pages.studio.settings_graders import GradingPage
-from ..pages.studio.signup import SignupPage
-from ..pages.studio.textbooks import TextbooksPage
-from ..fixtures.course import XBlockFixtureDesc
-
-from .base_studio_test import StudioCourseTest
+from ...pages.studio.asset_index import AssetIndexPage
+from ...pages.studio.auto_auth import AutoAuthPage
+from ...pages.studio.checklists import ChecklistsPage
+from ...pages.studio.course_import import ImportPage
+from ...pages.studio.course_info import CourseUpdatesPage
+from ...pages.studio.edit_tabs import PagesPage
+from ...pages.studio.export import ExportPage
+from ...pages.studio.howitworks import HowitworksPage
+from ...pages.studio.index import DashboardPage
+from ...pages.studio.login import LoginPage
+from ...pages.studio.manage_users import CourseTeamPage
+from ...pages.studio.overview import CourseOutlinePage
+from ...pages.studio.settings import SettingsPage
+from ...pages.studio.settings_advanced import AdvancedSettingsPage
+from ...pages.studio.settings_graders import GradingPage
+from ...pages.studio.signup import SignupPage
+from ...pages.studio.textbooks import TextbooksPage
+from ...fixtures.course import XBlockFixtureDesc
+
+from base_studio_test import StudioCourseTest
 
 
 class LoggedOutTest(WebAppTest):

common/test/acceptance/tests/test_studio_outline.py → common/test/acceptance/tests/studio/test_studio_outline.py

@@ -6,16 +6,16 @@ import itertools
 from pytz import UTC
 from bok_choy.promise import EmptyPromise
 
-from ..pages.studio.overview import CourseOutlinePage, ContainerPage, ExpandCollapseLinkState
-from ..pages.studio.utils import add_discussion, drag, verify_ordering
-from ..pages.lms.courseware import CoursewarePage
-from ..pages.lms.course_nav import CourseNavPage
-from ..pages.lms.staff_view import StaffPage
-from ..fixtures.course import XBlockFixtureDesc
-
-from .base_studio_test import StudioCourseTest
-from .helpers import load_data_str
-from ..pages.lms.progress import ProgressPage
+from ...pages.studio.overview import CourseOutlinePage, ContainerPage, ExpandCollapseLinkState
+from ...pages.studio.utils import add_discussion, drag, verify_ordering
+from ...pages.lms.courseware import CoursewarePage
+from ...pages.lms.course_nav import CourseNavPage
+from ...pages.lms.staff_view import StaffPage
+from ...fixtures.course import XBlockFixtureDesc
+
+from base_studio_test import StudioCourseTest
+from ..helpers import load_data_str
+from ...pages.lms.progress import ProgressPage
 
 
 SECTION_NAME = 'Test Section'

common/test/acceptance/tests/test_studio_rerun.py → common/test/acceptance/tests/studio/test_studio_rerun.py

@@ -5,13 +5,13 @@ Acceptance tests for Studio related to course reruns.
 import random
 from bok_choy.promise import EmptyPromise
 
-from ..pages.studio.index import DashboardPage
-from ..pages.studio.course_rerun import CourseRerunPage
-from ..pages.studio.overview import CourseOutlinePage
-from ..pages.lms.courseware import CoursewarePage
-from ..fixtures.course import XBlockFixtureDesc
+from ...pages.studio.index import DashboardPage
+from ...pages.studio.course_rerun import CourseRerunPage
+from ...pages.studio.overview import CourseOutlinePage
+from ...pages.lms.courseware import CoursewarePage
+from ...fixtures.course import XBlockFixtureDesc
 
-from .base_studio_test import StudioCourseTest
+from base_studio_test import StudioCourseTest
 
 
 class CourseRerunTest(StudioCourseTest):

common/test/acceptance/tests/test_studio_settings.py → common/test/acceptance/tests/studio/test_studio_settings.py

@@ -4,9 +4,9 @@ Acceptance tests for Studio's Setting pages
 
 from nose.plugins.attrib import attr
 
-from acceptance.tests.base_studio_test import StudioCourseTest
+from base_studio_test import StudioCourseTest
 
-from ..pages.studio.settings_advanced import AdvancedSettingsPage
+from ...pages.studio.settings_advanced import AdvancedSettingsPage
 
 
 @attr('shard_1')

common/test/acceptance/tests/test_studio_split_test.py → common/test/acceptance/tests/studio/test_studio_split_test.py

@@ -11,17 +11,17 @@ from selenium.webdriver.support.ui import Select
 from xmodule.partitions.partitions import Group, UserPartition
 from bok_choy.promise import Promise, EmptyPromise
 
-from ..fixtures.course import XBlockFixtureDesc
-from ..pages.studio.component_editor import ComponentEditorView
-from ..pages.studio.overview import CourseOutlinePage, CourseOutlineUnit
-from ..pages.studio.settings_advanced import AdvancedSettingsPage
-from ..pages.studio.container import ContainerPage
-from ..pages.studio.settings_group_configurations import GroupConfigurationsPage
-from ..pages.studio.utils import add_advanced_component
-from ..pages.xblock.utils import wait_for_xblock_initialization
-from ..pages.lms.courseware import CoursewarePage
-
-from .base_studio_test import StudioCourseTest
+from ...fixtures.course import XBlockFixtureDesc
+from ...pages.studio.component_editor import ComponentEditorView
+from ...pages.studio.overview import CourseOutlinePage, CourseOutlineUnit
+from ...pages.studio.settings_advanced import AdvancedSettingsPage
+from ...pages.studio.container import ContainerPage
+from ...pages.studio.settings_group_configurations import GroupConfigurationsPage
+from ...pages.studio.utils import add_advanced_component
+from ...pages.xblock.utils import wait_for_xblock_initialization
+from ...pages.lms.courseware import CoursewarePage
+
+from base_studio_test import StudioCourseTest
 
 from test_studio_container import ContainerBase
 

common/test/acceptance/tests/test_studio_with_ora_component.py → common/test/acceptance/tests/studio/test_studio_with_ora_component.py

@@ -2,12 +2,12 @@
 Acceptance tests for Studio related to edit/save peer grading interface.
 """
 
-from ..fixtures.course import XBlockFixtureDesc
-from ..pages.studio.export import ExportPage
-from ..pages.studio.component_editor import ComponentEditorView
-from ..pages.studio.overview import CourseOutlinePage
-from .base_studio_test import StudioCourseTest
-from .helpers import load_data_str
+from ...fixtures.course import XBlockFixtureDesc
+from ...pages.studio.export import ExportPage
+from ...pages.studio.component_editor import ComponentEditorView
+from ...pages.studio.overview import CourseOutlinePage
+from base_studio_test import StudioCourseTest
+from ..helpers import load_data_str
 
 
 class ORAComponentTest(StudioCourseTest):