From 9bda66c081940394e397658859fc24f58341781a Mon Sep 17 00:00:00 2001 From: Jackie Luo Date: Thu, 21 Jul 2016 15:37:06 -0700 Subject: [PATCH] spec(quoted-text): Fix broken tests :disappointed: --- .../composer/spec/composer-view-spec.cjsx | 2 +- spec/spec-suite.coffee | 1 + spec/stores/draft-factory-spec.es6 | 16 ++-------------- spec/stores/draft-helpers-spec.es6 | 1 - src/flux/stores/draft-helpers.es6 | 2 +- 5 files changed, 5 insertions(+), 17 deletions(-) diff --git a/internal_packages/composer/spec/composer-view-spec.cjsx b/internal_packages/composer/spec/composer-view-spec.cjsx index 0dab629e4..97b50e04d 100644 --- a/internal_packages/composer/spec/composer-view-spec.cjsx +++ b/internal_packages/composer/spec/composer-view-spec.cjsx @@ -124,7 +124,7 @@ describe "ComposerView", -> body = @session.changes.add.calls[0].args[0].body expect(body).toBe """Hello world#{@replyBody}""" - describe "when sending a forwarded message message", -> + describe "when sending a forwarded message", -> beforeEach -> @fwdBody = """

---------- Forwarded message --------- diff --git a/spec/spec-suite.coffee b/spec/spec-suite.coffee index 5f0ebcedd..e6f6e57cb 100644 --- a/spec/spec-suite.coffee +++ b/spec/spec-suite.coffee @@ -12,6 +12,7 @@ requireSpecs = (specDirectory) -> regex = /-spec\.(coffee|js|jsx|cjsx|es6|es)$/ for specFilePath in fs.listTreeSync(specDirectory) + console.log(specFilePath) require(specFilePath) if regex.test(specFilePath) # Set spec directory on spec for setting up the project in spec-helper diff --git a/spec/stores/draft-factory-spec.es6 b/spec/stores/draft-factory-spec.es6 index 6acaddd1e..528b34b1f 100644 --- a/spec/stores/draft-factory-spec.es6 +++ b/spec/stores/draft-factory-spec.es6 @@ -129,14 +129,10 @@ describe('DraftFactory', function draftFactory() { describe("creating drafts", () => { describe("createDraftForReply", () => { - it("should include quoted text", () => { + it("should be empty string", () => { waitsForPromise(() => { return DraftFactory.createDraftForReply({thread: fakeThread, message: fakeMessage1, type: 'reply'}).then((draft) => { - expect(draft.body.indexOf('blockquote') > 0).toBe(true); - expect(draft.body.indexOf(fakeMessage1.body) > 0).toBe(true); - expect(draft.body.indexOf('gmail_quote') > 0).toBe(true); - - expect(draft.body.search(/On .+, at .+, Customer <customer@example.com> wrote/) > 0).toBe(true); + expect(draft.body).toEqual(""); }); }); }); @@ -234,14 +230,6 @@ describe('DraftFactory', function draftFactory() { }); }); }); - - it("should only include the sender's name if it was available", () => { - waitsForPromise(() => { - return DraftFactory.createDraftForReply({thread: fakeThread, message: fakeMessage2, type: 'reply'}).then((draft) => { - expect(draft.body.search(/On .+, at .+, ben@nylas.com wrote:/) > 0).toBe(true); - }); - }); - }); }); describe("type: reply", () => { diff --git a/spec/stores/draft-helpers-spec.es6 b/spec/stores/draft-helpers-spec.es6 index 440853ea3..3b58dca1a 100644 --- a/spec/stores/draft-helpers-spec.es6 +++ b/spec/stores/draft-helpers-spec.es6 @@ -16,7 +16,6 @@ describe('DraftHelpers', function describeBlock() { const draft = new Message({ clientId: "local-123", threadId: "thread-123", - replyToMessageId: "message-123", uploads: ['stub'], }); const session = { diff --git a/src/flux/stores/draft-helpers.es6 b/src/flux/stores/draft-helpers.es6 index 47c8d6d11..6d7aaa571 100644 --- a/src/flux/stores/draft-helpers.es6 +++ b/src/flux/stores/draft-helpers.es6 @@ -114,7 +114,7 @@ export function prepareDraftForSyncback(session) { return session.ensureCorrectAccount({noSyncback: true}) .then(() => applyExtensionTransformsToDraft(session.draft())) .then((transformed) => { - if (!shouldAppendQuotedText(transformed)) { + if (!transformed.replyToMessageId || !shouldAppendQuotedText(transformed)) { return Promise.resolve(transformed) } return appendQuotedTextToDraft(transformed)