From 6c748c2f87bd19d194326ece030cb6ff1ca86de3 Mon Sep 17 00:00:00 2001 From: Garen Torikian Date: Fri, 19 Apr 2013 16:02:28 -0700 Subject: [PATCH] Fix tests --- .../lib/markdown-preview-view.coffee | 2 +- .../spec/markdown-preview-view-spec.coffee | 16 +++++----------- 2 files changed, 6 insertions(+), 12 deletions(-) diff --git a/src/packages/markdown-preview/lib/markdown-preview-view.coffee b/src/packages/markdown-preview/lib/markdown-preview-view.coffee index 433cbb565..6f4707453 100644 --- a/src/packages/markdown-preview/lib/markdown-preview-view.coffee +++ b/src/packages/markdown-preview/lib/markdown-preview-view.coffee @@ -43,7 +43,7 @@ class MarkdownPreviewView extends ScrollView @buffer.getPath() setErrorHtml: (result)-> - try failureMessage = JSON.parse(result.responseText).message + try failureMessage = JSON.parse(result).message @html $$$ -> @h2 'Previewing Markdown Failed' diff --git a/src/packages/markdown-preview/spec/markdown-preview-view-spec.coffee b/src/packages/markdown-preview/spec/markdown-preview-view-spec.coffee index 42cac9b84..c0f133502 100644 --- a/src/packages/markdown-preview/spec/markdown-preview-view-spec.coffee +++ b/src/packages/markdown-preview/spec/markdown-preview-view-spec.coffee @@ -6,7 +6,6 @@ describe "MarkdownPreviewView", -> [buffer, preview] = [] beforeEach -> - spyOn($, 'ajax') project.setPath(project.resolve('markdown')) buffer = project.bufferForPath('file.markdown') preview = new MarkdownPreviewView(buffer) @@ -15,22 +14,17 @@ describe "MarkdownPreviewView", -> buffer.release() describe "on construction", -> - ajaxArgs = null - - beforeEach -> - ajaxArgs = $.ajax.argsForCall[0][0] it "shows a loading spinner and fetches the rendered markdown", -> + preview.setLoading() expect(preview.find('.markdown-spinner')).toExist() - expect($.ajax).toHaveBeenCalled() + expect(preview.buffer.getText()).toBe buffer.getText() - expect(JSON.parse(ajaxArgs.data).text).toBe buffer.getText() - - ajaxArgs.success($$$ -> @div "WWII", class: 'private-ryan') - expect(preview.find(".private-ryan")).toExist() + preview.fetchRenderedMarkdown() + expect(preview.find(".emoji")).toExist() it "shows an error message on error", -> - ajaxArgs.error() + preview.setErrorHtml("Not a real file") expect(preview.text()).toContain "Failed" describe "serialization", ->