Merge pull request #33 from marph91/fix-no-mails-exported

Fix no mails exported

README.md

@@ -99,6 +99,10 @@ What to do when the export failed?
 
 ## Changelog
 
+### 0.0.7
+
+- Bugfix: Make export working again when mail body is not displayed (<https://github.com/marph91/thunderbird-joplin-export/pull/33>).
+
 ### 0.0.6
 
 - Add `author` and `user_created_date` metadata.

__mocks__/browser.ts

@@ -34,12 +34,15 @@ export const browser = {
       browser.browserAction.icon = icon.path;
     },
   },
+  mailTabs: {
+    getSelectedMessages: jest.fn(async (_tabId) => <any>{ messages: [] }),
+  },
   menus: {
     create: jest.fn(),
     onClicked: { addListener: jest.fn() },
   },
   messageDisplay: {
-    getDisplayedMessages: jest.fn(),
+    getDisplayedMessages: jest.fn(async (_tabId) => <Array<any>>[]),
   },
   messages: {
     getFull: jest.fn(async () => {

__tests__/test_background.ts

@@ -12,6 +12,7 @@ import {
   getAndProcessMessages,
   handleContextMenu,
   handleHotkey,
+  handleMenuButton,
   onlyWhitespace,
   processMail,
   renderString,
@@ -208,7 +209,7 @@ describe("handle button / hotkey / context menu", () => {
     expectConsole({
       log: 1,
       warn: 0,
-      error: ["Failed to create note: Invalid token"],
+      error: ["[Joplin Export] Failed to create note: Invalid token"],
     });
   });
 
@@ -274,9 +275,25 @@ describe("handle button / hotkey / context menu", () => {
     }
   );
 
+  test("export by menu button", async () => {
+    messenger.tabs.query.mockResolvedValueOnce([{ id: 1 }]);
+    browser.messageDisplay.getDisplayedMessages.mockResolvedValueOnce([
+      { id: 1 },
+    ]);
+
+    await handleMenuButton({ id: 1 }, { menuItemId: "export_to_joplin" });
+
+    expect(requests.length).toBe(1);
+    expectConsole({
+      log: 1,
+      warn: 0,
+      error: 0,
+    });
+  });
+
   test("export by hotkey", async () => {
     messenger.tabs.query.mockResolvedValueOnce([{ id: 1 }]);
-    browser.messageDisplay.getDisplayedMessages.mockReturnValueOnce([
+    browser.messageDisplay.getDisplayedMessages.mockResolvedValueOnce([
       { id: 1 },
     ]);
 
@@ -292,7 +309,7 @@ describe("handle button / hotkey / context menu", () => {
 
   test("export by context menu", async () => {
     messenger.tabs.query.mockResolvedValueOnce([{ id: 1 }]);
-    browser.messageDisplay.getDisplayedMessages.mockReturnValueOnce([
+    browser.messageDisplay.getDisplayedMessages.mockResolvedValueOnce([
       { id: 1 },
     ]);
 
@@ -307,6 +324,74 @@ describe("handle button / hotkey / context menu", () => {
   });
 });
 
+describe("handle displayed and selected mails", () => {
+  test("one selected mail", async () => {
+    messenger.tabs.query.mockResolvedValueOnce([{ id: 1 }]);
+    browser.mailTabs.getSelectedMessages.mockResolvedValueOnce({
+      messages: [{ id: 1 }],
+    });
+
+    await getAndProcessMessages({ id: 1 }, {});
+
+    expect(requests.length).toBe(1);
+    expectConsole({
+      log: 1,
+      warn: 0,
+      error: 0,
+    });
+  });
+
+  test("no selected mail, one displayed mail", async () => {
+    messenger.tabs.query.mockResolvedValueOnce([{ id: 1 }]);
+    browser.messageDisplay.getDisplayedMessages.mockResolvedValueOnce([
+      { id: 1 },
+    ]);
+
+    await getAndProcessMessages({ id: 1 }, {});
+
+    expect(requests.length).toBe(1);
+    expectConsole({
+      log: 1,
+      warn: 0,
+      error: 0,
+    });
+  });
+
+  test("error at selected mail, one displayed mail", async () => {
+    messenger.tabs.query.mockResolvedValueOnce([{ id: 1 }]);
+    // This error gets thrown when querying the selected messages at a tab
+    // where are no messages selected.
+    browser.mailTabs.getSelectedMessages.mockImplementation(() => {
+      throw new Error();
+    });
+    browser.messageDisplay.getDisplayedMessages.mockResolvedValueOnce([
+      { id: 1 },
+    ]);
+
+    await getAndProcessMessages({ id: 1 }, {});
+
+    expect(requests.length).toBe(1);
+    expectConsole({
+      log: 1,
+      warn: 0,
+      error: 0,
+    });
+  });
+
+  test("no selectedmail, no displayed mail", async () => {
+    messenger.tabs.query.mockResolvedValueOnce([{ id: 1 }]);
+
+    await getAndProcessMessages({ id: 1 }, {});
+
+    expect(requests.length).toBe(0);
+    expectConsole({
+      log: 0,
+      warn: 1,
+      error: 0,
+    });
+  });
+});
+
 describe("process mail", () => {
   test("empty header", async () => {
     const result = await processMail(undefined);
@@ -466,8 +551,8 @@ describe("process mail", () => {
       // Finally check the console output.
       const message =
         resultFormat === "text/html"
-          ? "Sending complete email in HTML format."
-          : "Sending complete email in plain format.";
+          ? "[Joplin Export] Sending complete email in HTML format."
+          : "[Joplin Export] Sending complete email in plain format.";
       expectConsole({
         log: [message],
         warn: 0,
@@ -503,7 +588,7 @@ describe("process mail", () => {
     });
 
     expectConsole({
-      log: ["Sending selection in plain format."],
+      log: ["[Joplin Export] Sending selection in plain format."],
       warn: 0,
       error: 0,
     });
@@ -692,7 +777,7 @@ describe("process tag", () => {
 
     expectConsole({
       log: 1,
-      warn: ['Too many matching tags for "multipleTags": a, b'],
+      warn: ['[Joplin Export] Too many matching tags for "multipleTags": a, b'],
       error: 0,
     });
   });

doc/release.md

@@ -6,3 +6,19 @@
 4. Submit the add-on at <https://addons.thunderbird.net/de/developers/addon/joplin-export/versions/submit/>.
 
 NB: [List of valid Thunderbird versions](https://addons.thunderbird.net/en-US/thunderbird/pages/appversions/)
+
+## How to test a release
+
+The automated tests should be successful. Additionally, the following cases should be tested manually:
+
+Export via:
+
+- Menu button
+- Context menu
+- Hotkey
+
+Tabs:
+
+- Mail tab with mail body
+- Mail tab without mail body
+- Mail in a separate tab