Show Enrollment Tracks in Group Configurations.

TNL-6743

Author: Albert St. Aubin

cms/djangoapps/contentstore/course_group_config.py

@@ -8,15 +8,16 @@
 
 from django.utils.translation import ugettext as _
 from contentstore.utils import reverse_usage_url
+from openedx.core.djangoapps.course_groups.partition_scheme import get_cohorted_user_partition
 from xmodule.partitions.partitions import UserPartition, MINIMUM_STATIC_PARTITION_ID
 from xmodule.partitions.partitions_service import get_all_partitions_for_course
 from xmodule.split_test_module import get_split_user_partitions
-from openedx.core.djangoapps.course_groups.partition_scheme import get_cohorted_user_partition
 
 MINIMUM_GROUP_ID = MINIMUM_STATIC_PARTITION_ID
 
 RANDOM_SCHEME = "random"
 COHORT_SCHEME = "cohort"
+ENROLLMENT_SCHEME = "enrollment_track"
 
 CONTENT_GROUP_CONFIGURATION_DESCRIPTION = _(
     'The groups in this configuration can be mapped to cohorts in the Instructor Dashboard.'
@@ -187,21 +188,10 @@ def _get_content_experiment_usage_info(store, course, split_tests):  # pylint: d
         return usage_info
 
     @staticmethod
-    def get_content_groups_usage_info(store, course):
-        """
-        Get usage information for content groups.
-        """
-        items = store.get_items(course.id, settings={'group_access': {'$exists': True}}, include_orphans=False)
-
-        return GroupConfiguration._get_content_groups_usage_info(course, items)
-
-    @staticmethod
-    def _get_content_groups_usage_info(course, items):
+    def get_partitions_usage_info(store, course):
         """
         Returns all units names and their urls.
 
-        This will return only groups for the cohort user partition.
-
         Returns:
         {'group_id':
             [
@@ -216,8 +206,10 @@ def _get_content_groups_usage_info(course, items):
             ],
         }
         """
+        items = store.get_items(course.id, settings={'group_access': {'$exists': True}}, include_orphans=False)
+
         usage_info = {}
-        for item, group_id in GroupConfiguration._iterate_items_and_content_group_ids(course, items):
+        for item, group_id in GroupConfiguration._iterate_items_and_group_ids(course, items):
             if group_id not in usage_info:
                 usage_info[group_id] = []
 
@@ -267,7 +259,7 @@ def _get_content_groups_items_usage_info(course, items):
         }
         """
         usage_info = {}
-        for item, group_id in GroupConfiguration._iterate_items_and_content_group_ids(course, items):
+        for item, group_id in GroupConfiguration._iterate_items_and_group_ids(course, items):
             if group_id not in usage_info:
                 usage_info[group_id] = []
 
@@ -282,22 +274,23 @@ def _get_content_groups_items_usage_info(course, items):
         return usage_info
 
     @staticmethod
-    def _iterate_items_and_content_group_ids(course, items):
+    def _iterate_items_and_group_ids(course, items):
         """
-        Iterate through items and content group IDs in a course.
+        Iterate through items and group IDs in a course.
 
-        This will yield group IDs *only* for cohort user partitions.
+        This will yield group IDs for all user partitions except those with a scheme of random.
 
         Yields: tuple of (item, group_id)
         """
-        content_group_configuration = get_cohorted_user_partition(course)
-        if content_group_configuration is not None:
-            for item in items:
-                if hasattr(item, 'group_access') and item.group_access:
-                    group_ids = item.group_access.get(content_group_configuration.id, [])
+        all_partitions = get_all_partitions_for_course(course)
+        for config in all_partitions:
+            if config is not None and config.scheme.name != RANDOM_SCHEME:
+                for item in items:
+                    if hasattr(item, 'group_access') and item.group_access:
+                        group_ids = item.group_access.get(config.id, [])
 
-                    for group_id in group_ids:
-                        yield item, group_id
+                        for group_id in group_ids:
+                            yield item, group_id
 
     @staticmethod
     def update_usage_info(store, course, configuration):
@@ -319,23 +312,23 @@ def update_usage_info(store, course, configuration):
             configuration_json['usage'] = usage_information.get(configuration.id, [])
         elif configuration.scheme.name == COHORT_SCHEME:
             # In case if scheme is "cohort"
-            configuration_json = GroupConfiguration.update_content_group_usage_info(store, course, configuration)
+            configuration_json = GroupConfiguration.update_partition_usage_info(store, course, configuration)
         return configuration_json
 
     @staticmethod
-    def update_content_group_usage_info(store, course, configuration):
+    def update_partition_usage_info(store, course, configuration):
         """
-        Update usage information for particular Content Group Configuration.
+        Update usage information for particular Partition Configuration.
 
-        Returns json of particular content group configuration updated with usage information.
+        Returns json of particular partition configuration updated with usage information.
         """
-        usage_info = GroupConfiguration.get_content_groups_usage_info(store, course)
-        content_group_configuration = configuration.to_json()
+        usage_info = GroupConfiguration.get_partitions_usage_info(store, course)
+        partition_configuration = configuration.to_json()
 
-        for group in content_group_configuration['groups']:
+        for group in partition_configuration['groups']:
             group['usage'] = usage_info.get(group['id'], [])
 
-        return content_group_configuration
+        return partition_configuration
 
     @staticmethod
     def get_or_create_content_group(store, course):
@@ -357,9 +350,27 @@ def get_or_create_content_group(store, course):
             )
             return content_group_configuration.to_json()
 
-        content_group_configuration = GroupConfiguration.update_content_group_usage_info(
+        content_group_configuration = GroupConfiguration.update_partition_usage_info(
             store,
             course,
             content_group_configuration
         )
         return content_group_configuration
+
+    @staticmethod
+    def get_all_user_partition_details(store, course):
+        """
+        Returns all the available partitions with updated usage information
+
+        :return: list of all partitions available with details
+        """
+        all_partitions = get_all_partitions_for_course(course)
+        all_updated_partitions = []
+        for partition in all_partitions:
+            configuration = GroupConfiguration.update_partition_usage_info(
+                store,
+                course,
+                partition
+            )
+            all_updated_partitions.append(configuration)
+        return all_updated_partitions

cms/djangoapps/contentstore/courseware_index.py

@@ -377,7 +377,7 @@ def do_course_reindex(cls, modulestore, course_key):
     @classmethod
     def fetch_group_usage(cls, modulestore, structure):
         groups_usage_dict = {}
-        groups_usage_info = GroupConfiguration.get_content_groups_usage_info(modulestore, structure).items()
+        groups_usage_info = GroupConfiguration.get_partitions_usage_info(modulestore, structure).items()
         groups_usage_info.extend(
             GroupConfiguration.get_content_groups_items_usage_info(
                 modulestore,

cms/djangoapps/contentstore/views/course.py

@@ -30,6 +30,7 @@
 from ccx_keys.locator import CCXLocator
 from contentstore.course_group_config import (
     COHORT_SCHEME,
+    ENROLLMENT_SCHEME,
     GroupConfiguration,
     GroupConfigurationsValidationError,
     RANDOM_SCHEME,
@@ -99,7 +100,6 @@
 from xmodule.modulestore.exceptions import ItemNotFoundError, DuplicateCourseError
 from xmodule.tabs import CourseTab, CourseTabList, InvalidTabsException
 
-
 log = logging.getLogger(__name__)
 
 __all__ = ['course_info_handler', 'course_handler', 'course_listing',
@@ -1473,7 +1473,7 @@ def remove_content_or_experiment_group(request, store, course, configuration, gr
             return JsonResponse(status=404)
 
         group_id = int(group_id)
-        usages = GroupConfiguration.get_content_groups_usage_info(store, course)
+        usages = GroupConfiguration.get_partitions_usage_info(store, course)
         used = group_id in usages
 
         if used:
@@ -1521,15 +1521,33 @@ def group_configurations_list_handler(request, course_key_string):
             else:
                 experiment_group_configurations = None
 
-            content_group_configuration = GroupConfiguration.get_or_create_content_group(store, course)
+            all_partitions = GroupConfiguration.get_all_user_partition_details(store, course)
+            should_show_enrollment_track = False
+            group_schemes = []
+            for partition in all_partitions:
+                group_schemes.append(partition['scheme'])
+                if partition['scheme'] == ENROLLMENT_SCHEME:
+                    enrollment_track_configuration = partition
+                    should_show_enrollment_track = len(enrollment_track_configuration['groups']) > 1
+
+                    # Remove the enrollment track partition and add it to the front of the list if it should be shown.
+                    all_partitions.remove(partition)
+                    if should_show_enrollment_track:
+                        all_partitions.insert(0, partition)
+
+            # Add empty content group if there is no COHORT User Partition in the list.
+            # This will add ability to add new groups in the view.
+            if COHORT_SCHEME not in group_schemes:
+                all_partitions.append(GroupConfiguration.get_or_create_content_group(store, course))
 
             return render_to_response('group_configurations.html', {
                 'context_course': course,
                 'group_configuration_url': group_configuration_url,
                 'course_outline_url': course_outline_url,
                 'experiment_group_configurations': experiment_group_configurations,
                 'should_show_experiment_groups': should_show_experiment_groups,
-                'content_group_configuration': content_group_configuration
+                'all_group_configurations': all_partitions,
+                'should_show_enrollment_track': should_show_enrollment_track
             })
         elif "application/json" in request.META.get('HTTP_ACCEPT'):
             if request.method == 'POST':

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

@@ -613,6 +613,15 @@ class GroupConfigurationsUsageInfoTestCase(CourseTestCase, HelperMethods):
     def setUp(self):
         super(GroupConfigurationsUsageInfoTestCase, self).setUp()
 
+    def _get_user_partition(self, scheme):
+        """
+        Returns the first user partition with the specified scheme.
+        """
+        for group in GroupConfiguration.get_all_user_partition_details(self.store, self.course):
+            if group['scheme'] == scheme:
+                return group
+        return None
+
     def _get_expected_content_group(self, usage_for_group):
         """
         Returns the expected configuration with particular usage.
