Merge pull request #302 from thgreasi/testForPR295CrossScope

test: test droptargetModel when sorting between different scopes

Author: thgreasi

test/sortable.e2e.multi.spec.js

@@ -98,8 +98,8 @@ describe('uiSortable', function() {
         expect(itemsTop).toEqual(listContent(elementTop));
         expect(itemsBottom).toEqual(listContent(elementBottom));
 
-        $(elementTop).remove();
-        $(elementBottom).remove();
+        $(wrapperBottom).remove();
+        $(wrapperTop).remove();
       });
     });
 
@@ -725,6 +725,88 @@ describe('uiSortable', function() {
       });
     });
 
+    it('should properly set ui.item.sortable.droptargetModel when sorting between different scopes', function() {
+      inject(function($compile, $rootScope) {
+        var elementTop, elementBottom,
+            wrapperTop, wrapperBottom,
+            itemsTop, itemsBottom,
+            updateCallbackExpectations;
+        wrapperTop = $compile('<div ng-controller="dummyController"><ul ui-sortable="opts" class="cross-sortable" ng-model="itemsTop"><li ng-repeat="item in itemsTop" id="s-top-{{$index}}">{{ item }}</li></ul></div>')($rootScope);
+        wrapperBottom = $compile('<div ng-controller="dummyController"><ul ui-sortable="opts" class="cross-sortable" ng-model="itemsBottom"><li ng-repeat="item in itemsBottom" id="s-bottom-{{$index}}">{{ item }}</li></ul></div>')($rootScope);
+
+        host.append(wrapperTop).append(wrapperBottom).append('<div class="clear"></div>');
+        $rootScope.$apply(function() {
+          wrapperTop.scope().itemsTop = itemsTop = ['Top One', 'Top Two', 'Top Three'];
+          wrapperBottom.scope().itemsBottom = itemsBottom = ['Bottom One', 'Bottom Two', 'Bottom Three'];
+          $rootScope.opts = {
+            connectWith: '.cross-sortable',
+            update: function(e, ui) {
+              if (ui.item.scope() &&
+                (typeof ui.item.scope().item === 'string') &&
+                ui.item.scope().item.indexOf('Two') >= 0) {
+                ui.item.sortable.cancel();
+              }
+              updateCallbackExpectations(ui.item.sortable);
+            }
+          };
+        });
+
+        elementTop = wrapperTop.find('> [ui-sortable]');
+        elementBottom = wrapperBottom.find('> [ui-sortable]');
+
+        var li1 = elementTop.find(':eq(1)');
+        var li2 = elementBottom.find(':eq(0)');
+        updateCallbackExpectations = function(uiItemSortable) {
+          expect(uiItemSortable.droptargetModel).toBe(itemsBottom);
+        };
+        simulateElementDrag(li1, li2, { place: 'below', extradx: -20, extrady: -10 });
+        expect(itemsTop).toEqual(['Top One', 'Top Two', 'Top Three']);
+        expect(itemsBottom).toEqual(['Bottom One', 'Bottom Two', 'Bottom Three']);
+        expect(itemsTop).toEqual(listContent(elementTop));
+        expect(itemsBottom).toEqual(listContent(elementBottom));
+        updateCallbackExpectations = undefined;
+
+        li1 = elementBottom.find(':eq(1)');
+        li2 = elementTop.find(':eq(1)');
+        updateCallbackExpectations = function(uiItemSortable) {
+          expect(uiItemSortable.droptargetModel).toBe(itemsTop);
+        };
+        simulateElementDrag(li1, li2, { place: 'above', extradx: -20, extrady: -10 });
+        expect(itemsTop).toEqual(['Top One', 'Top Two', 'Top Three']);
+        expect(itemsBottom).toEqual(['Bottom One', 'Bottom Two', 'Bottom Three']);
+        expect(itemsTop).toEqual(listContent(elementTop));
+        expect(itemsBottom).toEqual(listContent(elementBottom));
+        updateCallbackExpectations = undefined;
+
+        li1 = elementTop.find(':eq(0)');
+        li2 = elementBottom.find(':eq(0)');
+        updateCallbackExpectations = function(uiItemSortable) {
+          expect(uiItemSortable.droptargetModel).toBe(itemsBottom);
+        };
+        simulateElementDrag(li1, li2, 'below');
+        expect(itemsTop).toEqual(['Top Two', 'Top Three']);
+        expect(itemsBottom).toEqual(['Bottom One', 'Top One', 'Bottom Two', 'Bottom Three']);
+        expect(itemsTop).toEqual(listContent(elementTop));
+        expect(itemsBottom).toEqual(listContent(elementBottom));
+        updateCallbackExpectations = undefined;
+
+        li1 = elementBottom.find(':eq(1)');
+        li2 = elementTop.find(':eq(1)');
+        updateCallbackExpectations = function(uiItemSortable) {
+          expect(uiItemSortable.droptargetModel).toBe(itemsTop);
+        };
+        simulateElementDrag(li1, li2, { place: 'above', extradx: -20, extrady: -10 });
+        expect(itemsTop).toEqual(['Top Two', 'Top One', 'Top Three']);
+        expect(itemsBottom).toEqual(['Bottom One', 'Bottom Two', 'Bottom Three']);
+        expect(itemsTop).toEqual(listContent(elementTop));
+        expect(itemsBottom).toEqual(listContent(elementBottom));
+        updateCallbackExpectations = undefined;
+
+        $(wrapperTop).remove();
+        $(wrapperBottom).remove();
+      });
+    });
+
     it('should properly free ui.item.sortable object', function() {
       inject(function($compile, $rootScope) {
         var elementTop, elementBottom, uiItem, uiItemSortable_Destroy;