Update unit test based on changes in master.

CHANGELOG.rst

@@ -5,6 +5,8 @@ These are notable changes in edx-platform.  This is a rolling list of changes,
 in roughly chronological order, most recent first.  Add your entries at or near
 the top.  Include a label indicating the component affected.
 
+Studio: Add drag-and-drop support to the container page. STUD-1309.
+
 Common: Add extensible third-party auth module.
 
 Blades: Handle situation if no response were sent from XQueue to LMS in Matlab

cms/static/js/spec/views/modals/edit_xblock_spec.js

@@ -12,7 +12,7 @@ define(["jquery", "underscore", "js/spec_helpers/create_sinon", "js/spec_helpers
 
             beforeEach(function () {
                 edit_helpers.installEditTemplates();
-                appendSetFixtures('<div class="xblock" data-locator="mock-xblock" data-display-name="Mock XBlock"></div>');
+                appendSetFixtures('<div class="xblock" data-locator="mock-xblock"></div>');
                 model = new XBlockInfo({
                     id: 'testCourse/branch/draft/block/verticalFFF',
                     display_name: 'Test Unit',

cms/static/js/views/container.js

@@ -4,8 +4,8 @@ define(["jquery", "underscore", "js/views/xblock", "js/utils/module", "gettext",
 
             xblockReady: function () {
                 XBlockView.prototype.xblockReady.call(this);
-                var verticalContainer = $(this.$el).find('.vertical-container'),
-                    alreadySortable = $(this.$el).find('.ui-sortable'),
+                var verticalContainer = this.$('.vertical-container'),
+                    alreadySortable = this.$('.ui-sortable'),
                     newParent,
                     oldParent,
                     self = this;
@@ -16,6 +16,8 @@ define(["jquery", "underscore", "js/views/xblock", "js/utils/module", "gettext",
                     handle: '.drag-handle',
 
                     stop: function (event, ui) {
+                        var saving, hideSaving, removeFromParent;
+
                         console.log('stop');
 
                         if (oldParent === undefined) {
@@ -24,12 +26,12 @@ define(["jquery", "underscore", "js/views/xblock", "js/utils/module", "gettext",
                             return;
                         }
 
-                        var saving = new NotificationView.Mini({
+                        saving = new NotificationView.Mini({
                             title: gettext('Saving…')
                         });
                         saving.show();
 
-                        var hideSaving = function () {
+                        hideSaving = function () {
                             saving.hide();
                         };
 
@@ -37,12 +39,11 @@ define(["jquery", "underscore", "js/views/xblock", "js/utils/module", "gettext",
                         // add to new container before deleting from old to
                         // avoid creating an orphan if the addition fails.
                         if (newParent) {
-                            var removeFromParent = oldParent;
+                            removeFromParent = oldParent;
                             self.reorder(newParent, function () {
                                 self.reorder(removeFromParent, hideSaving);
                             });
-                        }
-                        else {
+                        } else {
                             // No new parent, only reordering within same container.
                             self.reorder(oldParent, hideSaving);
                         }
@@ -60,8 +61,7 @@ define(["jquery", "underscore", "js/views/xblock", "js/utils/module", "gettext",
                         if (ui.sender) {
                             // Move to a new container (the addition part).
                             newParent = parent;
-                        }
-                        else {
+                        } else {
                             // Reorder inside a container, or deletion when moving to new container.
                             oldParent = parent;
                         }
@@ -79,16 +79,18 @@ define(["jquery", "underscore", "js/views/xblock", "js/utils/module", "gettext",
             },
 
             reorder: function (targetParent, successCallback) {
+                var children, childLocators;
+
                 console.log('calling reorder for ' + targetParent.data('locator'));
 
                 // Find descendants with class "wrapper-xblock" whose parent == targetParent.
                 // This is necessary to filter our grandchildren, great-grandchildren, etc.
-                var children = targetParent.find('.wrapper-xblock').filter(function () {
+                children = targetParent.find('.wrapper-xblock').filter(function () {
                     var parent = $(this).parent().closest('.wrapper-xblock');
                     return parent.data('locator') === targetParent.data('locator');
                 });
 
-                var childLocators = _.map(
+                childLocators = _.map(
                     children,
                     function (child) {
                         return $(child).data('locator');