@@ -637,7 +646,7 @@ def test_content_group_not_used(self):
         Test that right data structure will be created if content group is not used.
         """
         self._add_user_partitions(scheme_id='cohort')
-        actual = GroupConfiguration.get_or_create_content_group(self.store, self.course)
+        actual = self._get_user_partition('cohort')
         expected = self._get_expected_content_group(usage_for_group=[])
         self.assertEqual(actual, expected)
 
@@ -650,7 +659,7 @@ def test_can_get_correct_usage_info_when_special_characters_are_in_content(self)
             cid=0, group_id=1, name_suffix='0', special_characters=u"JOSÉ ANDRÉS"
         )
 
-        actual = GroupConfiguration.get_or_create_content_group(self.store, self.course)
+        actual = self._get_user_partition('cohort')
         expected = self._get_expected_content_group(
             usage_for_group=[
                 {
@@ -669,7 +678,7 @@ def test_can_get_correct_usage_info_for_content_groups(self):
         self._add_user_partitions(count=1, scheme_id='cohort')
         vertical, __ = self._create_problem_with_content_group(cid=0, group_id=1, name_suffix='0')
 
-        actual = GroupConfiguration.get_or_create_content_group(self.store, self.course)
+        actual = self._get_user_partition('cohort')
 
         expected = self._get_expected_content_group(usage_for_group=[
             {
@@ -706,7 +715,7 @@ def test_can_get_correct_usage_info_with_orphan(self, module_store_type):
             expected = self._get_expected_content_group(usage_for_group=[])
 
         # Get the actual content group information
-        actual = GroupConfiguration.get_or_create_content_group(self.store, self.course)
+        actual = self._get_user_partition('cohort')
 
         # Assert that actual content group information is same as expected one.
         self.assertEqual(actual, expected)
@@ -720,7 +729,7 @@ def test_can_use_one_content_group_in_multiple_problems(self):
         vertical, __ = self._create_problem_with_content_group(cid=0, group_id=1, name_suffix='0')
         vertical1, __ = self._create_problem_with_content_group(cid=0, group_id=1, name_suffix='1')
 
-        actual = GroupConfiguration.get_or_create_content_group(self.store, self.course)
+        actual = self._get_user_partition('cohort')
 
         expected = self._get_expected_content_group(usage_for_group=[
             {
@@ -927,7 +936,7 @@ def test_can_handle_multiple_partitions(self):
 
         # This used to cause an exception since the code assumed that
         # only one partition would be available.
-        actual = GroupConfiguration.get_content_groups_usage_info(self.store, self.course)
+        actual = GroupConfiguration.get_partitions_usage_info(self.store, self.course)
         self.assertEqual(actual.keys(), [0])
 
         actual = GroupConfiguration.get_content_groups_items_usage_info(self.store, self.course)

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

@@ -372,7 +372,7 @@ def test_get_user_partitions_and_groups(self):
         self.assertEqual(result["user_partitions"], [
             {
                 "id": ENROLLMENT_TRACK_PARTITION_ID,
-                "name": "Enrollment Tracks",
+                "name": "Enrollment Track Groups",
                 "scheme": "enrollment_track",
                 "groups": [
                     {

cms/lib/xblock/test/test_authoring_mixin.py

@@ -22,7 +22,7 @@ class AuthoringMixinTestCase(ModuleStoreTestCase):
     NO_CONTENT_ENROLLMENT_TRACK_ENABLED = "specific groups of learners based either on their enrollment track, or by content groups that you create"
     NO_CONTENT_ENROLLMENT_TRACK_DISABLED = "specific groups of learners based on content groups that you create"
     CONTENT_GROUPS_TITLE = "Content Groups"
-    ENROLLMENT_GROUPS_TITLE = "Enrollment Tracks"
+    ENROLLMENT_GROUPS_TITLE = "Enrollment Track Groups"
     STAFF_LOCKED = 'The unit that contains this component is hidden from learners'
 
     FEATURES_WITH_ENROLLMENT_TRACK_DISABLED = settings.FEATURES.copy()

cms/static/js/factories/group_configurations.js

@@ -2,24 +2,33 @@ define([
     'js/collections/group_configuration', 'js/models/group_configuration', 'js/views/pages/group_configurations'
 ], function(GroupConfigurationCollection, GroupConfigurationModel, GroupConfigurationsPage) {
     'use strict';
-    return function(experimentsEnabled, experimentGroupConfigurationsJson, contentGroupConfigurationJson,
-                     groupConfigurationUrl, courseOutlineUrl) {
+    return function(experimentsEnabled,
+                    experimentGroupConfigurationsJson,
+                    allGroupConfigurationJson,
+                    groupConfigurationUrl,
+                    courseOutlineUrl) {
         var experimentGroupConfigurations = new GroupConfigurationCollection(
                 experimentGroupConfigurationsJson, {parse: true}
             ),
-            contentGroupConfiguration = new GroupConfigurationModel(contentGroupConfigurationJson, {
-                parse: true, canBeEmpty: true
-            });
+            allGroupConfigurations = [],
+            newGroupConfig,
+            i;
+
+        for (i = 0; i < allGroupConfigurationJson.length; i++) {
+            newGroupConfig = new GroupConfigurationModel(allGroupConfigurationJson[i],
+                {parse: true, canBeEmpty: true});
+            newGroupConfig.urlRoot = groupConfigurationUrl;
+            newGroupConfig.outlineUrl = courseOutlineUrl;
+            allGroupConfigurations.push(newGroupConfig);
+        }
 
         experimentGroupConfigurations.url = groupConfigurationUrl;
         experimentGroupConfigurations.outlineUrl = courseOutlineUrl;
-        contentGroupConfiguration.urlRoot = groupConfigurationUrl;
-        contentGroupConfiguration.outlineUrl = courseOutlineUrl;
         new GroupConfigurationsPage({
             el: $('#content'),
             experimentsEnabled: experimentsEnabled,
             experimentGroupConfigurations: experimentGroupConfigurations,
-            contentGroupConfiguration: contentGroupConfiguration
+            allGroupConfigurations: allGroupConfigurations
         }).render();
     };
 });

cms/static/js/spec/views/group_configuration_spec.js

@@ -3,13 +3,13 @@ define([
     'common/js/spec_helpers/view_helpers', 'js/models/course', 'js/models/group_configuration', 'js/models/group',
     'js/collections/group_configuration', 'js/collections/group', 'js/views/group_configuration_details',
     'js/views/group_configurations_list', 'js/views/group_configuration_editor', 'js/views/group_configuration_item',
-    'js/views/experiment_group_edit', 'js/views/content_group_list', 'js/views/content_group_details',
-    'js/views/content_group_editor', 'js/views/content_group_item'
+    'js/views/experiment_group_edit', 'js/views/partition_group_list', 'js/views/partition_group_details',
+    'js/views/content_group_editor', 'js/views/partition_group_item'
 ], function(
     _, AjaxHelpers, TemplateHelpers, ViewHelpers, Course, GroupConfigurationModel, GroupModel,
     GroupConfigurationCollection, GroupCollection, GroupConfigurationDetailsView, GroupConfigurationsListView,
     GroupConfigurationEditorView, GroupConfigurationItemView, ExperimentGroupEditView, GroupList,
-    ContentGroupDetailsView, ContentGroupEditorView, ContentGroupItemView
+    PartitionGroupDetailsView, ContentGroupEditorView, PartitionGroupItemView
 ) {
     'use strict';
     var SELECTORS = {
@@ -675,7 +675,7 @@ define([
             verifyEditingGroup, respondToSave, expectGroupsVisible, correctValidationError;
 
         scopedGroupSelector = function(groupIndex, additionalSelectors) {
-            var groupSelector = '.content-groups-list-item-' + groupIndex;
+            var groupSelector = '.partition-groups-list-item-' + groupIndex;
             if (additionalSelectors) {
                 return groupSelector + ' ' + additionalSelectors;
             } else {
@@ -775,13 +775,13 @@ define([
 
         expectGroupsVisible = function(view, groupNames) {
             _.each(groupNames, function(groupName) {
-                expect(view.$('.content-groups-list-item')).toContainText(groupName);
+                expect(view.$('.partition-groups-list-item')).toContainText(groupName);
             });
         };
 
         beforeEach(function() {
             TemplateHelpers.installTemplates(
-                ['content-group-editor', 'content-group-details', 'list']
+                ['content-group-editor', 'partition-group-details', 'list']
             );
         });
 
@@ -792,7 +792,7 @@ define([
 
         it('can render groups', function() {
             var groupNames = ['Group 1', 'Group 2', 'Group 3'];
-            renderView(groupNames).$('.content-group-details').each(function(index) {
+            renderView(groupNames).$('.partition-group-details').each(function(index) {
                 expect($(this)).toContainText(groupNames[index]);
             });
         });
@@ -874,7 +874,7 @@ define([
 
     describe('Content groups details view', function() {
         beforeEach(function() {
-            TemplateHelpers.installTemplate('content-group-details', true);
+            TemplateHelpers.installTemplate('partition-group-details', true);
             this.model = new GroupModel({name: 'Content Group', id: 0, courseOutlineUrl: 'CourseOutlineUrl'});
 
             var saveableModel = new GroupConfigurationModel({
@@ -889,7 +889,7 @@ define([
             this.collection = new GroupConfigurationCollection([saveableModel]);
             this.collection.outlineUrl = '/outline';
 
-            this.view = new ContentGroupDetailsView({
+            this.view = new PartitionGroupDetailsView({
                 model: this.model
             });
             appendSetFixtures(this.view.render().el);
@@ -901,7 +901,7 @@ define([
 
         it('should show empty usage appropriately', function() {
             this.view.$('.show-groups').click();
-            assertShowEmptyUsages(this.view, 'This content group is not in use. ');
+            assertShowEmptyUsages(this.view, "Use this group to control a component's visibility in the ");
         });
 
         it('should hide empty usage appropriately', function() {
@@ -915,7 +915,7 @@ define([
 
             assertShowNonEmptyUsages(
                 this.view,
-                'This content group is used in:',
+                'This group controls visibility of:',
                 'Cannot delete when in use by a unit'
             );
         });
@@ -1015,7 +1015,7 @@ define([
     describe('Content group controller view', function() {
         beforeEach(function() {
             TemplateHelpers.installTemplates([
-                'content-group-editor', 'content-group-details'
+                'content-group-editor', 'partition-group-details'
             ], true);
 
             this.model = new GroupModel({name: 'Content Group', id: 0, courseOutlineUrl: 'CourseOutlineUrl'});
@@ -1029,14 +1029,14 @@ define([
             this.saveableModel.urlRoot = '/group_configurations';
             this.collection = new GroupConfigurationCollection([this.saveableModel]);
             this.collection.url = '/group_configurations';
-            this.view = new ContentGroupItemView({
+            this.view = new PartitionGroupItemView({
                 model: this.model
             });
             appendSetFixtures(this.view.render().el);
         });
 
         it('should render properly', function() {
-            assertControllerView(this.view, '.content-group-details', '.content-group-edit');
+            assertControllerView(this.view, '.partition-group-details', '.content-group-edit');
         });
 
         it('should destroy itself on confirmation of deleting', function() {
@@ -1047,7 +1047,7 @@ define([
             assertAndDeleteItemWithError(
                 this,
                 '/group_configurations/0/0',
-                '.content-groups-list-item',
+                '.partition-groups-list-item',
                 'Delete this content group'
             );
         });

cms/static/js/spec/views/pages/group_configurations_spec.js

@@ -19,9 +19,8 @@ define([
                     name: 'Configuration 1',
                     courseOutlineUrl: 'CourseOutlineUrl'
                 }),
-                contentGroupConfiguration: new GroupConfigurationModel({groups: []})
+                allGroupConfigurations: [new GroupConfigurationModel({groups: []})]
             });
-
             if (!disableSpy) {
                 spyOn(view, 'addWindowActions');
             }
@@ -36,7 +35,7 @@ define([
         beforeEach(function() {
             setFixtures(mockGroupConfigurationsPage);
             TemplateHelpers.installTemplates([
-                'group-configuration-editor', 'group-configuration-details', 'content-group-details',
+                'group-configuration-editor', 'group-configuration-details', 'partition-group-details',
                 'content-group-editor', 'group-edit', 'list'
             ]);
 
@@ -116,7 +115,7 @@ define([
             });
 
             it('should show a notification message if a content group is changed', function() {
-                this.view.contentGroupConfiguration.get('groups').add({id: 0, name: 'Content Group'});
+                this.view.allGroupConfigurations[0].get('groups').add({id: 0, name: 'Content Group'});
                 expect(this.view.onBeforeUnload())
                     .toBe('You have unsaved changes. Do you really want to leave this page?');
             });

cms/static/js/views/content_group_list.js

@@ -11,6 +11,7 @@
  *   of items this list contains.  For example, 'Group Configuration'.
  *   Note that it must be translated.
  * - emptyMessage (string): Text to render when the list is empty.
+ * - restrictEditing (bool) : Boolean flag for hiding edit and remove options, defaults to false.
  */
 define([
     'js/views/baseview'
@@ -25,6 +26,7 @@ define([
         listContainerCss: '.list-items',
 
         initialize: function() {
+            this.restrictEditing = this.options.restrictEditing || false;
             this.listenTo(this.collection, 'add', this.addNewItemView);
             this.listenTo(this.collection, 'remove', this.onRemoveItem);
             this.template = this.loadTemplate('list');
@@ -42,11 +44,14 @@ define([
                 emptyMessage: this.emptyMessage,
                 length: this.collection.length,
                 isEditing: model && model.get('editing'),
-                canCreateNewItem: this.canCreateItem(this.collection)
+                canCreateNewItem: this.canCreateItem(this.collection),
+                restrictEditing: this.restrictEditing
             }));
 
             this.collection.each(function(model) {
-                this.$(this.listContainerCss).append(this.createItemView({model: model}).render().el);
+                this.$(this.listContainerCss).append(
+                    this.createItemView({model: model, restrictEditing: this.restrictEditing}).render().el
+                );
             }, this);
 
             return this;

cms/static/js/views/list.js

@@ -22,6 +22,7 @@ define([
         canDelete: false,
 
         initialize: function() {
+            this.restrictEditing = this.options.restrictEditing || false;
             this.listenTo(this.model, 'change:editing', this.render);
             this.listenTo(this.model, 'remove', this.remove);
         },

cms/static/js/views/list_item.js

@@ -1,11 +1,15 @@
 define([
     'jquery', 'underscore', 'gettext', 'js/views/pages/base_page',
-    'js/views/group_configurations_list', 'js/views/content_group_list'
+    'js/views/group_configurations_list', 'js/views/partition_group_list'
 ],
-function($, _, gettext, BasePage, GroupConfigurationsListView, ContentGroupListView) {
+function($, _, gettext, BasePage, GroupConfigurationsListView, PartitionGroupListView) {
     'use strict';
     var GroupConfigurationsPage = BasePage.extend({
         initialize: function(options) {
+            var currentScheme,
+                i,
+                enrollmentScheme = 'enrollment_track';
+
             BasePage.prototype.initialize.call(this);
             this.experimentsEnabled = options.experimentsEnabled;
             if (this.experimentsEnabled) {
@@ -14,18 +18,35 @@ function($, _, gettext, BasePage, GroupConfigurationsListView, ContentGroupListV
                     collection: this.experimentGroupConfigurations
                 });
             }
-            this.contentGroupConfiguration = options.contentGroupConfiguration;
-            this.cohortGroupsListView = new ContentGroupListView({
-                collection: this.contentGroupConfiguration.get('groups')
-            });
+
+            this.allGroupConfigurations = options.allGroupConfigurations || [];
+            this.allGroupViewList = [];
+            for (i = 0; i < this.allGroupConfigurations.length; i++) {
+                currentScheme = this.allGroupConfigurations[i].get('scheme');
+                this.allGroupViewList.push(
+                    new PartitionGroupListView({
+                        collection: this.allGroupConfigurations[i].get('groups'),
+                        restrictEditing: currentScheme === enrollmentScheme,
+                        scheme: currentScheme
+                    })
+                );
+            }
         },
 
         renderPage: function() {
-            var hash = this.getLocationHash();
+            var hash = this.getLocationHash(),
+                i,
+                currentClass;
             if (this.experimentsEnabled) {
                 this.$('.wrapper-groups.experiment-groups').append(this.experimentGroupsListView.render().el);
             }
-            this.$('.wrapper-groups.content-groups').append(this.cohortGroupsListView.render().el);
+
+            // Render the remaining Configuration groups
+            for (i = 0; i < this.allGroupViewList.length; i++) {
+                currentClass = '.wrapper-groups.content-groups.' + this.allGroupViewList[i].scheme;
+                this.$(currentClass).append(this.allGroupViewList[i].render().el);
+            }
+
             this.addWindowActions();
             if (hash) {
                 // Strip leading '#' to get id string to match
@@ -38,8 +59,22 @@ function($, _, gettext, BasePage, GroupConfigurationsListView, ContentGroupListV
             $(window).on('beforeunload', this.onBeforeUnload.bind(this));
         },
 
+        /**
+         * Checks the Partition Group Configurations to see if the isDirty bit is set
+         * @returns {boolean} True if any partition group has the dirty bit set.
+         */
+        areAnyConfigurationsDirty: function() {
+            var i;
+            for (i = 0; i < this.allGroupConfigurations.length; i++) {
+                if (this.allGroupConfigurations[i].isDirty()) {
+                    return true;
+                }
+            }
+            return false;
+        },
+
         onBeforeUnload: function() {
-            var dirty = this.contentGroupConfiguration.isDirty() ||
+            var dirty = this.areAnyConfigurationsDirty() ||
                 (this.experimentsEnabled && this.experimentGroupConfigurations.find(function(configuration) {
                     return configuration.isDirty();
                 }));

cms/static/js/views/pages/group_configurations.js

@@ -1,5 +1,5 @@
 /**
- * This class defines a simple display view for a content group.
+ * This class defines a simple display view for a partition group.
  * It is expected to be backed by a Group model.
  */
 define([
@@ -8,7 +8,7 @@ define([
 ], function(BaseView, _, gettext, str, StringUtils, HtmlUtils) {
     'use strict';
 
-    var ContentGroupDetailsView = BaseView.extend({
+    var PartitionGroupDetailsView = BaseView.extend({
         tagName: 'div',
         events: {
             'click .edit': 'editGroup',
@@ -21,17 +21,18 @@ define([
 
             return [
                 'collection',
-                'content-group-details',
-                'content-group-details-' + index
+                'partition-group-details',
+                'partition-group-details-' + index
             ].join(' ');
         },
 
         editGroup: function() {
-            this.model.set({'editing': true});
+            this.model.set({editing: true});
         },
 
         initialize: function() {
-            this.template = this.loadTemplate('content-group-details');
+            this.template = this.loadTemplate('partition-group-details');
+            this.restrictEditing = this.options.restrictEditing || false;
             this.listenTo(this.model, 'change', this.render);
         },
 
@@ -41,9 +42,10 @@ define([
                 courseOutlineUrl: this.model.collection.parents[0].outlineUrl,
                 index: this.model.collection.indexOf(this.model),
                 showContentGroupUsages: showContentGroupUsages || false,
-                HtmlUtils: HtmlUtils
+                HtmlUtils: HtmlUtils,
+                restrictEditing: this.restrictEditing
             });
-            this.$el.html(this.template(attrs));
+            HtmlUtils.setHtml(this.$el, HtmlUtils.HTML(this.template(attrs)));
             return this;
         },
 
@@ -78,5 +80,5 @@ define([
         }
     });
 
-    return ContentGroupDetailsView;
+    return PartitionGroupDetailsView;
 });

cms/static/js/views/content_group_details.js cms/static/js/views/partition_group_details.js

@@ -1,31 +1,32 @@
 /**
- * This class defines an controller view for content groups.
+ * This class defines an controller view for partition groups.
  * It renders an editor view or a details view depending on the state
  * of the underlying model.
  * It is expected to be backed by a Group model.
  */
 define([
-    'js/views/list_item', 'js/views/content_group_editor', 'js/views/content_group_details', 'gettext', 'common/js/components/utils/view_utils'
-], function(ListItemView, ContentGroupEditorView, ContentGroupDetailsView, gettext) {
+    'js/views/list_item', 'js/views/content_group_editor', 'js/views/partition_group_details',
+    'gettext', 'common/js/components/utils/view_utils'
+], function(ListItemView, ContentGroupEditorView, PartitionGroupDetailsView, gettext) {
     'use strict';
 
-    var ContentGroupItemView = ListItemView.extend({
+    var PartitionGroupItemView = ListItemView.extend({
         events: {
             'click .delete': 'deleteItem'
         },
 
         tagName: 'section',
 
-        baseClassName: 'content-group',
+        baseClassName: 'partition-group',
 
         canDelete: true,
 
         itemDisplayName: gettext('content group'),
 
         attributes: function() {
             return {
-                'id': this.model.get('id'),
-                'tabindex': -1
+                id: this.model.get('id'),
+                tabindex: -1
             };
         },
 
@@ -34,9 +35,11 @@ define([
         },
 
         createDetailsView: function() {
-            return new ContentGroupDetailsView({model: this.model});
+            return new PartitionGroupDetailsView({model: this.model,
+                restrictEditing: this.options.restrictEditing
+            });
         }
     });
 
-    return ContentGroupItemView;
+    return PartitionGroupItemView;
 });

cms/static/js/views/content_group_item.js cms/static/js/views/partition_group_item.js

@@ -0,0 +1,33 @@
+/**
+ * This class defines a list view for partition groups.
+ * It is expected to be backed by a Group collection.
+ */
+define([
+    'underscore', 'js/views/list', 'js/views/partition_group_item', 'gettext'
+], function(_, ListView, PartitionGroupItemView, gettext) {
+    'use strict';
+
+    var PartitionGroupListView = ListView.extend({
+        initialize: function(options) {
+            ListView.prototype.initialize.apply(this, [options]);
+            this.scheme = options.scheme;
+        },
+
+        tagName: 'div',
+
+        className: 'partition-group-list',
+
+        // Translators: This refers to a content group that can be linked to a student cohort.
+        itemCategoryDisplayName: gettext('content group'),
+
+        newItemMessage: gettext('Add your first content group'),
+
+        emptyMessage: gettext('You have not created any content groups yet.'),
+
+        createItemView: function(options) {
+            return new PartitionGroupItemView(_.extend({}, options, {scheme: this.scheme}));
+        }
+    });
+
+    return PartitionGroupListView;
+});

cms/static/js/views/partition_group_list.js

@@ -1,6 +1,7 @@
 <%page expression_filter="h"/>
 <%inherit file="base.html" />
 <%def name="content_groups_help_token()"><% return "content_groups" %></%def>
+<%def name="enrollment_track_help_token()"><% return "enrollment_tracks" %></%def>
 <%def name="experiment_group_configurations_help_token()"><% return "group_configurations" %></%def>
 <%namespace name='static' file='static_content.html'/>
 <%!
@@ -16,7 +17,7 @@
 <%block name="bodyclass">is-signedin course view-group-configurations</%block>
 
 <%block name="header_extras">
-% for template_name in ["group-configuration-details", "group-configuration-editor", "group-edit", "content-group-editor", "content-group-details", "basic-modal", "modal-button", "list"]:
+% for template_name in ["group-configuration-details", "group-configuration-editor", "group-edit", "content-group-editor", "partition-group-details", "basic-modal", "modal-button", "list"]:
   <script type="text/template" id="${template_name}-tpl">
     <%static:include path="js/${template_name}.underscore" />
   </script>
@@ -28,9 +29,10 @@
       GroupConfigurationsFactory(
           ${should_show_experiment_groups | n, dump_js_escaped_json},
           ${experiment_group_configurations | n, dump_js_escaped_json},
-          ${content_group_configuration | n, dump_js_escaped_json},
+          ${all_group_configurations | n, dump_js_escaped_json},
           "${group_configuration_url | n, js_escaped_string}",
-          "${course_outline_url | n, js_escaped_string}"
+          "${course_outline_url | n, js_escaped_string}",
+          ${should_show_enrollment_track | n, dump_js_escaped_json}
       );
   });
 </%block>
@@ -47,37 +49,52 @@ <h1 class="page-header">
 
   <div class="wrapper-content wrapper">
     <section class="content">
+
       <article class="content-primary" role="main">
-        <div class="wrapper-groups content-groups">
-          <h3 class="title">${_("Content Groups")}</h3>
-            <div class="ui-loading">
-                <p><span class="spin"><span class="icon fa fa-refresh" aria-hidden="true"></span></span> <span class="copy">${_("Loading")}</span></p>
-            </div>
-        </div>
 
-      % if should_show_experiment_groups:
-        <div class="wrapper-groups experiment-groups">
-          <h3 class="title">${_("Experiment Group Configurations")}</h3>
-          % if experiment_group_configurations is None:
-            <div class="notice notice-incontext notice-moduledisabled">
-                <p class="copy">
-                    ${_("This module is disabled at the moment.")}
-                </p>
-            </div>
-          % else:
-            <div class="ui-loading">
-                <p><span class="spin"><span class="icon fa fa-refresh" aria-hidden="true"></span></span> <span class="copy">${_("Loading")}</span></p>
-            </div>
-          % endif
-        </div>
-      % endif
+        % for config in all_group_configurations:
+          <div class="wrapper-groups content-groups ${config['scheme']}">
+            <h3 class="title">${config['name']}</h3>
+              <div class="ui-loading">
+                  <p><span class="spin"><span class="icon fa fa-refresh" aria-hidden="true"></span></span> <span class="copy">${_("Loading")}</span></p>
+              </div>
+          </div>
+        % endfor
+
+        % if should_show_experiment_groups:
+          <div class="wrapper-groups experiment-groups">
+            <h3 class="title">${_("Experiment Group Configurations")}</h3>
+            % if experiment_group_configurations is None:
+              <div class="notice notice-incontext notice-moduledisabled">
+                  <p class="copy">
+                      ${_("This module is disabled at the moment.")}
+                  </p>
+              </div>
+            % else:
+              <div class="ui-loading">
+                  <p><span class="spin"><span class="icon fa fa-refresh" aria-hidden="true"></span></span> <span class="copy">${_("Loading")}</span></p>
+              </div>
+            % endif
+          </div>
+        % endif
       </article>
       <aside class="content-supplementary" role="complementary">
+      % if should_show_enrollment_track:
+        <div class="bit">
+          <div class="enrollment-track-doc">
+            <h3 class="title-3">${_("Enrollment Track Groups")}</h3>
+            <p>${_("Enrollment track groups allow you to offer different course content to learners in each enrollment track. Learners enrolled in each enrollment track in your course are automatically included in the corresponding enrollment track group.")}</p>
+            <p>${_("On unit pages in the course outline, you can designate components as visible only to learners in a specific enrollment track.")}</p>
+            <p>${_("You cannot edit enrollment track groups, but you can expand each group to view details of the course content that is designated for learners in the group.")}</p>
+            <p><a href="${get_online_help_info(enrollment_track_help_token())['doc_url']}" target="_blank" class="button external-help-button">${_("Learn More")}</a></p>
+          </div>
+        </div>
+      % endif
         <div class="bit">
           <div class="content-groups-doc">
               <h3 class="title-3">${_("Content Groups")}</h3>
               <p>${_("If you have cohorts enabled in your course, you can use content groups to create cohort-specific courseware. In other words, you can customize the content that particular cohorts see in your course.")}</p>
-              <p>${_("Each content group that you create can be associated with one or more cohorts. In addition to course content that is intended for all students, you can designate some content as visible only to specified content groups. Only learners in the cohorts that are associated with the specified content groups see the additional content.")}</p>
+              <p>${_("Each content group that you create can be associated with one or more cohorts. In addition to course content that is intended for all learners, you can designate some content as visible only to specified content groups. Only learners in the cohorts that are associated with the specified content groups see the additional content.")}</p>
               <p>${Text(_("Click {em_start}New content group{em_end} to add a new content group. To edit the name of a content group, hover over its box and click {em_start}Edit{em_end}. You can delete a content group only if it is not in use by a unit. To delete a content group, hover over its box and click the delete icon.")).format(em_start=HTML("<strong>"), em_end=HTML("</strong>"))}</p>
               <p><a href="${get_online_help_info(content_groups_help_token())['doc_url']}" target="_blank" class="button external-help-button">${_("Learn More")}</a></p>
           </div>
@@ -86,12 +103,13 @@ <h3 class="title-3">${_("Content Groups")}</h3>
         <div class="bit">
           <div class="experiment-groups-doc">
             <h3 class="title-3">${_("Experiment Group Configurations")}</h3>
-            <p>${_("Use experiment group configurations if you are conducting content experiments, also known as A/B testing, in your course. Experiment group configurations define how many groups of students are in a content experiment. When you create a content experiment for a course, you select the group configuration to use.")}</p>
+            <p>${_("Use experiment group configurations if you are conducting content experiments, also known as A/B testing, in your course. Experiment group configurations define how many groups of learners are in a content experiment. When you create a content experiment for a course, you select the group configuration to use.")}</p>
             <p>${Text(_("Click {em_start}New Group Configuration{em_end} to add a new configuration. To edit a configuration, hover over its box and click {em_start}Edit{em_end}. You can delete a group configuration only if it is not in use in an experiment. To delete a configuration, hover over its box and click the delete icon.")).format(em_start=HTML("<strong>"), em_end=HTML("</strong>"))}</p>
             <p><a href="${get_online_help_info(experiment_group_configurations_help_token())['doc_url']}" target="_blank" class="button external-help-button">${_("Learn More")}</a></p>
           </div>
         </div>
       % endif
+
       <div class="bit">
       % if context_course:
         <%

cms/templates/group_configurations.html

@@ -10,7 +10,7 @@
     </div>
 <% } else { %>
     <div class="list-items"></div>
-    <% if (!isEditing) { %>
+    <% if (!isEditing && !restrictEditing) { %>
         <button class="action action-add <% if(!canCreateNewItem) {%> action-add-hidden <% }%>" >
             <span class="icon fa fa-plus" aria-hidden="true"></span>
             <%- interpolate(

cms/templates/js/list.underscore

@@ -23,25 +23,29 @@
    </ol>
 
     <ul class="actions group-configuration-actions">
-        <li class="action action-edit">
-            <button class="edit"><span class="icon fa fa-pencil" aria-hidden="true"></span> <%- gettext("Edit") %></button>
-        </li>
-        <% if (_.isEmpty(usage)) { %>
-            <li class="action action-delete wrapper-delete-button" data-tooltip="<%- gettext('Delete') %>">
-                <button class="delete action-icon" title="<%- gettext('Delete') %>"><span class="icon fa fa-trash-o" aria-hidden="true"></span></button>
-            </li>
-        <% } else { %>
-            <li class="action action-delete wrapper-delete-button" data-tooltip="<%- gettext('Cannot delete when in use by a unit') %>">
-                <button class="delete action-icon is-disabled" disabled="disabled" title="<%- gettext('Delete') %>"><span class="icon fa fa-trash-o" aria-hidden="true"></span></button>
+        <% if (!restrictEditing) { %>
+            <li class="action action-edit">
+                <button class="edit"><span class="icon fa fa-pencil" aria-hidden="true"></span> <%- gettext("Edit") %></button>
             </li>
+            <% if (_.isEmpty(usage)) { %>
+                <li class="action action-delete wrapper-delete-button" data-tooltip="<%- gettext('Delete') %>">
+                    <button class="delete action-icon" title="<%- gettext('Delete') %>"><span class="icon fa fa-trash-o" aria-hidden="true"></span></button>
+                </li>
+            <% } else { %>
+                <li class="action action-delete wrapper-delete-button" data-tooltip="<%- gettext('Cannot delete when in use by a unit') %>">
+                    <button class="delete action-icon is-disabled" disabled="disabled" title="<%- gettext('Delete') %>"><span class="icon fa fa-trash-o" aria-hidden="true"></span></button>
+                </li>
+            <% } %>
         <% } %>
     </ul>
 </div>
 
 <% if (showContentGroupUsages) { %>
   <div class="collection-references wrapper-group-configuration-usages">
     <% if (!_.isEmpty(usage)) { %>
-      <h4 class="intro group-configuration-usage-text"><%- gettext('This content group is used in:') %></h4>
+      <h4 class="intro group-configuration-usage-text">
+        <%- gettext('This group controls visibility of:') %>
+      </h4>
       <ol class="usage group-configuration-usage">
         <% _.each(usage, function(unit) { %>
           <li class="usage-unit group-configuration-usage-unit">
@@ -52,15 +56,18 @@
     <% } else { %>
         <p class="group-configuration-usage-text">
             <%= HtmlUtils.interpolateHtml(
-                gettext('This content group is not in use. Add a content group to any unit from the {linkStart}Course Outline{linkEnd}.'),
-                {
-                    linkStart: HtmlUtils.interpolateHtml(
-                        HtmlUtils.HTML('<a href="{courseOutlineUrl}" title="{courseOutlineTitle}">'),
-                        {courseOutlineUrl: courseOutlineUrl, courseOutlineTitle: gettext('Course Outline')}),
-                    linkEnd: HtmlUtils.HTML('</a>')
-                })
+                    gettext("Use this group to control a component's visibility in the {linkStart}Course Outline{linkEnd}."),
+                    {
+                        linkStart: HtmlUtils.interpolateHtml(
+                            HtmlUtils.HTML('<a href="{courseOutlineUrl}" title="{courseOutlineTitle}">'),
+                            {courseOutlineUrl: courseOutlineUrl, courseOutlineTitle: gettext('Course Outline')}
+                        ),
+                        linkEnd: HtmlUtils.HTML('</a>')
+                    }
+                )
             %>
+
         </p>
     <% } %>
   </div>
-<% } %>
+<% } %>

cms/templates/js/content-group-details.underscore cms/templates/js/partition-group-details.underscore

@@ -74,7 +74,7 @@ def _create_enrollment_track_partition(course):
 
     partition = enrollment_track_scheme.create_user_partition(
         id=ENROLLMENT_TRACK_PARTITION_ID,
-        name=_(u"Enrollment Tracks"),
+        name=_(u"Enrollment Track Groups"),
         description=_(u"Partition for segmenting users by enrollment track"),
         parameters={"course_id": unicode(course.id)}
     )

common/lib/xmodule/xmodule/partitions/partitions_service.py

@@ -4,6 +4,9 @@
 from bok_choy.promise import BrokenPromise
 from common.test.acceptance.tests.helpers import disable_animations
 from selenium.webdriver.common.action_chains import ActionChains
+from common.test.acceptance.pages.lms.pay_and_verify import PaymentAndVerificationFlow, FakePaymentPage
+from common.test.acceptance.pages.lms.track_selection import TrackSelectionPage
+from common.test.acceptance.pages.lms.create_mode import ModeCreationPage
 
 
 def sync_on_notification(page, style='default', wait_for_hide=False):
@@ -100,3 +103,44 @@ def hover(browser, element):
     Hover over an element.
     """
     ActionChains(browser).move_to_element(element).perform()
