Added extra test cases.

Author: thgreasi

test/sortable.spec.js

@@ -3,6 +3,8 @@ describe('uiSortable', function() {
   // Ensure the sortable angular module is loaded
   beforeEach(module('ui.sortable'));
 
+  var EXTRA_DY_PERCENTAGE = 0.25;
+
   describe('simple use', function() {
 
     it('should have a ui-sortable class', function() {
@@ -13,26 +15,149 @@ describe('uiSortable', function() {
       });
     });
 
+    it('should log that ngModel was not provided', function() {
+      inject(function($compile, $rootScope, $log) {
+        var element;
+        element = $compile('<ul ui-sortable><li ng-repeat="item in items" id="s-{{$index}}">{{ item }}</li></ul>')($rootScope);
+        $rootScope.$apply(function() {
+          $rootScope.items = ["One", "Two", "Three"];
+        });
+
+        expect($log.info.logs.length).toEqual(1);
+        expect($log.info.logs[0].length).toEqual(2);
+        expect($log.info.logs[0][0]).toEqual('ui.sortable: ngModel not provided!');
+      });
+    });
+
+  });
+
+  describe('Drag & Drop simulation', function() {
+
+    var host;
+
+    beforeEach(inject(function() {
+      host = $('<div id="test-host"></div>');
+      $('body').append(host);
+    }));
+
+    afterEach(function() {
+      host.remove();
+      host = null;
+    });
+
     it('should update model when order changes', function() {
       inject(function($compile, $rootScope) {
         var element;
         element = $compile('<ul ui-sortable ng-model="items"><li ng-repeat="item in items" id="s-{{$index}}">{{ item }}</li></ul>')($rootScope);
         $rootScope.$apply(function() {
-          return $rootScope.items = ["One", "Two", "Three"];
+          $rootScope.items = ["One", "Two", "Three"];
         });
 
-        element.find('li:eq(1)').insertAfter(element.find('li:eq(2)'));
+        host.append(element);
 
-        $('body').append(element);
         var li = element.find(':eq(1)');
-        var dy = 1.25 * li.outerHeight();
-        li.simulate('drag', { dx: 0, dy: dy });
-
+        var dy = (1 + EXTRA_DY_PERCENTAGE) * li.outerHeight();
+        li.simulate('drag', { dy: dy });
         expect($rootScope.items).toEqual(["One", "Three", "Two"]);
+
+        li = element.find(':eq(1)');
+        dy = -(1 + EXTRA_DY_PERCENTAGE) * li.outerHeight();
+        li.simulate('drag', { dy: dy });
+        expect($rootScope.items).toEqual(["Three", "One", "Two"]);
+
+        $(element).remove();
+      });
+    });
+
+    it('should cancel sorting of node "Two"', function() {
+      inject(function($compile, $rootScope) {
+        var element;
+        element = $compile('<ul ui-sortable="opts" ng-model="items"><li ng-repeat="item in items" id="s-{{$index}}">{{ item }}</li></ul>')($rootScope);
+        $rootScope.$apply(function() {
+          $rootScope.opts ={
+            update: function(e, ui) {
+              if (ui.item.scope().item === "Two") {
+                ui.item.parent().sortable('cancel');
+              }
+            }
+          };
+          $rootScope.items = ["One", "Two", "Three"];
+        });
+
+        host.append(element);
+
+        var li = element.find(':eq(1)');
+        var dy = (1 + EXTRA_DY_PERCENTAGE) * li.outerHeight();
+        li.simulate('drag', { dy: dy });
+        expect($rootScope.items).toEqual(["One", "Two", "Three"]);
+
+        li = element.find(':eq(0)');
+        dy = (2 + EXTRA_DY_PERCENTAGE) * li.outerHeight();
+        li.simulate('drag', { dy: dy });
+        expect($rootScope.items).toEqual(["Two", "Three", "One"]);
+
         $(element).remove();
       });
     });
 
+    it('should update model from stop() callback', function() {
+      inject(function($compile, $rootScope) {
+        // TODO
+      });
+    });
+
+    it('should not allow sorting of "locked" nodes', function() {
+      inject(function($compile, $rootScope) {
+        var element;
+        element = $compile('<ul ui-sortable="opts" ng-model="items"><li ng-repeat="item in items" id="s-{{$index}}" ng-class="{ sortable: item.sortable }">{{ item.text }}</li></ul>')($rootScope);
+        $rootScope.$apply(function() {
+          $rootScope.opts ={
+            items:'> .sortable'
+          };
+          $rootScope.items = [
+            { text: "One", sortable: true },
+            { text: "Two", sortable: true },
+            { text: "Three", sortable: false },
+            { text: "Four", sortable: true }
+          ];
+        });
+
+        host.append(element);
+
+        var li = element.find(':eq(2)');
+        var dy = (1 + EXTRA_DY_PERCENTAGE) * li.outerHeight();
+        li.simulate('drag', { dy: dy });
+        expect($rootScope.items.map(function(x){ return x.text; })).toEqual(["One", "Two", "Three", "Four"]);
+
+        li = element.find(':eq(1)');
+        dy = (2 + EXTRA_DY_PERCENTAGE) * li.outerHeight();
+        li.simulate('drag', { dy: dy });
+        expect($rootScope.items.map(function(x){ return x.text; })).toEqual(["One", "Three", "Four", "Two"]);
+
+        // // fails on angular 1.2
+        // li = element.find(':eq(2)');
+        // dy = -(2 + EXTRA_DY_PERCENTAGE) * li.outerHeight();
+        // li.simulate('drag', { dy: dy });
+        // expect($rootScope.items.map(function(x){ return x.text; })).toEqual(["Four", "One", "Three", "Two"]);
+
+        // // fails on angular 1.2
+        // li = element.find(':eq(3)');
+        // dy = -(2 + EXTRA_DY_PERCENTAGE) * li.outerHeight();
+        // li.simulate('drag', { dy: dy });
+        // expect($rootScope.items.map(function(x){ return x.text; })).toEqual(["Four", "Two", "One", "Three"]);
+
+        // also placing right above the locked node seems a bit harder !?!?
+
+        $(element).remove();
+      });
+    });
+
+    it('should update model when sorting between sortables', function() {
+      inject(function($compile, $rootScope) {
+        // TODO
+      });
+    });
+
   });
 
 });