-
");
+ var mdEditor = this.target.renderMarkdownEditor("#new-message-text");
+ expect(mdEditor).toEqual(jasmine.any(Diaspora.MarkdownEditor));
+ expect($("#new-message-text")).toHaveClass("md-input");
+ });
});
describe("addRecipient", function() {
@@ -253,6 +268,12 @@ describe("app.views.ConversationsForm", function() {
$("#new-conversation").trigger("ajax:success", [{id: 23}]);
expect(app._changeLocation).toHaveBeenCalledWith(Routes.conversation(23));
});
+
+ it("hides the preview", function() {
+ spyOn(Diaspora.MarkdownEditor.prototype, "hidePreview");
+ $("#new-conversation").trigger("ajax:success", [{id: 23}]);
+ expect(Diaspora.MarkdownEditor.prototype.hidePreview).toHaveBeenCalled();
+ });
});
describe("conversationCreateError", function() {
diff --git a/spec/javascripts/app/views/conversations_inbox_view_spec.js b/spec/javascripts/app/views/conversations_inbox_view_spec.js
index 841f189f0..f1c539a24 100644
--- a/spec/javascripts/app/views/conversations_inbox_view_spec.js
+++ b/spec/javascripts/app/views/conversations_inbox_view_spec.js
@@ -17,6 +17,14 @@ describe("app.views.ConversationsInbox", function() {
new app.views.ConversationsInbox();
expect(app.views.ConversationsInbox.prototype.setupConversation).toHaveBeenCalled();
});
+
+ it("creates markdown editor for an existing conversation", function() {
+ spyOn(app.views.ConversationsForm.prototype, "renderMarkdownEditor");
+ new app.views.ConversationsInbox(1);
+ expect(app.views.ConversationsForm.prototype.renderMarkdownEditor).toHaveBeenCalledWith(
+ "#conversation-show .conversation-message-text"
+ );
+ });
});
describe("renderConversation", function() {
@@ -34,6 +42,8 @@ describe("app.views.ConversationsInbox", function() {
spyOn($, "ajax").and.callThrough();
spyOn(app.views.ConversationsInbox.prototype, "selectConversation");
spyOn(app.views.ConversationsInbox.prototype, "setupConversation");
+ spyOn(app.views.ConversationsForm.prototype, "renderMarkdownEditor");
+ spyOn(window, "autosize");
this.target.renderConversation(this.conversationId);
jasmine.Ajax.requests.mostRecent().respondWith({
status: 200,
@@ -44,6 +54,9 @@ describe("app.views.ConversationsInbox", function() {
expect(jasmine.Ajax.requests.mostRecent().url).toBe("/conversations/" + this.conversationId + "/raw");
expect(app.views.ConversationsInbox.prototype.selectConversation).toHaveBeenCalledWith(this.conversationId);
expect(app.views.ConversationsInbox.prototype.setupConversation).toHaveBeenCalled();
+ expect(app.views.ConversationsForm.prototype.renderMarkdownEditor).toHaveBeenCalled();
+ expect(window.autosize).toHaveBeenCalled();
+ expect(window.autosize.calls.mostRecent().args[0].is($("#conversation-show textarea")));
expect($("#conversation-new")).toHaveClass("hidden");
expect($("#conversation-show")).not.toHaveClass("hidden");
expect($("#conversation-show #fake-conversation-content").length).toBe(1);
diff --git a/spec/javascripts/helpers/markdown_editor_spec.js b/spec/javascripts/helpers/markdown_editor_spec.js
index 9c2ab4cff..73c0047ba 100644
--- a/spec/javascripts/helpers/markdown_editor_spec.js
+++ b/spec/javascripts/helpers/markdown_editor_spec.js
@@ -220,6 +220,48 @@ describe("Diaspora.MarkdownEditor", function() {
});
});
+ describe("isPreviewMode", function() {
+ beforeEach(function() {
+ this.target = new Diaspora.MarkdownEditor(this.$el, {onPreview: $.noop, onPostPreview: $.noop()});
+ });
+
+ it("return false if editor is not visible yet", function() {
+ this.target.instance = undefined;
+ expect(this.target.isPreviewMode()).toBe(false);
+ });
+
+ it("returns false if the editor is in write (default) mode", function() {
+ expect(this.target.instance).toBeDefined();
+ expect(this.target.isPreviewMode()).toBe(false);
+ });
+
+ it("returns true if editor is in preview mode", function() {
+ this.target.showPreview();
+ expect(this.target.isPreviewMode()).toBe(true);
+ });
+ });
+
+ describe("userInputEmpty", function() {
+ beforeEach(function() {
+ this.target = new Diaspora.MarkdownEditor(this.$el, {onPreview: $.noop, onPostPreview: $.noop()});
+ });
+
+ it("return true if editor is not visible yet", function() {
+ this.target.instance = undefined;
+ expect(this.target.userInputEmpty()).toBe(true);
+ });
+
+ it("returns true if editor has no content", function() {
+ $("textarea").text("");
+ expect(this.target.userInputEmpty()).toBe(true);
+ });
+
+ it("returns false if editor has content", function() {
+ $("textarea").text("Yolo");
+ expect(this.target.userInputEmpty()).toBe(false);
+ });
+ });
+
describe("localize", function() {
beforeEach(function() {
this.target = new Diaspora.MarkdownEditor(this.$el, {});
@@ -234,4 +276,18 @@ describe("Diaspora.MarkdownEditor", function() {
expect($.fn.markdown.messages[Diaspora.I18n.language]).toBeDefined();
});
});
+
+ describe("simplePreview", function() {
+ beforeEach(function() {
+ this.target = new Diaspora.MarkdownEditor(this.$el, {});
+ });
+
+ it("generates HTML for preview", function() {
+ spyOn(app.helpers, "textFormatter").and.callThrough();
+ this.$el[0].value = "
hello
";
+ var res = Diaspora.MarkdownEditor.simplePreview(this.target.instance);
+ expect(app.helpers.textFormatter).toHaveBeenCalledWith("
hello
");
+ expect(res).toBe("
");
+ });
+ });
});
diff --git a/spec/javascripts/jasmine_helpers/SpecHelper.js b/spec/javascripts/jasmine_helpers/SpecHelper.js
index 9d790cb36..4b0bd9175 100644
--- a/spec/javascripts/jasmine_helpers/SpecHelper.js
+++ b/spec/javascripts/jasmine_helpers/SpecHelper.js
@@ -102,6 +102,7 @@ afterEach(function() {
expect($(".modal-backdrop").length).toBe(0);
$(".modal-backdrop").remove();
spec.loadFixtureCount = 0;
+ $(document.body).off();
});
diff --git a/spec/javascripts/mobile/mobile_comments_spec.js b/spec/javascripts/mobile/mobile_comments_spec.js
index e87a81adc..af12f644c 100644
--- a/spec/javascripts/mobile/mobile_comments_spec.js
+++ b/spec/javascripts/mobile/mobile_comments_spec.js
@@ -10,7 +10,7 @@ describe("Diaspora.Mobile.Comments", function(){
spyOn(Diaspora.Mobile.Comments, "submitComment").and.returnValue(false);
Diaspora.Mobile.Comments.initialize();
Diaspora.Mobile.Comments.showCommentBox($(".stream .comment-action").first());
- $(".stream .new_comment").first().submit();
+ $(".stream .new-comment").first().submit();
expect(Diaspora.Mobile.Comments.submitComment).toHaveBeenCalled();
});
});
@@ -97,28 +97,28 @@ describe("Diaspora.Mobile.Comments", function(){
});
it("doesn't submit an empty comment", function() {
- $(".stream .new_comment").first().submit();
+ $(".stream .new-comment").first().submit();
expect(jasmine.Ajax.requests.count()).toBe(0);
});
it("submits comments with text", function() {
- $(".stream .new_comment textarea").val("comment text");
- $(".stream .new_comment").first().submit();
+ $(".stream .new-comment textarea").val("comment text");
+ $(".stream .new-comment").first().submit();
expect(jasmine.Ajax.requests.mostRecent().data().text).toEqual(["comment text"]);
});
it("calls updateStream on success", function() {
spyOn(Diaspora.Mobile.Comments, "updateStream");
- $(".stream .new_comment textarea").val("comment text");
- $(".stream .new_comment").first().submit();
+ $(".stream .new-comment textarea").val("comment text");
+ $(".stream .new-comment").first().submit();
jasmine.Ajax.requests.mostRecent().respondWith({status: 200, responseText: "foo"});
- expect(Diaspora.Mobile.Comments.updateStream).toHaveBeenCalledWith($(".stream .new_comment").first(), "foo");
+ expect(Diaspora.Mobile.Comments.updateStream).toHaveBeenCalledWith($(".stream .new-comment").first(), "foo");
});
it("lets Diaspora.Mobile.Alert handle AJAX errors", function() {
spyOn(Diaspora.Mobile.Alert, "handleAjaxError");
- $(".stream .new_comment textarea").val("comment text");
- $(".stream .new_comment").first().submit();
+ $(".stream .new-comment textarea").val("comment text");
+ $(".stream .new-comment").first().submit();
jasmine.Ajax.requests.mostRecent().respondWith({status: 400, responseText: "oh noez! comment failed!"});
expect(Diaspora.Mobile.Alert.handleAjaxError).toHaveBeenCalled();
expect(Diaspora.Mobile.Alert.handleAjaxError.calls.argsFor(0)[0].responseText).toBe("oh noez! comment failed!");
@@ -126,10 +126,10 @@ describe("Diaspora.Mobile.Comments", function(){
it("calls resetCommentBox on errors", function() {
spyOn(Diaspora.Mobile.Comments, "resetCommentBox");
- $(".stream .new_comment textarea").val("comment text");
- $(".stream .new_comment").first().submit();
+ $(".stream .new-comment textarea").val("comment text");
+ $(".stream .new-comment").first().submit();
jasmine.Ajax.requests.mostRecent().respondWith({status: 400, responseText: "oh noez! comment failed!"});
- expect(Diaspora.Mobile.Comments.resetCommentBox).toHaveBeenCalledWith($(".stream .new_comment").first());
+ expect(Diaspora.Mobile.Comments.resetCommentBox).toHaveBeenCalledWith($(".stream .new-comment").first());
});
});