+
+
+def enroll_user_track(browser, course_id, track):
+    """
+    Utility method to enroll a user in the audit or verified user track.  Creates and connects to the
+    necessary pages. Selects the track and handles payment for verified.
+    Supported tracks are 'verified' or 'audit'.
+    """
+    payment_and_verification_flow = PaymentAndVerificationFlow(browser, course_id)
+    fake_payment_page = FakePaymentPage(browser, course_id)
+    track_selection = TrackSelectionPage(browser, course_id)
+
+    # Select track and process payment
+    track_selection.visit()
+    track_selection.enroll(track)
+    if track == 'verified':
+        payment_and_verification_flow.proceed_to_payment()
+        fake_payment_page.submit_payment()
+
+
+def add_enrollment_course_modes(browser, course_id, tracks):
+    """
+    Add the specified array of tracks to the given course.
+    Supported tracks are `verified` and `audit` (all others will be ignored),
+    and display names assigned are `Verified` and `Audit`, respectively.
+    """
+    for track in tracks:
+        if track == 'audit':
+            # Add an audit mode to the course
+            ModeCreationPage(
+                browser,
+                course_id, mode_slug='audit',
+                mode_display_name='Audit'
+            ).visit()
+
+        elif track == 'verified':
+            # Add a verified mode to the course
+            ModeCreationPage(
+                browser, course_id, mode_slug='verified',
+                mode_display_name='Verified', min_price=10
+            ).visit()

