From 59d44c54b153afc6487bc185ba13ba2c19e19496 Mon Sep 17 00:00:00 2001
From: cahrens <christina@edx.org>
Date: Wed, 6 Aug 2014 13:11:08 -0400
Subject: [PATCH] Updates after rebase.

---
 .../spec/views/pages/group_configurations_spec.js   |  4 ++--
 common/test/acceptance/pages/studio/container.py    | 13 +++++++++++++
 .../test/acceptance/tests/test_studio_split_test.py |  7 ++++---
 3 files changed, 19 insertions(+), 5 deletions(-)

diff --git a/cms/static/js/spec/views/pages/group_configurations_spec.js b/cms/static/js/spec/views/pages/group_configurations_spec.js
index e871ad6a35..015e89edff 100644
--- a/cms/static/js/spec/views/pages/group_configurations_spec.js
+++ b/cms/static/js/spec/views/pages/group_configurations_spec.js
@@ -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');
             });
         });
 
diff --git a/common/test/acceptance/pages/studio/container.py b/common/test/acceptance/pages/studio/container.py
index b4ef1fc7ee..cd6b1fc181 100644
--- a/common/test/acceptance/pages/studio/container.py
+++ b/common/test/acceptance/pages/studio/container.py
@@ -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):
     """
diff --git a/common/test/acceptance/tests/test_studio_split_test.py b/common/test/acceptance/tests/test_studio_split_test.py
index 3c6dd008da..d8c37d087a 100644
--- a/common/test/acceptance/tests/test_studio_split_test.py
+++ b/common/test/acceptance/tests/test_studio_split_test.py
@@ -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