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
59d44c54
Commit
59d44c54
authored
Aug 06, 2014
by
cahrens
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Updates after rebase.
parent
90fe25b4
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
19 additions
and
5 deletions
+19
-5
cms/static/js/spec/views/pages/group_configurations_spec.js
+2
-2
common/test/acceptance/pages/studio/container.py
+13
-0
common/test/acceptance/tests/test_studio_split_test.py
+4
-3
No files found.
cms/static/js/spec/views/pages/group_configurations_spec.js
View file @
59d44c54
...
@@ -52,8 +52,8 @@ define([
...
@@ -52,8 +52,8 @@ define([
var
view
=
initializePage
();
var
view
=
initializePage
();
expect
(
view
.
$
(
'.ui-loading'
)).
toBeVisible
();
expect
(
view
.
$
(
'.ui-loading'
)).
toBeVisible
();
view
.
render
();
view
.
render
();
expect
(
view
.
$
(
itemClassName
)).
toExist
()
expect
(
view
.
$
(
itemClassName
)).
toExist
()
;
expect
(
view
.
$
(
'.ui-loading'
)).
to
BeHidden
(
);
expect
(
view
.
$
(
'.ui-loading'
)).
to
HaveClass
(
'is-hidden'
);
});
});
});
});
...
...
common/test/acceptance/pages/studio/container.py
View file @
59d44c54
...
@@ -364,6 +364,19 @@ class XBlockWrapper(PageObject):
...
@@ -364,6 +364,19 @@ class XBlockWrapper(PageObject):
self
.
q
(
css
=
self
.
COMPONENT_BUTTONS
[
button_name
])
.
first
.
click
()
self
.
q
(
css
=
self
.
COMPONENT_BUTTONS
[
button_name
])
.
first
.
click
()
self
.
wait_for_ajax
()
self
.
wait_for_ajax
()
def
go_to_group_configuration_page
(
self
):
"""
Go to the Group Configuration used by the component.
"""
self
.
q
(
css
=
self
.
_bounded_selector
(
'span.message-text a'
))
.
first
.
click
()
@property
def
group_configuration_link_name
(
self
):
"""
Get Group Configuration name from link.
"""
return
self
.
q
(
css
=
self
.
_bounded_selector
(
'span.message-text a'
))
.
first
.
text
[
0
]
def
_click_edit
(
page_object
,
bounded_selector
=
lambda
(
x
):
x
):
def
_click_edit
(
page_object
,
bounded_selector
=
lambda
(
x
):
x
):
"""
"""
...
...
common/test/acceptance/tests/test_studio_split_test.py
View file @
59d44c54
...
@@ -15,6 +15,7 @@ from ..fixtures.course import XBlockFixtureDesc
...
@@ -15,6 +15,7 @@ from ..fixtures.course import XBlockFixtureDesc
from
..pages.studio.component_editor
import
ComponentEditorView
from
..pages.studio.component_editor
import
ComponentEditorView
from
..pages.studio.overview
import
CourseOutlinePage
,
CourseOutlineUnit
from
..pages.studio.overview
import
CourseOutlinePage
,
CourseOutlineUnit
from
..pages.studio.settings_advanced
import
AdvancedSettingsPage
from
..pages.studio.settings_advanced
import
AdvancedSettingsPage
from
..pages.studio.container
import
ContainerPage
from
..pages.studio.settings_group_configurations
import
GroupConfigurationsPage
from
..pages.studio.settings_group_configurations
import
GroupConfigurationsPage
from
..pages.studio.utils
import
add_advanced_component
from
..pages.studio.utils
import
add_advanced_component
from
..pages.xblock.utils
import
wait_for_xblock_initialization
from
..pages.xblock.utils
import
wait_for_xblock_initialization
...
@@ -661,7 +662,7 @@ class GroupConfigurationsTest(ContainerBase, SplitTestMixin):
...
@@ -661,7 +662,7 @@ class GroupConfigurationsTest(ContainerBase, SplitTestMixin):
usage
=
config
.
usages
[
0
]
usage
=
config
.
usages
[
0
]
config
.
click_unit_anchor
()
config
.
click_unit_anchor
()
unit
=
Unit
Page
(
self
.
browser
,
vertical
.
locator
)
unit
=
Container
Page
(
self
.
browser
,
vertical
.
locator
)
# Waiting for the page load and verify that we've landed on the unit page
# Waiting for the page load and verify that we've landed on the unit page
EmptyPromise
(
EmptyPromise
(
lambda
:
unit
.
is_browser_on_page
(),
"loaded page {!r}"
.
format
(
unit
),
lambda
:
unit
.
is_browser_on_page
(),
"loaded page {!r}"
.
format
(
unit
),
...
@@ -766,9 +767,9 @@ class GroupConfigurationsTest(ContainerBase, SplitTestMixin):
...
@@ -766,9 +767,9 @@ class GroupConfigurationsTest(ContainerBase, SplitTestMixin):
XBlockFixtureDesc
(
'split_test'
,
'Test Content Experiment'
,
metadata
=
{
'user_partition_id'
:
1
})
XBlockFixtureDesc
(
'split_test'
,
'Test Content Experiment'
,
metadata
=
{
'user_partition_id'
:
1
})
)
)
unit
=
Unit
Page
(
self
.
browser
,
vertical
.
locator
)
unit
=
Container
Page
(
self
.
browser
,
vertical
.
locator
)
unit
.
visit
()
unit
.
visit
()
experiment
=
unit
.
component
s
[
0
]
experiment
=
unit
.
xblock
s
[
0
]
group_configuration_link_name
=
experiment
.
group_configuration_link_name
group_configuration_link_name
=
experiment
.
group_configuration_link_name
...
...
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