common/test/acceptance/pages/common/utils.py

@@ -34,24 +34,24 @@ def is_browser_on_page(self):
         """Check if the track selection page has loaded."""
         return self.q(css=".wrapper-register-choose").is_present()
 
-    def enroll(self, mode="honor"):
+    def enroll(self, mode="audit"):
         """Interact with one of the enrollment buttons on the page.
 
             Keyword Arguments:
-                mode (str): Can be "honor" or "verified"
+                mode (str): Can be "audit" or "verified"
 
             Raises:
                 ValueError
         """
-        if mode == "honor":
-            self.q(css="input[name='honor_mode']").click()
-
-            return DashboardPage(self.browser).wait_for_page()
-        elif mode == "verified":
+        if mode == "verified":
             # Check the first contribution option, then click the enroll button
             self.q(css=".contribution-option > input").first.click()
             self.q(css="input[name='verified_mode']").click()
-
             return PaymentAndVerificationFlow(self.browser, self._course_id).wait_for_page()
+
+        elif mode == "audit":
+            self.q(css="input[name='audit_mode']").click()
+            return DashboardPage(self.browser).wait_for_page()
+
         else:
-            raise ValueError("Mode must be either 'honor' or 'verified'.")
+            raise ValueError("Mode must be either 'audit' or 'verified'.")

common/test/acceptance/pages/lms/track_selection.py

@@ -112,7 +112,7 @@ class ComponentVisibilityEditorView(BaseComponentEditorView):
     OPTION_SELECTOR = '.partition-group-control .field'
     ALL_LEARNERS_AND_STAFF = 'All Learners and Staff'
     CONTENT_GROUP_PARTITION = 'Content Groups'
-    ENROLLMENT_TRACK_PARTITION = "Enrollment Tracks"
+    ENROLLMENT_TRACK_PARTITION = "Enrollment Track Groups"
 
     @property
     def all_group_options(self):

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

@@ -91,6 +91,17 @@ def experiment_group_sections_present(self):
         """
         return self.q(css=self.experiment_groups_css).present or self.q(css=".experiment-groups-doc").present
 
+    @property
+    def enrollment_track_section_present(self):
+        return self.q(css='.wrapper-groups.content-groups.enrollment_track').present
+
+    @property
+    def enrollment_track_edit_present(self):
+        return self.q(css='.wrapper-groups.content-groups.enrollment_track .action.action-edit').present
+
+    def get_enrollment_groups(self):
+        return self.q(css='.wrapper-groups.content-groups.enrollment_track .collection-details .title').text
+
 
 class GroupConfiguration(object):
     """

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

@@ -38,8 +38,8 @@
 from common.test.acceptance.pages.lms.progress import ProgressPage
 from common.test.acceptance.pages.lms.problem import ProblemPage
 from common.test.acceptance.pages.lms.tab_nav import TabNavPage
