Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
E
edx-platform
Overview
Overview
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
edx
edx-platform
Commits
29bb5b50
Commit
29bb5b50
authored
Jul 27, 2016
by
Shauna Gordon-McKeon
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Switch relative to absolute urls in imports (video, discussion, misc)
parent
5d50e76e
Hide whitespace changes
Inline
Side-by-side
Showing
15 changed files
with
72 additions
and
71 deletions
+72
-71
common/test/acceptance/tests/discussion/helpers.py
+5
-5
common/test/acceptance/tests/discussion/test_cohort_management.py
+6
-6
common/test/acceptance/tests/discussion/test_cohorts.py
+8
-8
common/test/acceptance/tests/discussion/test_discussion.py
+11
-10
common/test/acceptance/tests/helpers.py
+1
-1
common/test/acceptance/tests/test_annotatable.py
+6
-6
common/test/acceptance/tests/test_cohorted_courseware.py
+9
-9
common/test/acceptance/tests/video/test_studio_video_editor.py
+1
-1
common/test/acceptance/tests/video/test_studio_video_module.py
+5
-5
common/test/acceptance/tests/video/test_studio_video_transcript.py
+1
-1
common/test/acceptance/tests/video/test_video_events.py
+3
-3
common/test/acceptance/tests/video/test_video_handout.py
+1
-1
common/test/acceptance/tests/video/test_video_license.py
+5
-5
common/test/acceptance/tests/video/test_video_module.py
+9
-9
common/test/acceptance/tests/video/test_video_times.py
+1
-1
No files found.
common/test/acceptance/tests/discussion/helpers.py
View file @
29bb5b50
...
...
@@ -5,15 +5,15 @@ Helper functions and classes for discussion tests.
from
uuid
import
uuid4
import
json
from
..
.fixtures
import
LMS_BASE_URL
from
..
.fixtures.course
import
CourseFixture
from
..
.fixtures.discussion
import
(
from
common.test.acceptance
.fixtures
import
LMS_BASE_URL
from
common.test.acceptance
.fixtures.course
import
CourseFixture
from
common.test.acceptance
.fixtures.discussion
import
(
SingleThreadViewFixture
,
Thread
,
Response
,
)
from
..
.pages.lms.discussion
import
DiscussionTabSingleThreadPage
from
..
.tests.helpers
import
UniqueCourseTest
from
common.test.acceptance
.pages.lms.discussion
import
DiscussionTabSingleThreadPage
from
common.test.acceptance
.tests.helpers
import
UniqueCourseTest
class
BaseDiscussionMixin
(
object
):
...
...
common/test/acceptance/tests/discussion/test_cohort_management.py
View file @
29bb5b50
...
...
@@ -8,13 +8,13 @@ from datetime import datetime
from
pytz
import
UTC
,
utc
from
bok_choy.promise
import
EmptyPromise
from
nose.plugins.attrib
import
attr
from
.helpers
import
CohortTestMixin
from
.
.helpers
import
UniqueCourseTest
,
EventsTestMixin
,
create_user_partition_json
from
common.test.acceptance.tests.discussion
.helpers
import
CohortTestMixin
from
common.test.acceptance.tests
.helpers
import
UniqueCourseTest
,
EventsTestMixin
,
create_user_partition_json
from
xmodule.partitions.partitions
import
Group
from
..
.fixtures.course
import
CourseFixture
,
XBlockFixtureDesc
from
..
.pages.lms.auto_auth
import
AutoAuthPage
from
..
.pages.lms.instructor_dashboard
import
InstructorDashboardPage
,
DataDownloadPage
from
..
.pages.studio.settings_group_configurations
import
GroupConfigurationsPage
from
common.test.acceptance
.fixtures.course
import
CourseFixture
,
XBlockFixtureDesc
from
common.test.acceptance
.pages.lms.auto_auth
import
AutoAuthPage
from
common.test.acceptance
.pages.lms.instructor_dashboard
import
InstructorDashboardPage
,
DataDownloadPage
from
common.test.acceptance
.pages.studio.settings_group_configurations
import
GroupConfigurationsPage
import
os
import
unicodecsv
...
...
common/test/acceptance/tests/discussion/test_cohorts.py
View file @
29bb5b50
...
...
@@ -3,14 +3,14 @@ Tests related to the cohorting feature.
"""
from
uuid
import
uuid4
from
.helpers
import
BaseDiscussionMixin
,
BaseDiscussionTestCase
from
.helpers
import
CohortTestMixin
from
.
.helpers
import
UniqueCourseTest
from
..
.pages.lms.auto_auth
import
AutoAuthPage
from
..
.fixtures.course
import
(
CourseFixture
,
XBlockFixtureDesc
)
from
..
.pages.lms.discussion
import
(
DiscussionTabSingleThreadPage
,
InlineDiscussionThreadPage
,
InlineDiscussionPage
)
from
..
.pages.lms.courseware
import
CoursewarePage
from
common.test.acceptance.tests.discussion
.helpers
import
BaseDiscussionMixin
,
BaseDiscussionTestCase
from
common.test.acceptance.tests.discussion
.helpers
import
CohortTestMixin
from
common.test.acceptance.tests
.helpers
import
UniqueCourseTest
from
common.test.acceptance
.pages.lms.auto_auth
import
AutoAuthPage
from
common.test.acceptance
.fixtures.course
import
(
CourseFixture
,
XBlockFixtureDesc
)
from
common.test.acceptance
.pages.lms.discussion
import
(
DiscussionTabSingleThreadPage
,
InlineDiscussionThreadPage
,
InlineDiscussionPage
)
from
common.test.acceptance
.pages.lms.courseware
import
CoursewarePage
from
nose.plugins.attrib
import
attr
...
...
common/test/acceptance/tests/discussion/test_discussion.py
View file @
29bb5b50
...
...
@@ -8,11 +8,11 @@ from uuid import uuid4
from
nose.plugins.attrib
import
attr
from
pytz
import
UTC
from
.helpers
import
BaseDiscussionTestCase
from
.
.helpers
import
UniqueCourseTest
from
..
.pages.lms.auto_auth
import
AutoAuthPage
from
..
.pages.lms.courseware
import
CoursewarePage
from
..
.pages.lms.discussion
import
(
from
common.test.acceptance.tests.discussion
.helpers
import
BaseDiscussionTestCase
from
common.test.acceptance.tests
.helpers
import
UniqueCourseTest
from
common.test.acceptance
.pages.lms.auto_auth
import
AutoAuthPage
from
common.test.acceptance
.pages.lms.courseware
import
CoursewarePage
from
common.test.acceptance
.pages.lms.discussion
import
(
DiscussionTabSingleThreadPage
,
InlineDiscussionPage
,
InlineDiscussionThreadPage
,
...
...
@@ -20,10 +20,10 @@ from ...pages.lms.discussion import (
DiscussionTabHomePage
,
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
..
.fixtures.discussion
import
(
from
common.test.acceptance
.fixtures.course
import
CourseFixture
,
XBlockFixtureDesc
from
common.test.acceptance
.fixtures.discussion
import
(
SingleThreadViewFixture
,
UserProfileViewFixture
,
SearchResultFixture
,
...
...
@@ -33,8 +33,9 @@ from ...fixtures.discussion import (
SearchResult
,
MultipleThreadFixture
)
from
.helpers
import
BaseDiscussionMixin
from
..helpers
import
skip_if_browser
from
common.test.acceptance.tests.discussion.helpers
import
BaseDiscussionMixin
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
...
...
common/test/acceptance/tests/helpers.py
View file @
29bb5b50
...
...
@@ -29,7 +29,7 @@ from selenium.webdriver.support import expected_conditions as EC
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
...
...
common/test/acceptance/tests/test_annotatable.py
View file @
29bb5b50
...
...
@@ -3,13 +3,13 @@
E2E tests for the LMS.
"""
from
.helpers
import
UniqueCourseTest
from
.
.pages.studio.auto_auth
import
AutoAuthPage
from
.
.pages.lms.courseware
import
CoursewarePage
from
.
.pages.lms.annotation_component
import
AnnotationComponentPage
from
.
.fixtures.course
import
CourseFixture
,
XBlockFixtureDesc
from
common.test.acceptance.tests
.helpers
import
UniqueCourseTest
from
common.test.acceptance
.pages.studio.auto_auth
import
AutoAuthPage
from
common.test.acceptance
.pages.lms.courseware
import
CoursewarePage
from
common.test.acceptance
.pages.lms.annotation_component
import
AnnotationComponentPage
from
common.test.acceptance
.fixtures.course
import
CourseFixture
,
XBlockFixtureDesc
from
textwrap
import
dedent
from
.
.tests.helpers
import
disable_animations
from
common.test.acceptance
.tests.helpers
import
disable_animations
def
_correctness
(
choice
,
target
):
...
...
common/test/acceptance/tests/test_cohorted_courseware.py
View file @
29bb5b50
...
...
@@ -7,15 +7,15 @@ from nose.plugins.attrib import attr
from
studio.base_studio_test
import
ContainerBase
from
.
.pages.studio.settings_group_configurations
import
GroupConfigurationsPage
from
.
.pages.studio.auto_auth
import
AutoAuthPage
as
StudioAutoAuthPage
from
.
.fixtures.course
import
XBlockFixtureDesc
from
.
.fixtures
import
LMS_BASE_URL
from
.
.pages.studio.component_editor
import
ComponentVisibilityEditorView
from
.
.pages.lms.instructor_dashboard
import
InstructorDashboardPage
from
.
.pages.lms.courseware
import
CoursewarePage
from
.
.pages.lms.auto_auth
import
AutoAuthPage
as
LmsAutoAuthPage
from
.
.tests.lms.test_lms_user_preview
import
verify_expected_problem_visibility
from
common.test.acceptance
.pages.studio.settings_group_configurations
import
GroupConfigurationsPage
from
common.test.acceptance
.pages.studio.auto_auth
import
AutoAuthPage
as
StudioAutoAuthPage
from
common.test.acceptance
.fixtures.course
import
XBlockFixtureDesc
from
common.test.acceptance
.fixtures
import
LMS_BASE_URL
from
common.test.acceptance
.pages.studio.component_editor
import
ComponentVisibilityEditorView
from
common.test.acceptance
.pages.lms.instructor_dashboard
import
InstructorDashboardPage
from
common.test.acceptance
.pages.lms.courseware
import
CoursewarePage
from
common.test.acceptance
.pages.lms.auto_auth
import
AutoAuthPage
as
LmsAutoAuthPage
from
common.test.acceptance
.tests.lms.test_lms_user_preview
import
verify_expected_problem_visibility
from
bok_choy.promise
import
EmptyPromise
from
bok_choy.page_object
import
XSS_INJECTION
...
...
common/test/acceptance/tests/video/test_studio_video_editor.py
View file @
29bb5b50
...
...
@@ -4,7 +4,7 @@
Acceptance tests for CMS Video Editor.
"""
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'
)
...
...
common/test/acceptance/tests/video/test_studio_video_module.py
View file @
29bb5b50
...
...
@@ -8,11 +8,11 @@ import os
from
mock
import
patch
from
nose.plugins.attrib
import
attr
from
unittest
import
skipIf
from
..
.pages.studio.auto_auth
import
AutoAuthPage
from
..
.pages.studio.overview
import
CourseOutlinePage
from
..
.pages.studio.video.video
import
VideoComponentPage
from
..
.fixtures.course
import
CourseFixture
,
XBlockFixtureDesc
from
.
.helpers
import
UniqueCourseTest
,
is_youtube_available
,
YouTubeStubConfig
from
common.test.acceptance
.pages.studio.auto_auth
import
AutoAuthPage
from
common.test.acceptance
.pages.studio.overview
import
CourseOutlinePage
from
common.test.acceptance
.pages.studio.video.video
import
VideoComponentPage
from
common.test.acceptance
.fixtures.course
import
CourseFixture
,
XBlockFixtureDesc
from
common.test.acceptance.tests
.helpers
import
UniqueCourseTest
,
is_youtube_available
,
YouTubeStubConfig
@skipIf
(
is_youtube_available
()
is
False
,
'YouTube is not available!'
)
...
...
common/test/acceptance/tests/video/test_studio_video_transcript.py
View file @
29bb5b50
...
...
@@ -19,7 +19,7 @@ front-end validation will not pass.
t_not_exist - this file does not exist on YouTube; it exists locally
"""
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'
)
...
...
common/test/acceptance/tests/video/test_video_events.py
View file @
29bb5b50
...
...
@@ -5,9 +5,9 @@ import json
from
nose.plugins.attrib
import
attr
import
ddt
from
.
.helpers
import
EventsTestMixin
from
.test_video_module
import
VideoBaseTest
from
..
.pages.lms.video.video
import
_parse_time_str
from
common.test.acceptance.tests
.helpers
import
EventsTestMixin
from
common.test.acceptance.tests.video
.test_video_module
import
VideoBaseTest
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
opaque_keys.edx.keys
import
UsageKey
,
CourseKey
...
...
common/test/acceptance/tests/video/test_video_handout.py
View file @
29bb5b50
...
...
@@ -4,7 +4,7 @@
Acceptance tests for CMS Video Handout.
"""
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'
)
...
...
common/test/acceptance/tests/video/test_video_license.py
View file @
29bb5b50
...
...
@@ -4,12 +4,12 @@ Acceptance tests for licensing of the Video module
"""
from
__future__
import
unicode_literals
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
..
.pages.studio.overview
import
CourseOutlinePage
from
..
.pages.lms.courseware
import
CoursewarePage
from
..
.fixtures.course
import
XBlockFixtureDesc
#from
common.test.acceptance.tests
.helpers import UniqueCourseTest
from
common.test.acceptance
.pages.studio.overview
import
CourseOutlinePage
from
common.test.acceptance
.pages.lms.courseware
import
CoursewarePage
from
common.test.acceptance
.fixtures.course
import
XBlockFixtureDesc
@attr
(
'shard_2'
)
...
...
common/test/acceptance/tests/video/test_video_module.py
View file @
29bb5b50
...
...
@@ -10,15 +10,15 @@ from nose.plugins.attrib import attr
from
unittest
import
skipIf
,
skip
from
selenium.webdriver.common.by
import
By
from
selenium.webdriver.common.action_chains
import
ActionChains
from
.
.helpers
import
UniqueCourseTest
,
is_youtube_available
,
YouTubeStubConfig
from
..
.pages.lms.video.video
import
VideoPage
from
..
.pages.lms.tab_nav
import
TabNavPage
from
..
.pages.lms.courseware
import
CoursewarePage
from
..
.pages.lms.course_nav
import
CourseNavPage
from
..
.pages.lms.auto_auth
import
AutoAuthPage
from
..
.pages.lms.course_info
import
CourseInfoPage
from
..
.fixtures.course
import
CourseFixture
,
XBlockFixtureDesc
from
.
.helpers
import
skip_if_browser
from
common.test.acceptance.tests
.helpers
import
UniqueCourseTest
,
is_youtube_available
,
YouTubeStubConfig
from
common.test.acceptance
.pages.lms.video.video
import
VideoPage
from
common.test.acceptance
.pages.lms.tab_nav
import
TabNavPage
from
common.test.acceptance
.pages.lms.courseware
import
CoursewarePage
from
common.test.acceptance
.pages.lms.course_nav
import
CourseNavPage
from
common.test.acceptance
.pages.lms.auto_auth
import
AutoAuthPage
from
common.test.acceptance
.pages.lms.course_info
import
CourseInfoPage
from
common.test.acceptance
.fixtures.course
import
CourseFixture
,
XBlockFixtureDesc
from
common.test.acceptance.tests
.helpers
import
skip_if_browser
from
flaky
import
flaky
...
...
common/test/acceptance/tests/video/test_video_times.py
View file @
29bb5b50
"""
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
):
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment