diff --git a/features/connects_users.feature b/features/connects_users.feature index 39c3c45af..5bfb96dcf 100644 --- a/features/connects_users.feature +++ b/features/connects_users.feature @@ -73,7 +73,7 @@ Feature: sending and receiving requests And I press the first ".toggle.button" And I press the first "a" within ".add_aspect" And I wait for the ajax to finish - + And I fill in "Name" with "Super People" in the modal window And I press "aspect_submit" in the modal window And I wait for the ajax to finish @@ -102,8 +102,9 @@ Feature: sending and receiving requests And I should not see "Message" When I add the person to my 1st aspect + And I wait for the ajax to finish And I add the person to my 2nd aspect - # should wait for ajax to finish here, but infinite scroll is screwing that up. + And I wait for the ajax to finish When I go to "bob@bob.bob"'s page Then I should see "In 2 aspects" And I should see "Mention" diff --git a/public/javascripts/contact-edit.js b/public/javascripts/contact-edit.js index 5c6b5036d..b12dbb9d7 100644 --- a/public/javascripts/contact-edit.js +++ b/public/javascripts/contact-edit.js @@ -52,7 +52,7 @@ var ContactEdit = { ContactEdit.toggleCheckbox(checkbox); ContactEdit.updateNumber(li.closest(".dropdown_list"), li.parent().data("person_id"), aspectMembership.aspect_ids.length); - Diaspora.widgets.publish("aspectDropdown/updated", [li.parent().data("person_id"), li.parents(".dropdown").get(0).outerHTML]); + Diaspora.widgets.publish("aspectDropdown/updated", [li.parent().data("person_id"), li.parents(".dropdown").parent(".right").html()]); }); }, };