diff --git a/spec/javascripts/aspect-edit-spec.js b/spec/javascripts/aspect-edit-spec.js index 507784d30..21b0316ae 100644 --- a/spec/javascripts/aspect-edit-spec.js +++ b/spec/javascripts/aspect-edit-spec.js @@ -83,8 +83,8 @@ describe("AspectEdit", function() { it("animates the image back to smaller size and full opacity", function() { spyOn($.fn, "animate"); $.proxy(AspectEdit.stopDrag, $('ul .person'))(); - expect($.fn.animate).toHaveBeenCalledWith({'height':70, 'width':70, 'opacity':1}, 200); // fadeOut calls animate, apparently, so mostRecentCall isn't the right call + expect($.fn.animate.calls[0].args[0]).toEqual({'height':50, 'width':50, 'opacity':1}, 200); expect($.fn.animate.calls[0].object).toHaveClass("avatar"); }); it("fades out the drag and drop text", function() { diff --git a/spec/javascripts/support/jasmine.yml b/spec/javascripts/support/jasmine.yml index 75a4b0d42..28e0ebce4 100644 --- a/spec/javascripts/support/jasmine.yml +++ b/spec/javascripts/support/jasmine.yml @@ -16,7 +16,7 @@ src_files: - public/javascripts/vendor/jquery.tipsy.js - public/javascripts/vendor/jquery.infieldlabel.js - public/javascripts/vendor/jquery.autoresize.min.js - - public/javascripts/vendor/fancybox/jquery.fancybox-1.3.1.pack.js + - public/javascripts/vendor/facebox.js - public/javascripts/diaspora.js - public/javascripts/mobile.js - public/javascripts/aspect-edit.js