test(sortable): test that deleted options are restored to their default values

Author: thgreasi

test/sortable.e2e.callbacks.spec.js

@@ -457,6 +457,61 @@ describe('uiSortable', function() {
       });
     });
 
+    it('should properly reset a deleted callback option', function() {
+      inject(function($compile, $rootScope) {
+        var element, logsElement;
+        element = $compile(''.concat(
+          '<ul ui-sortable="opts" ng-model="items">',
+          beforeLiElement,
+          '<li ng-repeat="item in items" id="s-{{$index}}">{{ item }}</li>',
+          afterLiElement +
+          '</ul>'))($rootScope);
+        logsElement = $compile(''.concat(
+          '<ul ng-model="logs">',
+          beforeLiElement,
+          '<li ng-repeat="log in logs" id="l-{{$index}}">{{ log }}</li>',
+          afterLiElement +
+          '</ul>'))($rootScope);
+        $rootScope.$apply(function() {
+          $rootScope.opts = {
+            stop: function(e, ui) {
+              $rootScope.logs.push('Moved element ' + ui.item.sortable.model);
+            }
+          };
+          $rootScope.items = ['One', 'Two', 'Three'];
+          $rootScope.logs = [];
+        });
+
+        host.append(element).append(logsElement);
+
+        var li = element.find('[ng-repeat]:eq(1)');
+        var dy = (1 + EXTRA_DY_PERCENTAGE) * li.outerHeight();
+        li.simulate('drag', { dy: dy });
+        expect($rootScope.items).toEqual(['One', 'Three', 'Two']);
+        expect($rootScope.logs).toEqual(['Moved element Two']);
+        expect($rootScope.items).toEqual(listContent(element));
+        expect($rootScope.logs).toEqual(listContent(logsElement));
+
+        $rootScope.$digest();
+          
+        $rootScope.$apply(function() {
+          $rootScope.opts = {};
+        });
+
+        li = element.find('[ng-repeat]:eq(0)');
+        dy = (1 + EXTRA_DY_PERCENTAGE) * li.outerHeight();
+        li.simulate('drag', { dy: dy });
+        expect($rootScope.items).toEqual(['Three', 'One', 'Two']);
+        expect($rootScope.items).toEqual(listContent(element));
+        // the log should be the same
+        expect($rootScope.logs).toEqual(['Moved element Two']);
+        expect($rootScope.logs).toEqual(listContent(logsElement));
+
+        $(element).remove();
+        $(logsElement).remove();
+      });
+    });
+
   }
 
   [0, 1].forEach(function(useExtraElements){

test/sortable.e2e.directiveoptions.spec.js

@@ -200,6 +200,46 @@ describe('uiSortable', function() {
       });
     });
 
+    it('should properly reset deleted directive options', function() {
+      inject(function($compile, $rootScope) {
+        var element, logsElement;
+        element = $compile(''.concat(
+          '<ul ui-sortable="opts" ng-model="items">',
+          beforeLiElement,
+          '<li ng-repeat="item in items" id="s-{{$index}}">{{ item }}</li>',
+          afterLiElement +
+          '</ul>'))($rootScope);
+        $rootScope.$apply(function() {
+          $rootScope.opts = {
+            'ui-floating': true
+          };
+          $rootScope.items = ['One', 'Two', 'Three'];
+        });
+
+        host.append(element).append(logsElement);
+
+        var sortableWidgetInstance = element.data('ui-sortable');
+        
+        expect(sortableWidgetInstance.floating).toBe(true);
+
+        $rootScope.$digest();
+          
+        $rootScope.$apply(function() {
+          $rootScope.opts = {};
+        });
+
+        var li = element.find('[ng-repeat]:eq(1)');
+        var dy = (1 + EXTRA_DY_PERCENTAGE) * li.outerHeight();
+        li.simulate('drag', { dy: dy });
+        expect($rootScope.items).toEqual(['One', 'Three', 'Two']);
+        expect($rootScope.items).toEqual(listContent(element));
+        expect(sortableWidgetInstance.floating).toBe(false);
+
+        $(element).remove();
+        $(logsElement).remove();
+      });
+    });
+
   }
 
   [0, 1].forEach(function(useExtraElements){

test/sortable.spec.js

@@ -256,16 +256,55 @@ describe('uiSortable', function() {
 
       });
 
+      it('should properly reset the value of a deleted option', function() {
 
+        inject(function($compile, $rootScope, $timeout) {
+          var element;
+          var childScope = $rootScope.$new();
+          childScope.opts = {
+            opacity: 0.7,
+            placeholder: 'phClass',
+            update: function() { }
+          };
 
+          element = $compile('<div><ul data-ui-sortable="opts" data-ng-model="items"></ul></div>')(childScope);
+          var $sortableElement = element.find('[data-ui-sortable]');
 
+          expect($sortableElement.sortable('option', 'opacity')).toBe(0.7);
+          expect($sortableElement.sortable('option', 'placeholder')).toBe('phClass');
+          expect(typeof $sortableElement.sortable('option', 'update')).toBe('function');
 
+          $rootScope.$digest();
 
+          $rootScope.$apply(function() {
+            delete childScope.opts.opacity;
+          });
 
-    });
+          expect($sortableElement.sortable('option', 'opacity')).toBe(false);
+          expect($sortableElement.sortable('option', 'placeholder')).toBe('phClass');
+          expect(typeof $sortableElement.sortable('option', 'update')).toBe('function');
 
+          $rootScope.$digest();
 
+          $rootScope.$apply(function() {
+            childScope.opts = {};
+          });
 
+          expect($sortableElement.sortable('option', 'opacity')).toBe(false);
+          expect($sortableElement.sortable('option', 'placeholder')).toBe(false);
+          expect(typeof $sortableElement.sortable('option', 'update')).toBe('function');
+
+          element.remove(element.firstChild);
+
+          expect(function() {
+            $timeout.flush();
+          }).not.toThrow();
+
+        });
+
+      });
+
+    });
 
 
   });