Cleanup from rebase.

cms/djangoapps/contentstore/views/tests/test_course_index.py

@@ -11,7 +11,6 @@ from contentstore.views.course import course_outline_initial_state
 from contentstore.views.item import create_xblock_info, VisibilityState
 from course_action_state.models import CourseRerunState
 from contentstore.views.item import create_xblock_info
-from contentstore.views.item import create_xblock_info, PublishState
 from xmodule.modulestore.django import modulestore
 from xmodule.modulestore.tests.factories import CourseFactory, ItemFactory
 from opaque_keys.edx.locator import CourseLocator
@@ -107,19 +106,19 @@ class TestCourseIndex(CourseTestCase):
         self.assertEqual(json_response['category'], 'course')
         self.assertEqual(json_response['id'], 'i4x://MITx/999/course/Robot_Super_Course')
         self.assertEqual(json_response['display_name'], 'Robot Super Course')
-        self.assertTrue(json_response['is_container'])
-        self.assertFalse(json_response['is_draft'])
+        self.assertTrue(json_response['published'])
+        self.assertIsNone(json_response['visibility_state'])
 
         # Now verify the first child
-        children = json_response['children']
+        children = json_response['child_info']['children']
         self.assertTrue(len(children) > 0)
         first_child_response = children[0]
         self.assertEqual(first_child_response['category'], 'chapter')
         self.assertEqual(first_child_response['id'], 'i4x://MITx/999/chapter/Week_1')
         self.assertEqual(first_child_response['display_name'], 'Week 1')
-        self.assertTrue(first_child_response['is_container'])
-        self.assertFalse(first_child_response['is_draft'])
-        self.assertTrue(len(first_child_response['children']) > 0)
+        self.assertTrue(json_response['published'])
+        self.assertEqual(first_child_response['visibility_state'], VisibilityState.unscheduled)
+        self.assertTrue(len(first_child_response['child_info']['children']) > 0)
 
         # Finally, validate the entire response for consistency
         self.assert_correct_json_response(json_response)
@@ -188,13 +187,10 @@ class TestCourseIndex(CourseTestCase):
         self.assertIsNotNone(json_response['display_name'])
         self.assertIsNotNone(json_response['id'])
         self.assertIsNotNone(json_response['category'])
-        self.assertIsNotNone(json_response['is_draft'])
-        self.assertIsNotNone(json_response['is_container'])
-        if json_response['is_container']:
-            for child_response in json_response['children']:
+        self.assertTrue(json_response['published'])
+        if json_response.get('child_info', None):
+            for child_response in json_response['child_info']['children']:
                 self.assert_correct_json_response(child_response)
-        else:
-            self.assertFalse('children' in json_response)
 
 
 class TestCourseOutline(CourseTestCase):

cms/static/js/views/group_configuration_item.js

 define([
-    'js/views/baseview', 'jquery', 'js/views/group_configuration_details',
-    'js/views/group_configuration_edit'
+    'js/views/baseview', 'jquery', "gettext", 'js/views/group_configuration_details',
+    'js/views/group_configuration_edit', "js/views/utils/view_utils"
 ], function(
-    BaseView, $, GroupConfigurationDetails, GroupConfigurationEdit
+    BaseView, $, gettext, GroupConfigurationDetails, GroupConfigurationEdit, ViewUtils
 ) {
     'use strict';
     var GroupConfigurationsItem = BaseView.extend({
@@ -35,12 +35,12 @@ define([
         deleteConfiguration: function(event) {
             if(event && event.preventDefault) { event.preventDefault(); }
             var self = this;
-            this.confirmThenRunOperation(
+            ViewUtils.confirmThenRunOperation(
                 gettext('Delete this Group Configuration?'),
                 gettext('Deleting this Group Configuration is permanent and cannot be undone.'),
                 gettext('Delete'),
                 function() {
-                    return self.runOperationShowingMessage(
+                    return ViewUtils.runOperationShowingMessage(
                         gettext('Deleting') + '…',
                         function () {
                             return self.model.destroy({ wait: true });

common/test/acceptance/pages/studio/overview.py

@@ -11,7 +11,7 @@ from selenium.webdriver.common.keys import Keys
 
 from .course_page import CoursePage
 from .container import ContainerPage
-from .utils import set_input_value_and_save, click_css, confirm_prompt, set_input_value
+from .utils import set_input_value_and_save, click_css, confirm_prompt
 
 
 class CourseOutlineItem(object):
@@ -82,7 +82,7 @@ class CourseOutlineItem(object):
         """
         Enters new_name as the item's display name.
         """
-        set_input_value(self, self._bounded_selector(self.NAME_INPUT_SELECTOR), new_name)
+        set_input_value_and_save(self, self._bounded_selector(self.NAME_INPUT_SELECTOR), new_name)
 
     def change_name(self, new_name):
         """

common/test/acceptance/tests/test_studio_container.py

@@ -16,7 +16,7 @@ from ..pages.lms.staff_view import StaffPage
 
 import datetime
 from bok_choy.promise import Promise, EmptyPromise
-from acceptance.tests.base_studio_test import StudioCourseTest
+from .base_studio_test import StudioCourseTest
 
 
 @attr('shard_1')