Merge branch 'master' of github.com:diaspora/diaspora

chef/cookbooks/common/recipes/daemontools.rb

@@ -16,7 +16,7 @@ end
 config = YAML.load_file("/usr/local/app/diaspora/chef/cookbooks/common/files/default/thins.yml")
 
 config.each do |thin|
-  id = thin["port"]
+  port = thin["port"]
   #socket = "/tmp/thin_#{id}.sock"
   dir = "/service/thin_#{port}"
   flags = []

public/javascripts/aspect-edit.js

@@ -54,7 +54,7 @@ var AspectEdit = {
       });
     }
 
-    if (person.attr('data-aspect_id') != undefined && // request doesn't have an aspect ID yet
+    if (person.attr('data-aspect_id') != undefined && // a request doesn't have a data-aspect_id, but an existing friend does
         dropzone.attr('data-aspect_id') != person.attr('data-aspect_id')) {
       $.ajax({
         url: "/aspects/move_friend/",

spec/javascripts/aspect-edit-spec.js

@@ -2,9 +2,13 @@ describe("AspectEdit", function() {
 
   beforeEach(function() {
     $('#jasmine_content').html(
-'<li class="person ui-draggable" data-aspect_id="4cae42e12367bca44e000005" data-guid="4cae42d32367bca44e000003" style="top: 0px; left: 0px; ">' +
+'<ul data-aspect_id="guid-of-current-aspect" class="dropzone ui-droppable">' +
-'  <img alt="Alexander Hamiltom" class="avatar" data-person_id="4cae42d32367bca44e000003" src="/images/user/default.png?1287542906" original-title="Alexander Hamiltom" style="height: 70px; width: 70px; opacity: 1; display: inline; ">' +
+'  <li class="person ui-draggable" data-aspect_id="guid-of-current-aspect" data-guid="guid-of-this-person">' +
-'</li>'
+'    <img alt="Alexander Hamiltom" class="avatar" data-person_id="guid-of-this-person" src="default.png" original-title="Alexander Hamiltom">' +
+'  </li>' +
+'</ul>' +
+'<ul data-aspect_id="guid-of-target-aspect" class="dropzone ui-droppable">' +
+'</ul>'
     );
   });
 
@@ -12,9 +16,12 @@ describe("AspectEdit", function() {
     it("calls draggable on ul .person", function() {
       spyOn($.fn, "draggable");
       AspectEdit.initialize();
-      expect($.fn.draggable).toHaveBeenCalledWith(
+      expect($.fn.draggable).toHaveBeenCalledWith({
-        {revert: true, start: AspectEdit.startDrag,
+        revert: true, 
-         drag: AspectEdit.duringDrag, stop: AspectEdit.stopDrag});
+        start: AspectEdit.startDrag,
+        drag: AspectEdit.duringDrag, 
+        stop: AspectEdit.stopDrag
+      });
       expect($.fn.draggable.mostRecentCall.object.selector).toEqual("ul .person");
     });
     it("calls droppable on .aspect ul.dropzone", function() {
@@ -92,30 +99,75 @@ describe("AspectEdit", function() {
   });
 
   describe("onDropMove", function() {
+    beforeEach(function() {
+      spyOn($, "ajax");
+    });
+    describe("when you drop the friend or request onto the div you dragged it from", function() {
+      it("doesn't call any ajax stuffs", function() {
+        var targetAspect = $('.dropzone.ui-droppable[data-aspect_id="guid-of-current-aspect"]');
+        $.proxy(AspectEdit.onDropMove, targetAspect)(null, {draggable: $('.person.ui-draggable')});
+        expect($.ajax).not.toHaveBeenCalled();
+      });
+      it("adds the person back into the original div", function() {
+        var targetAspect = $('.dropzone.ui-droppable[data-aspect_id="guid-of-current-aspect"]');
+        spyOn($.fn, "append");
+        $.proxy(AspectEdit.onDropMove, targetAspect)(null, {draggable: $('.person.ui-draggable')});
+        expect($.fn.append).toHaveBeenCalledWith($('.person.ui-draggable'));
+        expect($.fn.append.mostRecentCall.object.attr("data-aspect_id")).toEqual("guid-of-current-aspect");
+      });
+    });
+    describe("when moving an existing friend between aspects", function() {
+      it("calls move_friend", function() {
+        var targetAspect = $('.dropzone.ui-droppable[data-aspect_id="guid-of-target-aspect"]');
+        $.proxy(AspectEdit.onDropMove, targetAspect)(null, {draggable: $('.person.ui-draggable')});
+        expect($.ajax).toHaveBeenCalled();
+        var args = $.ajax.mostRecentCall.args[0];
+        expect(args["url"]).toEqual("/aspects/move_friend/");
+        expect(args["data"]["friend_id"]).toEqual("guid-of-this-person");
+        expect(args["data"]["from"]).toEqual("guid-of-current-aspect");
+        expect(args["data"]["to"]).toEqual({"to": "guid-of-target-aspect" });
+      });
+      it("doesn't call the ajaxy request delete", function() {
+        var targetAspect = $('.dropzone.ui-droppable[data-aspect_id="guid-of-target-aspect"]');
+        $.proxy(AspectEdit.onDropMove, targetAspect)(null, {draggable: $('.person.ui-draggable')});
+        expect($.ajax.calls.length).toEqual(1);
+      });
+      it("adds the person to the aspect div", function() {
+        var targetAspect = $('.dropzone.ui-droppable[data-aspect_id="guid-of-target-aspect"]');
+        spyOn($.fn, "append");
+        $.proxy(AspectEdit.onDropMove, targetAspect)(null, {draggable: $('.person.ui-draggable')});
+        expect($.fn.append).toHaveBeenCalledWith($('.person.ui-draggable'));
+        expect($.fn.append.mostRecentCall.object.hasClass("dropzone")).toBeTruthy();
+      });
+    });
     describe("when dragging a friend request", function() {
       beforeEach(function() {
         $('#jasmine_content').html(
-'<li class="person request ui-draggable" data-person_id="4cae42d32367bca44e000003" data-guid="4cae42d32367bca44e000003">' +
+'<li class="person request ui-draggable" data-person_id="guid-of-friendship-requestor" data-guid="guid-of-friendship-requestor">' +
-'  <img alt="Alexander Hamiltom" class="avatar" data-person_id="4cae42d32367bca44e000003" src="/images/user/default.png?1287542906" original-title="Alexander Hamiltom">' +
+'  <img alt="Alexander Hamiltom" class="avatar" data-person_id="guid-of-friendship-requestor" src="/images/user/default.png?1287542906" original-title="Alexander Hamiltom">' +
 '</li>' +
-'<ul data-aspect_id="4cdae5ed2367bc30aa000007" class="dropzone ui-droppable">' +
+'<ul data-aspect_id="guid-of-target-aspect" class="dropzone ui-droppable">' +
 '</ul>'
         );
       });    
       it("deletes the request object", function() {
-        spyOn($, "ajax");
         $.proxy(AspectEdit.onDropMove, $('.dropzone.ui-droppable'))(null, {draggable: $('.person.ui-draggable')});
         expect($.ajax).toHaveBeenCalled();
         var args = $.ajax.calls[0].args[0];
         expect(args["type"]).toEqual("DELETE");
-        expect(args["url"]).toEqual("/requests/4cae42d32367bca44e000003");
+        expect(args["url"]).toEqual("/requests/guid-of-friendship-requestor");
-        expect(args["data"]).toEqual({"accept" : true, "aspect_id" : "4cdae5ed2367bc30aa000007" });
+        expect(args["data"]).toEqual({"accept" : true, "aspect_id" : "guid-of-target-aspect" });
       });
       it("doesn't call move_friend", function() {
-        spyOn($, "ajax");
         $.proxy(AspectEdit.onDropMove, $('.dropzone.ui-droppable'))(null, {draggable: $('.person.ui-draggable')});
         expect($.ajax.calls.length).toEqual(1);
       });
+      it("adds the person to the aspect div", function() {
+        spyOn($.fn, "append");
+        $.proxy(AspectEdit.onDropMove, $('.dropzone.ui-droppable'))(null, {draggable: $('.person.ui-draggable')});
+        expect($.fn.append).toHaveBeenCalledWith($('.person.ui-draggable'));
+        expect($.fn.append.mostRecentCall.object.hasClass("dropzone")).toBeTruthy();
+      });
     });
   });