Commit 29bb5b50 by Shauna Gordon-McKeon

Switch relative to absolute urls in imports (video, discussion, misc)

parent 5d50e76e
...@@ -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,14 @@ Tests related to the cohorting feature. ...@@ -3,14 +3,14 @@ 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 (DiscussionTabSingleThreadPage, InlineDiscussionThreadPage, InlineDiscussionPage)
from ...pages.lms.courseware import CoursewarePage 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,9 @@ from ...fixtures.discussion import ( ...@@ -33,8 +33,9 @@ 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
......
...@@ -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