-from common.test.acceptance.pages.lms.track_selection import TrackSelectionPage
 from common.test.acceptance.pages.lms.video.video import VideoPage
+from common.test.acceptance.pages.common.utils import enroll_user_track
 from common.test.acceptance.pages.studio.settings import SettingsPage
 from common.test.acceptance.fixtures.course import CourseFixture, XBlockFixtureDesc, CourseUpdateDesc
 
@@ -417,7 +417,6 @@ def setUp(self):
         """
         super(PayAndVerifyTest, self).setUp()
 
-        self.track_selection_page = TrackSelectionPage(self.browser, self.course_id)
         self.payment_and_verification_flow = PaymentAndVerificationFlow(self.browser, self.course_id)
         self.immediate_verification_page = PaymentAndVerificationFlow(self.browser, self.course_id, entry_point='verify-now')
         self.upgrade_page = PaymentAndVerificationFlow(self.browser, self.course_id, entry_point='upgrade')
@@ -443,17 +442,7 @@ def test_immediate_verification_enrollment(self):
         # Create a user and log them in
         student_id = AutoAuthPage(self.browser).visit().get_user_id()
 
-        # Navigate to the track selection page
-        self.track_selection_page.visit()
-
-        # Enter the payment and verification flow by choosing to enroll as verified
-        self.track_selection_page.enroll('verified')
-
-        # Proceed to the fake payment page
-        self.payment_and_verification_flow.proceed_to_payment()
-
-        # Submit payment
-        self.fake_payment_page.submit_payment()
+        enroll_user_track(self.browser, self.course_id, 'verified')
 
         # Proceed to verification
         self.payment_and_verification_flow.immediate_verification()
@@ -480,17 +469,7 @@ def test_deferred_verification_enrollment(self):
         # Create a user and log them in
         student_id = AutoAuthPage(self.browser).visit().get_user_id()
 
-        # Navigate to the track selection page
-        self.track_selection_page.visit()
-
-        # Enter the payment and verification flow by choosing to enroll as verified
-        self.track_selection_page.enroll('verified')
-
-        # Proceed to the fake payment page
-        self.payment_and_verification_flow.proceed_to_payment()
-
-        # Submit payment
-        self.fake_payment_page.submit_payment()
+        enroll_user_track(self.browser, self.course_id, 'verified')
 
         # Navigate to the dashboard
         self.dashboard_page.visit()

common/test/acceptance/tests/lms/test_lms.py

@@ -19,9 +19,9 @@
 from common.test.acceptance.fixtures.course import CourseFixture, XBlockFixtureDesc
 from common.test.acceptance.pages.lms.dashboard import DashboardPage
 from common.test.acceptance.pages.lms.problem import ProblemPage
-from common.test.acceptance.pages.lms.track_selection import TrackSelectionPage
-from common.test.acceptance.pages.lms.pay_and_verify import PaymentAndVerificationFlow, FakePaymentPage
+from common.test.acceptance.pages.lms.pay_and_verify import PaymentAndVerificationFlow
 from common.test.acceptance.pages.lms.login_and_register import CombinedLoginAndRegisterPage
+from common.test.acceptance.pages.common.utils import enroll_user_track
 from common.test.acceptance.tests.helpers import disable_animations
 from common.test.acceptance.fixtures.certificates import CertificateConfigFixture
 
@@ -247,13 +247,6 @@ def setUp(self):
             )
         ).install()
 
-        self.track_selection_page = TrackSelectionPage(self.browser, self.course_id)
-        self.payment_and_verification_flow = PaymentAndVerificationFlow(self.browser, self.course_id)
-        self.immediate_verification_page = PaymentAndVerificationFlow(
-            self.browser, self.course_id, entry_point='verify-now'
-        )
-        self.upgrade_page = PaymentAndVerificationFlow(self.browser, self.course_id, entry_point='upgrade')
-        self.fake_payment_page = FakePaymentPage(self.browser, self.course_id)
         self.dashboard_page = DashboardPage(self.browser)
         self.problem_page = ProblemPage(self.browser)
 
@@ -279,19 +272,7 @@ def _login_as_a_verified_user(self):
         """
 
         self._auto_auth(self.USERNAME, self.EMAIL, False)
