Andal.LND/edx-platform
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Updates after rebase.

Browse Source
This commit is contained in:
cahrens
2014-08-06 13:11:08 -04:00
parent 90fe25b4ff
commit 59d44c54b1
3 changed files with 19 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
cms/static/js/spec/views/pages/group_configurations_spec.js
View File

@@ -52,8 +52,8 @@ define([
var view = initializePage();
expect(view.$('.ui-loading')).toBeVisible();
view.render();
expect(view.$(itemClassName)).toExist()
expect(view.$('.ui-loading')).toBeHidden();
expect(view.$(itemClassName)).toExist();
expect(view.$('.ui-loading')).toHaveClass('is-hidden');
});
});

13
common/test/acceptance/pages/studio/container.py
View File

@@ -364,6 +364,19 @@ class XBlockWrapper(PageObject):
self.q(css=self.COMPONENT_BUTTONS[button_name]).first.click()
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):
"""

7
common/test/acceptance/tests/test_studio_split_test.py
View File

@@ -15,6 +15,7 @@ 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
@@ -661,7 +662,7 @@ class GroupConfigurationsTest(ContainerBase, SplitTestMixin):
usage = config.usages[0]
config.click_unit_anchor()
unit = UnitPage(self.browser, vertical.locator)
unit = ContainerPage(self.browser, vertical.locator)
# Waiting for the page load and verify that we've landed on the unit page
EmptyPromise(
lambda: unit.is_browser_on_page(), "loaded page {!r}".format(unit),
@@ -766,9 +767,9 @@ class GroupConfigurationsTest(ContainerBase, SplitTestMixin):
XBlockFixtureDesc('split_test', 'Test Content Experiment', metadata={'user_partition_id': 1})
)
unit = UnitPage(self.browser, vertical.locator)
unit = ContainerPage(self.browser, vertical.locator)
unit.visit()
experiment = unit.components[0]
experiment = unit.xblocks[0]
group_configuration_link_name = experiment.group_configuration_link_name