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
c0264ca8
Commit
c0264ca8
authored
Jul 29, 2014
by
Christine Lytwynec
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
add shard_1 flags to cms bok-choy tests
parent
c7df52c5
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
21 additions
and
2 deletions
+21
-2
common/test/acceptance/tests/test_studio_acid_xblock.py
+4
-1
common/test/acceptance/tests/test_studio_container.py
+7
-1
common/test/acceptance/tests/test_studio_general.py
+6
-0
common/test/acceptance/tests/test_studio_split_test.py
+4
-0
No files found.
common/test/acceptance/tests/test_studio_acid_xblock.py
View file @
c0264ca8
...
@@ -2,7 +2,7 @@
...
@@ -2,7 +2,7 @@
Acceptance tests for Studio related to the acid xblock.
Acceptance tests for Studio related to the acid xblock.
"""
"""
from
unittest
import
skip
from
unittest
import
skip
from
nose.plugins.attrib
import
attr
from
bok_choy.web_app_test
import
WebAppTest
from
bok_choy.web_app_test
import
WebAppTest
from
..pages.studio.auto_auth
import
AutoAuthPage
from
..pages.studio.auto_auth
import
AutoAuthPage
...
@@ -11,6 +11,7 @@ from ..pages.xblock.acid import AcidView
...
@@ -11,6 +11,7 @@ from ..pages.xblock.acid import AcidView
from
..fixtures.course
import
CourseFixture
,
XBlockFixtureDesc
from
..fixtures.course
import
CourseFixture
,
XBlockFixtureDesc
@attr
(
'shard_1'
)
class
XBlockAcidBase
(
WebAppTest
):
class
XBlockAcidBase
(
WebAppTest
):
"""
"""
Base class for tests that verify that XBlock integration is working correctly
Base class for tests that verify that XBlock integration is working correctly
...
@@ -121,6 +122,7 @@ class XBlockAcidNoChildTest(XBlockAcidBase):
...
@@ -121,6 +122,7 @@ class XBlockAcidNoChildTest(XBlockAcidBase):
self
.
user
=
course_fix
.
user
self
.
user
=
course_fix
.
user
@attr
(
'shard_1'
)
class
XBlockAcidParentBase
(
XBlockAcidBase
):
class
XBlockAcidParentBase
(
XBlockAcidBase
):
"""
"""
Base class for tests that verify that parent XBlock integration is working correctly
Base class for tests that verify that parent XBlock integration is working correctly
...
@@ -178,6 +180,7 @@ class XBlockAcidEmptyParentTest(XBlockAcidParentBase):
...
@@ -178,6 +180,7 @@ class XBlockAcidEmptyParentTest(XBlockAcidParentBase):
self
.
user
=
course_fix
.
user
self
.
user
=
course_fix
.
user
@attr
(
'shard_1'
)
class
XBlockAcidChildTest
(
XBlockAcidParentBase
):
class
XBlockAcidChildTest
(
XBlockAcidParentBase
):
"""
"""
Tests of an AcidBlock with children
Tests of an AcidBlock with children
...
...
common/test/acceptance/tests/test_studio_container.py
View file @
c0264ca8
"""
"""
Acceptance tests for Studio related to the container page.
Acceptance tests for Studio related to the container page.
"""
"""
from
nose.plugins.attrib
import
attr
from
..pages.studio.overview
import
CourseOutlinePage
from
..pages.studio.overview
import
CourseOutlinePage
from
..fixtures.course
import
XBlockFixtureDesc
from
..fixtures.course
import
XBlockFixtureDesc
...
@@ -9,10 +10,10 @@ from ..pages.studio.component_editor import ComponentEditorView
...
@@ -9,10 +10,10 @@ from ..pages.studio.component_editor import ComponentEditorView
from
..pages.studio.utils
import
add_discussion
from
..pages.studio.utils
import
add_discussion
from
unittest
import
skip
from
unittest
import
skip
from
acceptance.tests.base_studio_test
import
StudioCourseTest
from
acceptance.tests.base_studio_test
import
StudioCourseTest
@attr
(
'shard_1'
)
class
ContainerBase
(
StudioCourseTest
):
class
ContainerBase
(
StudioCourseTest
):
"""
"""
Base class for tests that do operations on the container page.
Base class for tests that do operations on the container page.
...
@@ -143,6 +144,7 @@ class NestedVerticalTest(ContainerBase):
...
@@ -143,6 +144,7 @@ class NestedVerticalTest(ContainerBase):
)
)
@attr
(
'shard_1'
)
class
DragAndDropTest
(
NestedVerticalTest
):
class
DragAndDropTest
(
NestedVerticalTest
):
"""
"""
Tests of reordering within the container page.
Tests of reordering within the container page.
...
@@ -224,6 +226,7 @@ class DragAndDropTest(NestedVerticalTest):
...
@@ -224,6 +226,7 @@ class DragAndDropTest(NestedVerticalTest):
self
.
do_action_and_verify
(
add_new_components_and_rearrange
,
expected_ordering
)
self
.
do_action_and_verify
(
add_new_components_and_rearrange
,
expected_ordering
)
@attr
(
'shard_1'
)
class
AddComponentTest
(
NestedVerticalTest
):
class
AddComponentTest
(
NestedVerticalTest
):
"""
"""
Tests of adding a component to the container page.
Tests of adding a component to the container page.
...
@@ -264,6 +267,7 @@ class AddComponentTest(NestedVerticalTest):
...
@@ -264,6 +267,7 @@ class AddComponentTest(NestedVerticalTest):
self
.
add_and_verify
(
container_menu
,
expected_ordering
)
self
.
add_and_verify
(
container_menu
,
expected_ordering
)
@attr
(
'shard_1'
)
class
DuplicateComponentTest
(
NestedVerticalTest
):
class
DuplicateComponentTest
(
NestedVerticalTest
):
"""
"""
Tests of duplicating a component on the container page.
Tests of duplicating a component on the container page.
...
@@ -310,6 +314,7 @@ class DuplicateComponentTest(NestedVerticalTest):
...
@@ -310,6 +314,7 @@ class DuplicateComponentTest(NestedVerticalTest):
self
.
do_action_and_verify
(
duplicate_twice
,
expected_ordering
)
self
.
do_action_and_verify
(
duplicate_twice
,
expected_ordering
)
@attr
(
'shard_1'
)
class
DeleteComponentTest
(
NestedVerticalTest
):
class
DeleteComponentTest
(
NestedVerticalTest
):
"""
"""
Tests of deleting a component from the container page.
Tests of deleting a component from the container page.
...
@@ -333,6 +338,7 @@ class DeleteComponentTest(NestedVerticalTest):
...
@@ -333,6 +338,7 @@ class DeleteComponentTest(NestedVerticalTest):
self
.
delete_and_verify
(
group_a_item_1_delete_index
,
expected_ordering
)
self
.
delete_and_verify
(
group_a_item_1_delete_index
,
expected_ordering
)
@attr
(
'shard_1'
)
class
EditContainerTest
(
NestedVerticalTest
):
class
EditContainerTest
(
NestedVerticalTest
):
"""
"""
Tests of editing a container.
Tests of editing a container.
...
...
common/test/acceptance/tests/test_studio_general.py
View file @
c0264ca8
...
@@ -4,6 +4,7 @@ Acceptance tests for Studio.
...
@@ -4,6 +4,7 @@ Acceptance tests for Studio.
from
unittest
import
skip
from
unittest
import
skip
from
bok_choy.web_app_test
import
WebAppTest
from
bok_choy.web_app_test
import
WebAppTest
from
nose.plugins.attrib
import
attr
from
..pages.studio.asset_index
import
AssetIndexPage
from
..pages.studio.asset_index
import
AssetIndexPage
from
..pages.studio.auto_auth
import
AutoAuthPage
from
..pages.studio.auto_auth
import
AutoAuthPage
...
@@ -27,6 +28,7 @@ from ..fixtures.course import XBlockFixtureDesc
...
@@ -27,6 +28,7 @@ from ..fixtures.course import XBlockFixtureDesc
from
acceptance.tests.base_studio_test
import
StudioCourseTest
from
acceptance.tests.base_studio_test
import
StudioCourseTest
@attr
(
'shard_1'
)
class
LoggedOutTest
(
WebAppTest
):
class
LoggedOutTest
(
WebAppTest
):
"""
"""
Smoke test for pages in Studio that are visible when logged out.
Smoke test for pages in Studio that are visible when logged out.
...
@@ -46,6 +48,7 @@ class LoggedOutTest(WebAppTest):
...
@@ -46,6 +48,7 @@ class LoggedOutTest(WebAppTest):
page
.
visit
()
page
.
visit
()
@attr
(
'shard_1'
)
class
LoggedInPagesTest
(
WebAppTest
):
class
LoggedInPagesTest
(
WebAppTest
):
"""
"""
Tests that verify the pages in Studio that you can get to when logged
Tests that verify the pages in Studio that you can get to when logged
...
@@ -65,6 +68,7 @@ class LoggedInPagesTest(WebAppTest):
...
@@ -65,6 +68,7 @@ class LoggedInPagesTest(WebAppTest):
self
.
dashboard_page
.
visit
()
self
.
dashboard_page
.
visit
()
@attr
(
'shard_1'
)
class
CoursePagesTest
(
StudioCourseTest
):
class
CoursePagesTest
(
StudioCourseTest
):
"""
"""
Tests that verify the pages in Studio that you can get to when logged
Tests that verify the pages in Studio that you can get to when logged
...
@@ -109,6 +113,7 @@ class CoursePagesTest(StudioCourseTest):
...
@@ -109,6 +113,7 @@ class CoursePagesTest(StudioCourseTest):
page
.
visit
()
page
.
visit
()
@attr
(
'shard_1'
)
class
CourseSectionTest
(
StudioCourseTest
):
class
CourseSectionTest
(
StudioCourseTest
):
"""
"""
Tests that verify the sections name editable only inside headers in Studio Course Outline that you can get to
Tests that verify the sections name editable only inside headers in Studio Course Outline that you can get to
...
@@ -156,6 +161,7 @@ class CourseSectionTest(StudioCourseTest):
...
@@ -156,6 +161,7 @@ class CourseSectionTest(StudioCourseTest):
self
.
assertFalse
(
section_name_edit_form
)
self
.
assertFalse
(
section_name_edit_form
)
@attr
(
'shard_1'
)
class
DiscussionPreviewTest
(
StudioCourseTest
):
class
DiscussionPreviewTest
(
StudioCourseTest
):
"""
"""
Tests that Inline Discussions are rendered with a custom preview in Studio
Tests that Inline Discussions are rendered with a custom preview in Studio
...
...
common/test/acceptance/tests/test_studio_split_test.py
View file @
c0264ca8
...
@@ -6,6 +6,7 @@ import json
...
@@ -6,6 +6,7 @@ import json
import
os
import
os
import
math
import
math
from
unittest
import
skip
,
skipUnless
from
unittest
import
skip
,
skipUnless
from
nose.plugins.attrib
import
attr
from
xmodule.partitions.partitions
import
Group
,
UserPartition
from
xmodule.partitions.partitions
import
Group
,
UserPartition
from
bok_choy.promise
import
Promise
from
bok_choy.promise
import
Promise
...
@@ -63,6 +64,7 @@ class SplitTestMixin(object):
...
@@ -63,6 +64,7 @@ class SplitTestMixin(object):
Promise
(
missing_groups_button_not_present
,
"Add missing groups button should not be showing."
)
.
fulfill
()
Promise
(
missing_groups_button_not_present
,
"Add missing groups button should not be showing."
)
.
fulfill
()
@attr
(
'shard_1'
)
class
SplitTest
(
ContainerBase
,
SplitTestMixin
):
class
SplitTest
(
ContainerBase
,
SplitTestMixin
):
"""
"""
Tests for creating and editing split test instances in Studio.
Tests for creating and editing split test instances in Studio.
...
@@ -173,6 +175,7 @@ class SplitTest(ContainerBase, SplitTestMixin):
...
@@ -173,6 +175,7 @@ class SplitTest(ContainerBase, SplitTestMixin):
self
.
verify_groups
(
container
,
[
'alpha'
],
[],
verify_missing_groups_not_present
=
False
)
self
.
verify_groups
(
container
,
[
'alpha'
],
[],
verify_missing_groups_not_present
=
False
)
@attr
(
'shard_1'
)
@skipUnless
(
os
.
environ
.
get
(
'FEATURE_GROUP_CONFIGURATIONS'
),
'Tests Group Configurations feature'
)
@skipUnless
(
os
.
environ
.
get
(
'FEATURE_GROUP_CONFIGURATIONS'
),
'Tests Group Configurations feature'
)
class
SettingsMenuTest
(
StudioCourseTest
):
class
SettingsMenuTest
(
StudioCourseTest
):
"""
"""
...
@@ -221,6 +224,7 @@ class SettingsMenuTest(StudioCourseTest):
...
@@ -221,6 +224,7 @@ class SettingsMenuTest(StudioCourseTest):
self
.
assertFalse
(
self
.
advanced_settings
.
q
(
css
=
link_css
)
.
present
)
self
.
assertFalse
(
self
.
advanced_settings
.
q
(
css
=
link_css
)
.
present
)
@attr
(
'shard_1'
)
@skipUnless
(
os
.
environ
.
get
(
'FEATURE_GROUP_CONFIGURATIONS'
),
'Tests Group Configurations feature'
)
@skipUnless
(
os
.
environ
.
get
(
'FEATURE_GROUP_CONFIGURATIONS'
),
'Tests Group Configurations feature'
)
class
GroupConfigurationsTest
(
ContainerBase
,
SplitTestMixin
):
class
GroupConfigurationsTest
(
ContainerBase
,
SplitTestMixin
):
"""
"""
...
...
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