-
-        # the track selection page cannot be visited. see the other tests to see if any prereq is there.
-        # Navigate to the track selection page
-        self.track_selection_page.visit()
-
-        # Enter the payment and verification flow by choosing to enroll as verified
-        self.track_selection_page.enroll('verified')
-
-        # Proceed to the fake payment page
-        self.payment_and_verification_flow.proceed_to_payment()
-
-        # Submit payment
-        self.fake_payment_page.submit_payment()
+        enroll_user_track(self.browser, self.course_id, 'verified')
 
     def _create_a_proctored_exam_and_attempt(self):
         """

common/test/acceptance/tests/lms/test_lms_instructor_dashboard.py

@@ -18,6 +18,8 @@
 from common.test.acceptance.pages.studio.settings_group_configurations import GroupConfigurationsPage
 from common.test.acceptance.pages.lms.courseware import CoursewarePage
 from common.test.acceptance.pages.studio.utils import get_input_value
+from common.test.acceptance.pages.common.utils import add_enrollment_course_modes
+
 from textwrap import dedent
 from xmodule.partitions.partitions import Group
 
@@ -231,6 +233,56 @@ def test_content_group_empty_usage(self):
         self.outline_page.wait_for_page()
 
 
+@attr(shard=5)
+class EnrollmentTrackModeTest(StudioCourseTest):
+
+    def setUp(self, is_staff=True, test_xss=True):
+        super(EnrollmentTrackModeTest, self).setUp(is_staff=is_staff)
+
+        self.audit_track = "Audit"
+        self.verified_track = "Verified"
+        self.staff_user = self.user
+
+    def test_all_course_modes_present(self):
+        """
+        This test is meant to ensure that all the course modes show up as groups
+        on the Group configuration page within the Enrollment Tracks section.
+        It also checks to make sure that the edit buttons are not available.
+        """
+        add_enrollment_course_modes(self.browser, self.course_id, ['audit', 'verified'])
+        group_configurations_page = GroupConfigurationsPage(
+            self.browser,
+            self.course_info['org'],
+            self.course_info['number'],
+            self.course_info['run']
+        )
+        group_configurations_page.visit()
+        self.assertTrue(group_configurations_page.enrollment_track_section_present)
+
+        # Make sure the edit buttons are not available.
+        self.assertFalse(group_configurations_page.enrollment_track_edit_present)
+        groups = group_configurations_page.get_enrollment_groups()
+        for g in [self.audit_track, self.verified_track]:
+            self.assertTrue(g in groups)
+
+    def test_one_course_mode(self):
+        """
+        The purpose of this test is to ensure that when there is 1 or fewer course modes
+        the enrollment track section is not shown.
+        """
+        add_enrollment_course_modes(self.browser, self.course_id, ['audit'])
+        group_configurations_page = GroupConfigurationsPage(
+            self.browser,
+            self.course_info['org'],
+            self.course_info['number'],
+            self.course_info['run']
+        )
+        group_configurations_page.visit()
+        self.assertFalse(group_configurations_page.enrollment_track_section_present)
+        groups = group_configurations_page.get_enrollment_groups()
+        self.assertEqual(len(groups), 0)
+
+
 @attr(shard=8)
 class AdvancedSettingsValidationTest(StudioCourseTest):
     """

common/test/acceptance/tests/studio/test_studio_settings.py

@@ -3,21 +3,24 @@
 """
 
 import json
-from nose.plugins.attrib import attr
-
-from studio.base_studio_test import ContainerBase
 
-from common.test.acceptance.pages.studio.settings_group_configurations import GroupConfigurationsPage
-from common.test.acceptance.pages.studio.auto_auth import AutoAuthPage as StudioAutoAuthPage
-from common.test.acceptance.fixtures.course import XBlockFixtureDesc
+from bok_choy.page_object import XSS_INJECTION
 from common.test.acceptance.fixtures import LMS_BASE_URL
-from common.test.acceptance.pages.studio.component_editor import ComponentVisibilityEditorView
-from common.test.acceptance.pages.lms.instructor_dashboard import InstructorDashboardPage
-from common.test.acceptance.pages.lms.courseware import CoursewarePage
+from common.test.acceptance.fixtures.course import XBlockFixtureDesc
+from common.test.acceptance.pages.common.utils import enroll_user_track, add_enrollment_course_modes
 from common.test.acceptance.pages.lms.auto_auth import AutoAuthPage as LmsAutoAuthPage
+from common.test.acceptance.pages.lms.courseware import CoursewarePage
+from common.test.acceptance.pages.lms.instructor_dashboard import InstructorDashboardPage
+from common.test.acceptance.pages.studio.auto_auth import AutoAuthPage as StudioAutoAuthPage
+from common.test.acceptance.pages.studio.component_editor import ComponentVisibilityEditorView
+from common.test.acceptance.pages.studio.settings_group_configurations import GroupConfigurationsPage
 from common.test.acceptance.tests.lms.test_lms_user_preview import verify_expected_problem_visibility
+from nose.plugins.attrib import attr
 
-from bok_choy.page_object import XSS_INJECTION
+from studio.base_studio_test import ContainerBase
+
+AUDIT_TRACK = "Audit"
+VERIFIED_TRACK = "Verified"
 
 
 @attr(shard=5)
@@ -34,6 +37,9 @@ def setUp(self, is_staff=True):
         self.content_group_a = "Content Group A" + XSS_INJECTION
         self.content_group_b = "Content Group B" + XSS_INJECTION
 
+        # Creates the Course modes needed to test enrollment tracks
+        add_enrollment_course_modes(self.browser, self.course_id, ["audit", "verified"])
+
         # Create a student who will be in "Cohort A"
         self.cohort_a_student_username = "cohort_a_student"
         self.cohort_a_student_email = "cohort_a_student@example.com"
@@ -48,6 +54,26 @@ def setUp(self, is_staff=True):
             self.browser, username=self.cohort_b_student_username, email=self.cohort_b_student_email, no_login=True
         ).visit()
 
+        # Create a Verified Student
+        self.cohort_verified_student_username = "cohort_verified_student"
+        self.cohort_verified_student_email = "cohort_verified_student@example.com"
+        StudioAutoAuthPage(
+            self.browser,
+            username=self.cohort_verified_student_username,
+            email=self.cohort_verified_student_email,
+            no_login=True
+        ).visit()
+
+        # Create audit student
+        self.cohort_audit_student_username = "cohort_audit_student"
+        self.cohort_audit_student_email = "cohort_audit_student@example.com"
+        StudioAutoAuthPage(
+            self.browser,
+            username=self.cohort_audit_student_username,
+            email=self.cohort_audit_student_email,
+            no_login=True
+        ).visit()
+
         # Create a student who will end up in the default cohort group
         self.cohort_default_student_username = "cohort_default_student"
         self.cohort_default_student_email = "cohort_default_student@example.com"
@@ -67,14 +93,20 @@ def populate_course_fixture(self, course_fixture):
         """
         self.group_a_problem = 'GROUP A CONTENT'
         self.group_b_problem = 'GROUP B CONTENT'
+        self.group_verified_problem = 'GROUP VERIFIED CONTENT'
+        self.group_audit_problem = 'GROUP AUDIT CONTENT'
+
         self.group_a_and_b_problem = 'GROUP A AND B CONTENT'
