Merge branch 'master' of github.com:diaspora/diaspora
This commit is contained in:
commit
39c9c19648
1 changed files with 32 additions and 14 deletions
|
|
@ -1,5 +1,13 @@
|
||||||
describe("AspectEdit", function() {
|
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; ">' +
|
||||||
|
' <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>'
|
||||||
|
);
|
||||||
|
});
|
||||||
|
|
||||||
describe("initialize", function() {
|
describe("initialize", function() {
|
||||||
it("calls draggable on ul .person", function() {
|
it("calls draggable on ul .person", function() {
|
||||||
spyOn($.fn, "draggable");
|
spyOn($.fn, "draggable");
|
||||||
|
|
@ -30,13 +38,6 @@ describe("AspectEdit", function() {
|
||||||
});
|
});
|
||||||
|
|
||||||
describe("startDrag", function() {
|
describe("startDrag", function() {
|
||||||
beforeEach(function() {
|
|
||||||
$('#jasmine_content').html(
|
|
||||||
'<li class="person ui-draggable" data-aspect_id="4cae42e12367bca44e000005" data-guid="4cae42d32367bca44e000003" style="top: 0px; left: 0px; ">' +
|
|
||||||
' <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>'
|
|
||||||
);
|
|
||||||
});
|
|
||||||
it("animates the image", function() {
|
it("animates the image", function() {
|
||||||
spyOn(AspectEdit, "animateImage");
|
spyOn(AspectEdit, "animateImage");
|
||||||
$.proxy(AspectEdit.startDrag, $('.person.ui-draggable'))();
|
$.proxy(AspectEdit.startDrag, $('.person.ui-draggable'))();
|
||||||
|
|
@ -52,13 +53,6 @@ describe("AspectEdit", function() {
|
||||||
});
|
});
|
||||||
|
|
||||||
describe("animateImage", function() {
|
describe("animateImage", function() {
|
||||||
beforeEach(function() {
|
|
||||||
$('#jasmine_content').html(
|
|
||||||
'<li class="person ui-draggable" data-aspect_id="4cae42e12367bca44e000005" data-guid="4cae42d32367bca44e000003" style="top: 0px; left: 0px; ">' +
|
|
||||||
' <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>'
|
|
||||||
);
|
|
||||||
});
|
|
||||||
it("hides the tipsy ... thingy, whatever that is", function() {
|
it("hides the tipsy ... thingy, whatever that is", function() {
|
||||||
spyOn($.fn, "tipsy");
|
spyOn($.fn, "tipsy");
|
||||||
AspectEdit.animateImage($('.avatar'));
|
AspectEdit.animateImage($('.avatar'));
|
||||||
|
|
@ -71,6 +65,30 @@ describe("AspectEdit", function() {
|
||||||
});
|
});
|
||||||
});
|
});
|
||||||
|
|
||||||
|
describe("duringDrag", function() {
|
||||||
|
it("rehides the tipsy thingy", function() {
|
||||||
|
spyOn($.fn, "tipsy");
|
||||||
|
$.proxy(AspectEdit.duringDrag, $('.person.ui-draggable'))();
|
||||||
|
expect($.fn.tipsy).toHaveBeenCalledWith("hide");
|
||||||
|
expect($.fn.tipsy.mostRecentCall.object).toHaveClass("avatar");
|
||||||
|
});
|
||||||
|
});
|
||||||
|
|
||||||
|
describe("stopDrag", function() {
|
||||||
|
xit("animates the image back to smaller size and full opacity", function() {
|
||||||
|
spyOn($.fn, "animate");
|
||||||
|
$.proxy(AspectEdit.stopDrag, $('.person.ui-draggable'))();
|
||||||
|
expect($.fn.animate).toHaveBeenCalledWith({'height':70, 'width':70, 'opacity':1}, 200);
|
||||||
|
expect($.fn.animate.mostRecentCall.object).toHaveClass("avatar");
|
||||||
|
});
|
||||||
|
it("fades out the drag and drop text", function() {
|
||||||
|
spyOn($.fn, "fadeOut");
|
||||||
|
$.proxy(AspectEdit.stopDrag, $('.person.ui-draggable'))();
|
||||||
|
expect($.fn.fadeOut).toHaveBeenCalledWith(100);
|
||||||
|
expect($.fn.fadeOut.mostRecentCall.object.selector).toEqual(".draggable_info");
|
||||||
|
});
|
||||||
|
});
|
||||||
|
|
||||||
describe("decrementRequestsCounter", function() {
|
describe("decrementRequestsCounter", function() {
|
||||||
describe("when there is one request", function() {
|
describe("when there is one request", function() {
|
||||||
it("removes the counter from the new requests div", function() {
|
it("removes the counter from the new requests div", function() {
|
||||||
|
|
|
||||||
Loading…
Reference in a new issue