+
         self.visible_to_all_problem = 'VISIBLE TO ALL CONTENT'
         course_fixture.add_children(
             XBlockFixtureDesc('chapter', 'Test Section').add_children(
                 XBlockFixtureDesc('sequential', 'Test Subsection').add_children(
                     XBlockFixtureDesc('vertical', 'Test Unit').add_children(
                         XBlockFixtureDesc('problem', self.group_a_problem, data='<problem></problem>'),
                         XBlockFixtureDesc('problem', self.group_b_problem, data='<problem></problem>'),
+                        XBlockFixtureDesc('problem', self.group_verified_problem, data='<problem></problem>'),
+                        XBlockFixtureDesc('problem', self.group_audit_problem, data='<problem></problem>'),
                         XBlockFixtureDesc('problem', self.group_a_and_b_problem, data='<problem></problem>'),
                         XBlockFixtureDesc('problem', self.visible_to_all_problem, data='<problem></problem>')
                     )
@@ -115,20 +147,26 @@ def create_content_groups(self):
 
     def link_problems_to_content_groups_and_publish(self):
         """
-        Updates 3 of the 4 existing problems to limit their visibility by content group.
+        Updates 5 of the 6 existing problems to limit their visibility by content group.
         Publishes the modified units.
         """
         container_page = self.go_to_unit_page()
+        enrollment_group = 'enrollment_track_group'
 
-        def set_visibility(problem_index, groups):
+        def set_visibility(problem_index, groups, group_partition='content_group'):
             problem = container_page.xblocks[problem_index]
             problem.edit_visibility()
             visibility_dialog = ComponentVisibilityEditorView(self.browser, problem.locator)
-            visibility_dialog.select_groups_in_partition_scheme(visibility_dialog.CONTENT_GROUP_PARTITION, groups)
+            partition_name = (visibility_dialog.ENROLLMENT_TRACK_PARTITION
+                              if group_partition == enrollment_group
+                              else visibility_dialog.CONTENT_GROUP_PARTITION)
+            visibility_dialog.select_groups_in_partition_scheme(partition_name, groups)
 
         set_visibility(1, [self.content_group_a])
         set_visibility(2, [self.content_group_b])
-        set_visibility(3, [self.content_group_a, self.content_group_b])
+        set_visibility(3, [VERIFIED_TRACK], enrollment_group)
+        set_visibility(4, [AUDIT_TRACK], enrollment_group)
+        set_visibility(5, [self.content_group_a, self.content_group_b])
 
         container_page.publish_action.click()
 
@@ -150,54 +188,81 @@ def add_cohort_with_student(cohort_name, content_group, student):
 
     def view_cohorted_content_as_different_users(self):
         """
-        View content as staff, student in Cohort A, student in Cohort B, and student in Default Cohort.
+        View content as staff, student in Cohort A, student in Cohort B, Verified Student, Audit student,
+        and student in Default Cohort.
         """
         courseware_page = CoursewarePage(self.browser, self.course_id)
 
-        def login_and_verify_visible_problems(username, email, expected_problems):
+        def login_and_verify_visible_problems(username, email, expected_problems, track=None):
             LmsAutoAuthPage(
                 self.browser, username=username, email=email, course_id=self.course_id
             ).visit()
+            if track is not None:
+                enroll_user_track(self.browser, self.course_id, track)
             courseware_page.visit()
             verify_expected_problem_visibility(self, courseware_page, expected_problems)
 
         login_and_verify_visible_problems(
             self.staff_user["username"], self.staff_user["email"],
-            [self.group_a_problem, self.group_b_problem, self.group_a_and_b_problem, self.visible_to_all_problem]
+            [self.group_a_problem,
+             self.group_b_problem,
+             self.group_verified_problem,
+             self.group_audit_problem,
+             self.group_a_and_b_problem,
+             self.visible_to_all_problem
+             ],
         )
 
         login_and_verify_visible_problems(
             self.cohort_a_student_username, self.cohort_a_student_email,
-            [self.group_a_problem, self.group_a_and_b_problem, self.visible_to_all_problem]
+            [self.group_a_problem, self.group_audit_problem, self.group_a_and_b_problem, self.visible_to_all_problem]
         )
 
         login_and_verify_visible_problems(
             self.cohort_b_student_username, self.cohort_b_student_email,
-            [self.group_b_problem, self.group_a_and_b_problem, self.visible_to_all_problem]
+            [self.group_b_problem, self.group_audit_problem, self.group_a_and_b_problem, self.visible_to_all_problem]
+        )
+
+        login_and_verify_visible_problems(
+            self.cohort_verified_student_username, self.cohort_verified_student_email,
+            [self.group_verified_problem, self.visible_to_all_problem],
+            'verified'
+        )
+
+        login_and_verify_visible_problems(
+            self.cohort_audit_student_username, self.cohort_audit_student_email,
+            [self.group_audit_problem, self.visible_to_all_problem],
+            'audit'
         )
 
         login_and_verify_visible_problems(
             self.cohort_default_student_username, self.cohort_default_student_email,
-            [self.visible_to_all_problem]
+            [self.group_audit_problem, self.visible_to_all_problem],
         )
 
     def test_cohorted_courseware(self):
         """
         Scenario: Can create content that is only visible to students in particular cohorts
-          Given that I have course with 4 problems, 1 staff member, and 3 students
+          Given that I have course with 6 problems, 1 staff member, and 6 students
           When I enable cohorts in the course
+          And I add the Course Modes for Verified and Audit
           And I create two content groups, Content Group A, and Content Group B, in the course
           And I link one problem to Content Group A
           And I link one problem to Content Group B
+          And I link one problem to the Verified Group
+          And I link one problem to the Audit Group
           And I link one problem to both Content Group A and Content Group B
           And one problem remains unlinked to any Content Group
           And I create two manual cohorts, Cohort A and Cohort B,
             linked to Content Group A and Content Group B, respectively
           And I assign one student to each manual cohort
+          And I assign one student to each enrollment track
           And one student remains in the default cohort
-          Then the staff member can see all 4 problems
-          And the student in Cohort A can see all the problems except the one linked to Content Group B
-          And the student in Cohort B can see all the problems except the one linked to Content Group A
+          Then the staff member can see all 6 problems
+          And the student in Cohort A can see all the problems linked to A
+          And the student in Cohort B can see all the problems linked to B
+          And the student in Verified can see the problems linked to Verified and those not linked to a Group
+          And the student in Audit can see the problems linked to Audit and those not linked to a Group
           And the student in the default cohort can ony see the problem that is unlinked to any Content Group
         """
         self.enable_cohorting(self.course_fixture)

common/test/acceptance/tests/test_cohorted_courseware.py

@@ -39,6 +39,7 @@ login = getting_started/index.html
 register = getting_started/index.html
 content_libraries = course_components/libraries.html
 content_groups = course_features/cohorts/cohorted_courseware.html
+enrollment_tracks = course_features/cohorts/cohorted_courseware.html
 group_configurations = course_features/content_experiments/content_experiments_configure.html#set-up-group-configurations-in-edx-studio
 container = developing_course/course_components.html#components-that-contain-other-components
 video = video/video_uploads.html

docs/cms_config.ini

@@ -135,6 +135,7 @@
   .entry-title {
     padding-bottom: 8px;
     margin-bottom: 22px;
+    margin-top: 0;
     border-bottom: 1px solid $light-gray;
     font-size: 1.6em;
     font-weight: bold;

lms/static/sass/course/wiki/_wiki.scss

@@ -45,17 +45,11 @@ def groups(self):
             for mode in CourseMode.modes_for_course(course_key, include_expired=True, only_selectable=False)
         ]
 
-    def to_json(self):
-        """
-        Because this partition is dynamic, to_json and from_json are not supported.
-
-        Calling this method will raise a TypeError.
-        """
-        raise TypeError("Because EnrollmentTrackUserPartition is a dynamic partition, 'to_json' is not supported.")
-
     def from_json(self):
         """
-        Because this partition is dynamic, to_json and from_json are not supported.
+        Because this partition is dynamic, `from_json` is not supported.
+        `to_json` is supported, but shouldn't be used to persist this partition
+        within the course itself (used by Studio for sending data to front-end code)
 
         Calling this method will raise a TypeError.
         """
@@ -116,7 +110,7 @@ def create_user_partition(cls, id, name, description, groups=None, parameters=No
         Any group access rule referencing inactive partitions will be ignored
         when performing access checks.
         """
-        return EnrollmentTrackUserPartition(id, name, description, [], cls, parameters, active)
+        return EnrollmentTrackUserPartition(id, unicode(name), unicode(description), [], cls, parameters, active)
 
 
 def is_course_using_cohort_instead(course_key):

openedx/core/djangoapps/verified_track_content/partition_scheme.py

@@ -53,10 +53,11 @@ def test_multiple_groups(self):
         self.assertIsNotNone(self.get_group_by_name(partition, "Verified Enrollment Track"))
         self.assertIsNotNone(self.get_group_by_name(partition, "Credit Mode"))
 
-    def test_to_json_not_supported(self):
-        user_partition = create_enrollment_track_partition(self.course)
-        with self.assertRaises(TypeError):
-            user_partition.to_json()
+    def test_to_json_supported(self):
+        user_partition_json = create_enrollment_track_partition(self.course).to_json()
+        self.assertEqual('Test Enrollment Track Partition', user_partition_json['name'])
+        self.assertEqual('enrollment_track', user_partition_json['scheme'])
+        self.assertEqual('Test partition for segmenting users by enrollment track', user_partition_json['description'])
 
     def test_from_json_not_supported(self):
         with self.assertRaises(TypeError):