From f33b3b39c0217e36a7b0eddf440e434db461827f Mon Sep 17 00:00:00 2001
From: Jo IE <joie.software@gmail.com>
Date: Mon, 7 Oct 2019 18:02:40 +0100
Subject: [PATCH 01/31] remove HTML entities from tooltip

---
 src/js/popup.js | 70 ++++++++++++++++++++++++-------------------------
 1 file changed, 35 insertions(+), 35 deletions(-)

diff --git a/src/js/popup.js b/src/js/popup.js
index 80986a2..e5b4dbf 100644
--- a/src/js/popup.js
+++ b/src/js/popup.js
@@ -12,15 +12,15 @@ const NEW_CONTAINER_ID = "new";
 const ONBOARDING_STORAGE_KEY = "onboarding-stage";
 
 // List of panels
-const P_ONBOARDING_1     = "onboarding1";
-const P_ONBOARDING_2     = "onboarding2";
-const P_ONBOARDING_3     = "onboarding3";
-const P_ONBOARDING_4     = "onboarding4";
-const P_ONBOARDING_5     = "onboarding5";
-const P_CONTAINERS_LIST  = "containersList";
-const P_CONTAINERS_EDIT  = "containersEdit";
-const P_CONTAINER_INFO   = "containerInfo";
-const P_CONTAINER_EDIT   = "containerEdit";
+const P_ONBOARDING_1 = "onboarding1";
+const P_ONBOARDING_2 = "onboarding2";
+const P_ONBOARDING_3 = "onboarding3";
+const P_ONBOARDING_4 = "onboarding4";
+const P_ONBOARDING_5 = "onboarding5";
+const P_CONTAINERS_LIST = "containersList";
+const P_CONTAINERS_EDIT = "containersEdit";
+const P_CONTAINER_INFO = "containerInfo";
+const P_CONTAINER_EDIT = "containerEdit";
 const P_CONTAINER_DELETE = "containerDelete";
 const P_CONTAINERS_ACHIEVEMENT = "containersAchievement";
 
@@ -32,7 +32,7 @@ const P_CONTAINERS_ACHIEVEMENT = "containersAchievement";
  * @return {string} The escaped string.
  */
 function escapeXML(str) {
-  const replacements = {"&": "&amp;", "\"": "&quot;", "'": "&apos;", "<": "&lt;", ">": "&gt;", "/": "&#x2F;"};
+  const replacements = { "&": "&amp;", "\"": "&quot;", "'": "&apos;", "<": "&lt;", ">": "&gt;", "/": "&#x2F;" };
   return String(str).replace(/[&"'<>/]/g, m => replacements[m]);
 }
 
@@ -85,7 +85,7 @@ const Logic = {
 
     try {
       await identitiesPromise;
-    } catch(e) {
+    } catch (e) {
       throw new Error("Failed to retrieve the identities or variation. We cannot continue. ", e.message);
     }
 
@@ -125,7 +125,7 @@ const Logic = {
   async showAchievementOrContainersListPanel() {
     // Do we need to show an achievement panel?
     let showAchievements = false;
-    const achievementsStorage = await browser.storage.local.get({achievements: []});
+    const achievementsStorage = await browser.storage.local.get({ achievements: [] });
     for (const achievement of achievementsStorage.achievements) {
       if (!achievement.done) {
         showAchievements = true;
@@ -142,7 +142,7 @@ const Logic = {
   // they have to click the "Done" button to stop the panel
   // from showing
   async setAchievementDone(achievementName) {
-    const achievementsStorage = await browser.storage.local.get({achievements: []});
+    const achievementsStorage = await browser.storage.local.get({ achievements: [] });
     const achievements = achievementsStorage.achievements;
     achievements.forEach((achievement, index, achievementsArray) => {
       if (achievement.name === achievementName) {
@@ -150,7 +150,7 @@ const Logic = {
         achievementsArray[index] = achievement;
       }
     });
-    browser.storage.local.set({achievements});
+    browser.storage.local.set({ achievements });
   },
 
   setOnboardingStage(stage) {
@@ -161,9 +161,9 @@ const Logic = {
 
   async clearBrowserActionBadge() {
     const extensionInfo = await getExtensionInfo();
-    const storage = await browser.storage.local.get({browserActionBadgesClicked: []});
-    browser.browserAction.setBadgeBackgroundColor({color: null});
-    browser.browserAction.setBadgeText({text: ""});
+    const storage = await browser.storage.local.get({ browserActionBadgesClicked: [] });
+    browser.browserAction.setBadgeBackgroundColor({ color: null });
+    browser.browserAction.setBadgeText({ text: "" });
     storage.browserActionBadgesClicked.push(extensionInfo.version);
     // use set and spread to create a unique array
     const browserActionBadgesClicked = [...new Set(storage.browserActionBadgesClicked)];
@@ -184,7 +184,7 @@ const Logic = {
     // Handle old style rejection with null and also Promise.reject new style
     try {
       return await browser.contextualIdentities.get(cookieStoreId) || defaultContainer;
-    } catch(e) {
+    } catch (e) {
       return defaultContainer;
     }
   },
@@ -207,7 +207,7 @@ const Logic = {
   },
 
   async currentTab() {
-    const activeTabs = await browser.tabs.query({active: true, windowId: browser.windows.WINDOW_ID_CURRENT});
+    const activeTabs = await browser.tabs.query({ active: true, windowId: browser.windows.WINDOW_ID_CURRENT });
     if (activeTabs.length > 0) {
       return activeTabs[0];
     }
@@ -215,7 +215,7 @@ const Logic = {
   },
 
   async numTabs() {
-    const activeTabs = await browser.tabs.query({windowId: browser.windows.WINDOW_ID_CURRENT});
+    const activeTabs = await browser.tabs.query({ windowId: browser.windows.WINDOW_ID_CURRENT });
     return activeTabs.length;
   },
 
@@ -259,7 +259,7 @@ const Logic = {
 
   getPanelSelector(panel) {
     if (this._onboardingVariation === "securityOnboarding" &&
-        panel.hasOwnProperty("securityPanelSelector")) {
+      panel.hasOwnProperty("securityPanelSelector")) {
       return panel.securityPanelSelector;
     } else {
       return panel.panelSelector;
@@ -333,7 +333,7 @@ const Logic = {
 
     return browser.runtime.sendMessage({
       method: "deleteContainer",
-      message: {userContextId}
+      message: { userContextId }
     });
   },
 
@@ -347,7 +347,7 @@ const Logic = {
   getAssignmentObjectByContainer(userContextId) {
     return browser.runtime.sendMessage({
       method: "getAssignmentObjectByContainer",
-      message: {userContextId}
+      message: { userContextId }
     });
   },
 
@@ -376,7 +376,7 @@ const Logic = {
     });
 
     // Here we find the first valid id.
-    for (let id = 1;; ++id) {
+    for (let id = 1; ; ++id) {
       if (ids.indexOf(id) === -1) {
         return defaultName + (id < 10 ? "0" : "") + id;
       }
@@ -511,7 +511,7 @@ Logic.registerPanel(P_CONTAINERS_LIST, {
     });
 
     Logic.addEnterHandler(document.querySelector("#edit-containers-link"), (e) => {
-      if (!e.target.classList.contains("disable-edit-containers")){
+      if (!e.target.classList.contains("disable-edit-containers")) {
         Logic.showPanel(P_CONTAINERS_EDIT);
       }
     });
@@ -637,9 +637,9 @@ Logic.registerPanel(P_CONTAINERS_LIST, {
 
       context.classList.add("userContext-wrapper", "open-newtab", "clickable");
       manage.classList.add("show-tabs", "pop-button");
-      manage.title = escaped`View ${identity.name} container`;
+      manage.setAttribute("title", `View ${identity.name} container`);
       context.setAttribute("tabindex", "0");
-      context.title = escaped`Create ${identity.name} tab`;
+      context.setAttribute("title", `Create ${identity.name} tab`);
       context.innerHTML = escaped`
         <div class="userContext-icon-wrapper open-newtab">
           <div class="usercontext-icon"
@@ -661,8 +661,8 @@ Logic.registerPanel(P_CONTAINERS_LIST, {
 
       Logic.addEnterHandler(tr, async (e) => {
         if (e.target.matches(".open-newtab")
-            || e.target.parentNode.matches(".open-newtab")
-            || e.type === "keydown") {
+          || e.target.parentNode.matches(".open-newtab")
+          || e.type === "keydown") {
           try {
             browser.tabs.create({
               cookieStoreId: identity.cookieStoreId
@@ -747,7 +747,7 @@ Logic.registerPanel(P_CONTAINER_INFO, {
       return;
     } else if (numTabs === 1) {
       Logic._disableMoveTabs("Cannot move a tab from a single-tab window.");
-      return; 
+      return;
     }
     Logic.addEnterHandler(moveTabsEl, async () => {
       await browser.runtime.sendMessage({
@@ -808,7 +808,7 @@ Logic.registerPanel(P_CONTAINER_INFO, {
         <td class="container-info-tab-title truncate-text" title="${tab.url}" ><div class="container-tab-title">${tab.title}</div></td>`;
       tr.querySelector("td").appendChild(Utils.createFavIconElement(tab.favIconUrl));
       document.getElementById("container-info-table").appendChild(fragment);
-      
+
       // On click, we activate this tab. But only if this tab is active.
       if (!tab.hiddenState) {
         const closeImage = document.createElement("img");
@@ -830,7 +830,7 @@ Logic.registerPanel(P_CONTAINER_INFO, {
 
         tr.classList.add("clickable");
         Logic.addEnterHandler(tr, async () => {
-          await browser.tabs.update(tab.id, {active: true});
+          await browser.tabs.update(tab.id, { active: true });
           window.close();
         });
 
@@ -842,7 +842,7 @@ Logic.registerPanel(P_CONTAINER_INFO, {
           });
         }
       }
-    } 
+    }
   },
 });
 
@@ -1018,7 +1018,7 @@ Logic.registerPanel(P_CONTAINER_EDIT, {
       return escaped`<input type="radio" value="${containerColor}" name="container-color" id="edit-container-panel-choose-color-${containerColor}" />
      <label for="edit-container-panel-choose-color-${containerColor}" class="usercontext-icon choose-color-icon" data-identity-icon="circle" data-identity-color="${containerColor}">`;
     };
-    const colors = ["blue", "turquoise", "green", "yellow", "orange", "red", "pink", "purple" ];
+    const colors = ["blue", "turquoise", "green", "yellow", "orange", "red", "pink", "purple"];
     const colorRadioFieldset = document.getElementById("edit-container-panel-choose-color");
     colors.forEach((containerColor) => {
       const templateInstance = document.createElement("div");
@@ -1093,7 +1093,7 @@ Logic.registerPanel(P_CONTAINER_DELETE, {
         await Logic.removeIdentity(Logic.userContextId(Logic.currentIdentity().cookieStoreId));
         await Logic.refreshIdentities();
         Logic.showPreviousPanel();
-      } catch(e) {
+      } catch (e) {
         Logic.showPanel(P_CONTAINERS_LIST);
       }
     });

From 397a3e4970d5a2a710392efef3014b39595c7e21 Mon Sep 17 00:00:00 2001
From: Kendall Werts <kmwerts@gmail.com>
Date: Fri, 11 Oct 2019 10:38:33 -0500
Subject: [PATCH 02/31] updated test info

---
 README.md | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/README.md b/README.md
index 7574cf0..92aec9c 100644
--- a/README.md
+++ b/README.md
@@ -22,7 +22,15 @@ For more info, see:
 2. `./node_modules/.bin/web-ext run -s src/`
 
 ### Testing
-TBD
+`npm run test`
+
+or 
+
+`npm run lint` 
+
+for just the linter
+
+There is a timeout test that sometimes fails on certain machines, so make sure to run the tests on your clone before you make any changes to see if you have this problem.
 
 ### Distributing
 #### Make the new version

From c28d77e7cd000a3b8bd0cc5481b1db764a09b1b4 Mon Sep 17 00:00:00 2001
From: George Merlocco <george@merloc.co>
Date: Sat, 12 Oct 2019 18:54:54 -0400
Subject: [PATCH 03/31] Explicitly set foreground color of #redirect-url in
 dark mode

---
 src/css/confirm-page.css | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/css/confirm-page.css b/src/css/confirm-page.css
index e00eb1c..113ffef 100644
--- a/src/css/confirm-page.css
+++ b/src/css/confirm-page.css
@@ -60,6 +60,7 @@ html {
 @media (prefers-color-scheme: dark) {
   #redirect-url {
     background: #38383d; /* Grey 70 */
+    color: #eee; /* White 20 */
   }
 }
 /* stylelint-enable */

From a874c9c628ac7d9404dd098c4660c3a18e25e0ff Mon Sep 17 00:00:00 2001
From: Kendall Werts <kmwerts@gmail.com>
Date: Tue, 15 Oct 2019 14:19:18 -0500
Subject: [PATCH 04/31] fix for double decoding on confirm page issue #1361

---
 src/js/confirm-page.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/js/confirm-page.js b/src/js/confirm-page.js
index 9f6eb77..8a14a7b 100644
--- a/src/js/confirm-page.js
+++ b/src/js/confirm-page.js
@@ -1,6 +1,6 @@
 async function load() {
   const searchParams = new URL(window.location).searchParams;
-  const redirectUrl = decodeURIComponent(searchParams.get("url"));
+  const redirectUrl = searchParams.get("url");
   const cookieStoreId = searchParams.get("cookieStoreId");
   const currentCookieStoreId = searchParams.get("currentCookieStoreId");
   const redirectUrlElement = document.getElementById("redirect-url");

From 8eceb0d2980114ea58e36dfe3a5808ed399ef207 Mon Sep 17 00:00:00 2001
From: Roman Rodriguez <romanrodriguez@users.noreply.github.com>
Date: Thu, 3 Oct 2019 12:39:56 -0500
Subject: [PATCH 05/31] Fix #930 - Disable extension in incognito mode

---
 package.json                        |  4 ++--
 src/js/background/assignManager.js  |  5 +----
 src/js/background/badge.js          | 15 +++++---------
 src/js/background/messageHandler.js |  3 ---
 src/manifest.json                   | 32 ++++++++++++++---------------
 5 files changed, 24 insertions(+), 35 deletions(-)

diff --git a/package.json b/package.json
index 172a4f5..b72d3d5 100644
--- a/package.json
+++ b/package.json
@@ -9,8 +9,8 @@
   },
   "dependencies": {},
   "devDependencies": {
-    "ajv": "^6.6.2",
     "addons-linter": "^1.3.2",
+    "ajv": "^6.6.2",
     "chai": "^4.1.2",
     "eslint": "^3.17.1",
     "eslint-plugin-no-unsanitized": "^2.0.0",
@@ -25,7 +25,7 @@
     "stylelint": "^7.9.0",
     "stylelint-config-standard": "^16.0.0",
     "stylelint-order": "^0.3.0",
-    "web-ext": "^2.2.2"
+    "web-ext": "^2.9.3"
   },
   "homepage": "https://github.com/mozilla/multi-account-containers#readme",
   "license": "MPL-2.0",
diff --git a/src/js/background/assignManager.js b/src/js/background/assignManager.js
index dc9e991..83acd4b 100644
--- a/src/js/background/assignManager.js
+++ b/src/js/background/assignManager.js
@@ -143,7 +143,6 @@ const assignManager = {
     const userContextId = this.getUserContextIdFromCookieStore(tab);
     if (!siteSettings
         || userContextId === siteSettings.userContextId
-        || tab.incognito
         || this.storageArea.isExempted(options.url, tab.id)) {
       return {};
     }
@@ -289,11 +288,9 @@ const assignManager = {
 
   isTabPermittedAssign(tab) {
     // Ensure we are not an important about url
-    // Ensure we are not in incognito mode
     const url = new URL(tab.url);
     if (url.protocol === "about:"
-        || url.protocol === "moz-extension:"
-        || tab.incognito) {
+        || url.protocol === "moz-extension:") {
       return false;
     }
     return true;
diff --git a/src/js/background/badge.js b/src/js/background/badge.js
index 78cd9f1..7d532ac 100644
--- a/src/js/background/badge.js
+++ b/src/js/background/badge.js
@@ -2,22 +2,17 @@ const MAJOR_VERSIONS = ["2.3.0", "2.4.0"];
 const badge = {
   async init() {
     const currentWindow = await browser.windows.getCurrent();
-    this.displayBrowserActionBadge(currentWindow.incognito);
-  },
-
-  disableAddon(tabId) {
-    browser.browserAction.disable(tabId);
-    browser.browserAction.setTitle({ tabId, title: "Containers disabled in Private Browsing Mode" });
+    this.displayBrowserActionBadge(currentWindow);
   },
 
   async displayBrowserActionBadge() {
     const extensionInfo = await backgroundLogic.getExtensionInfo();
-    const storage = await browser.storage.local.get({browserActionBadgesClicked: []});
+    const storage = await browser.storage.local.get({ browserActionBadgesClicked: [] });
 
     if (MAJOR_VERSIONS.indexOf(extensionInfo.version) > -1 &&
-        storage.browserActionBadgesClicked.indexOf(extensionInfo.version) < 0) {
-      browser.browserAction.setBadgeBackgroundColor({color: "rgba(0,217,0,255)"});
-      browser.browserAction.setBadgeText({text: "NEW"});
+      storage.browserActionBadgesClicked.indexOf(extensionInfo.version) < 0) {
+      browser.browserAction.setBadgeBackgroundColor({ color: "rgba(0,217,0,255)" });
+      browser.browserAction.setBadgeText({ text: "NEW" });
     }
   }
 };
diff --git a/src/js/background/messageHandler.js b/src/js/background/messageHandler.js
index 9fbe88e..046d163 100644
--- a/src/js/background/messageHandler.js
+++ b/src/js/background/messageHandler.js
@@ -141,9 +141,6 @@ const messageHandler = {
     }, {urls: ["<all_urls>"], types: ["main_frame"]});
 
     browser.tabs.onCreated.addListener((tab) => {
-      if (tab.incognito) {
-        badge.disableAddon(tab.id);
-      }
       // lets remember the last tab created so we can close it if it looks like a redirect
       this.lastCreatedTab = tab;
       if (tab.cookieStoreId) {
diff --git a/src/manifest.json b/src/manifest.json
index bab033b..26d2dd8 100644
--- a/src/manifest.json
+++ b/src/manifest.json
@@ -2,22 +2,19 @@
   "manifest_version": 2,
   "name": "Firefox Multi-Account Containers",
   "version": "6.1.1",
-
+  "incognito": "not_allowed",
   "description": "Multi-Account Containers helps you keep all the parts of your online life contained in different tabs. Custom labels and color-coded tabs help keep different activities — like online shopping, travel planning, or checking work email — separate.",
   "icons": {
     "48": "img/container-site-d-48.png",
     "96": "img/container-site-d-96.png"
   },
-
   "applications": {
     "gecko": {
       "id": "@testpilot-containers",
-      "strict_min_version": "57.0"
+      "strict_min_version": "67.0"
     }
   },
-
   "homepage_url": "https://github.com/mozilla/multi-account-containers#readme",
-
   "permissions": [
     "<all_urls>",
     "activeTab",
@@ -32,7 +29,6 @@
     "webRequestBlocking",
     "webRequest"
   ],
-
   "commands": {
     "_execute_browser_action": {
       "suggested_key": {
@@ -42,33 +38,37 @@
       "description": "Open containers panel"
     }
   },
-
   "browser_action": {
     "browser_style": true,
     "default_icon": "img/container-site.svg",
     "default_title": "Multi-Account Containers",
     "default_popup": "popup.html",
-    "theme_icons": [{
+    "theme_icons": [
+      {
         "light": "img/container-site-light.svg",
         "dark": "img/container-site.svg",
         "size": 32
-    }]
+      }
+    ]
   },
-
   "background": {
     "page": "js/background/index.html"
   },
-
   "content_scripts": [
     {
-      "matches": ["<all_urls>"],
-      "js": ["js/content-script.js"],
-      "css": ["css/content.css"],
+      "matches": [
+        "<all_urls>"
+      ],
+      "js": [
+        "js/content-script.js"
+      ],
+      "css": [
+        "css/content.css"
+      ],
       "run_at": "document_start"
     }
   ],
-
   "web_accessible_resources": [
     "/img/container-site-d-24.png"
   ]
-}
+}
\ No newline at end of file

From 18bc8eb5aa6b9483cadfa36e656bed48335f1ed1 Mon Sep 17 00:00:00 2001
From: Kendall Werts <kmwerts@gmail.com>
Date: Thu, 17 Oct 2019 14:11:59 -0500
Subject: [PATCH 06/31] added bookmark context menu ref: issue #323

---
 src/js/background/assignManager.js | 35 +++++++++++++++++++++++++++++-
 src/manifest.json                  |  3 ++-
 2 files changed, 36 insertions(+), 2 deletions(-)

diff --git a/src/js/background/assignManager.js b/src/js/background/assignManager.js
index dc9e991..940c906 100644
--- a/src/js/background/assignManager.js
+++ b/src/js/background/assignManager.js
@@ -4,6 +4,7 @@ const assignManager = {
   MENU_SEPARATOR_ID: "separator",
   MENU_HIDE_ID: "hide-container",
   MENU_MOVE_ID: "move-to-new-window-container",
+  OPEN_IN_CONTAINER: "open-link-in-container-tab",
 
   storageArea: {
     area: browser.storage.local,
@@ -221,7 +222,11 @@ const assignManager = {
 
   init() {
     browser.contextMenus.onClicked.addListener((info, tab) => {
-      this._onClickedHandler(info, tab);
+      if (tab) {
+        this._onClickedHandler(info, tab);
+      } else {
+        this._onClickedBookmark(info);
+      }
     });
 
     // Before a request is handled by the browser we decide if we should route through a different container
@@ -242,6 +247,8 @@ const assignManager = {
       }
     },{urls: ["<all_urls>"], types: ["main_frame"]});
 
+    this.initBookmarksMenu();
+
   },
 
   async _onClickedHandler(info, tab) {
@@ -275,6 +282,14 @@ const assignManager = {
     }
   },
 
+  async _onClickedBookmark(info) {
+    const bookmark = await browser.bookmarks.get(info.bookmarkId);
+    browser.tabs.create({
+      cookieStoreId: info.menuItemId,
+      url: bookmark[0].url
+    });
+  },
+
 
   deleteContainer(userContextId) {
     this.storageArea.deleteContainer(userContextId);
@@ -442,6 +457,24 @@ const assignManager = {
         throw e;
       });
     }
+  },
+
+  async initBookmarksMenu() {
+    browser.contextMenus.create({
+      id: this.OPEN_IN_CONTAINER,
+      title: "Open Link in Container Tab",
+      contexts: ["bookmark"],
+    });
+
+    const identities = await browser.contextualIdentities.query({});
+    for (let identity of identities) { // eslint-disable-line prefer-const
+      browser.contextMenus.create({
+        parentId: this.OPEN_IN_CONTAINER,
+        id: identity.cookieStoreId,
+        title: identity.name,
+        icons: { "16": `img/usercontext.svg#${identity.icon}` }           
+      });
+    }
   }
 };
 
diff --git a/src/manifest.json b/src/manifest.json
index bab033b..54946e0 100644
--- a/src/manifest.json
+++ b/src/manifest.json
@@ -30,7 +30,8 @@
     "storage",
     "tabs",
     "webRequestBlocking",
-    "webRequest"
+    "webRequest",
+    "bookmarks"
   ],
 
   "commands": {

From c4650d12bd74225e6e940ecb0bebe90314369c3e Mon Sep 17 00:00:00 2001
From: Kendall Werts <kmwerts@gmail.com>
Date: Thu, 17 Oct 2019 15:25:58 -0500
Subject: [PATCH 07/31] added ability to open folders as well. issue #323

---
 src/js/background/assignManager.js | 15 ++++++++++-----
 1 file changed, 10 insertions(+), 5 deletions(-)

diff --git a/src/js/background/assignManager.js b/src/js/background/assignManager.js
index 940c906..536e467 100644
--- a/src/js/background/assignManager.js
+++ b/src/js/background/assignManager.js
@@ -283,11 +283,16 @@ const assignManager = {
   },
 
   async _onClickedBookmark(info) {
-    const bookmark = await browser.bookmarks.get(info.bookmarkId);
-    browser.tabs.create({
-      cookieStoreId: info.menuItemId,
-      url: bookmark[0].url
-    });
+    let bookmarks = await browser.bookmarks.get(info.bookmarkId);
+    if (bookmarks[0].type === "folder") { 
+      bookmarks = await browser.bookmarks.getChildren(bookmarks[0].id);
+    }
+    for (let bookmark of bookmarks) { // eslint-disable-line prefer-const
+      browser.tabs.create({
+        cookieStoreId: info.menuItemId,
+        url: bookmark.url
+      });
+    }
   },
 
 

From dae376500bde31ac86860ef65583415a4b6c5bcb Mon Sep 17 00:00:00 2001
From: dnahol <dalia.nahol@gmail.com>
Date: Thu, 10 Oct 2019 10:11:04 -0700
Subject: [PATCH 08/31] added right and left arrow shortcuts for container
 submenu tabs

change focus to whole panel element after right arrow press, allows navigation without pressing tab
---
 src/js/popup.js | 29 +++++++++++++++++++++++++----
 1 file changed, 25 insertions(+), 4 deletions(-)

diff --git a/src/js/popup.js b/src/js/popup.js
index 80986a2..01e792d 100644
--- a/src/js/popup.js
+++ b/src/js/popup.js
@@ -543,6 +543,7 @@ Logic.registerPanel(P_CONTAINERS_LIST, {
           previousElement.focus();
         }
       }
+
       switch (e.keyCode) {
       case 40:
         next();
@@ -550,6 +551,26 @@ Logic.registerPanel(P_CONTAINERS_LIST, {
       case 38:
         previous();
         break;
+      case 39:
+        {
+          const showTabs = element.parentNode.querySelector(".show-tabs");
+          if(showTabs) {
+            showTabs.click();
+          }
+          const panel = document.querySelector("html");
+          if(panel) {
+            panel.focus();
+          }
+          break;
+        }
+      case 37:
+        {
+          const hideTabs = element.parentNode.querySelector(".panel-back-arrow");
+          if(hideTabs) {
+            hideTabs.click();
+          }
+          break;
+        }
       default:
         if ((e.keyCode >= 49 && e.keyCode <= 57) &&
             Logic._currentPanel === "containersList") {
@@ -747,7 +768,7 @@ Logic.registerPanel(P_CONTAINER_INFO, {
       return;
     } else if (numTabs === 1) {
       Logic._disableMoveTabs("Cannot move a tab from a single-tab window.");
-      return; 
+      return;
     }
     Logic.addEnterHandler(moveTabsEl, async () => {
       await browser.runtime.sendMessage({
@@ -808,7 +829,7 @@ Logic.registerPanel(P_CONTAINER_INFO, {
         <td class="container-info-tab-title truncate-text" title="${tab.url}" ><div class="container-tab-title">${tab.title}</div></td>`;
       tr.querySelector("td").appendChild(Utils.createFavIconElement(tab.favIconUrl));
       document.getElementById("container-info-table").appendChild(fragment);
-      
+
       // On click, we activate this tab. But only if this tab is active.
       if (!tab.hiddenState) {
         const closeImage = document.createElement("img");
@@ -842,7 +863,7 @@ Logic.registerPanel(P_CONTAINER_INFO, {
           });
         }
       }
-    } 
+    }
   },
 });
 
@@ -1154,4 +1175,4 @@ window.addEventListener("resize", function () {
     root.style.setProperty("--overflow-size", difference + "px");
     root.style.setProperty("--icon-fit", "12");
   }
-});
\ No newline at end of file
+});

From 2cddbefb63c46ecffd4795227795443d61a79483 Mon Sep 17 00:00:00 2001
From: dnahol <dalia.nahol@gmail.com>
Date: Fri, 18 Oct 2019 13:47:54 -0700
Subject: [PATCH 09/31] added keyboard nav to onboarding popups

---
 src/js/popup.js | 15 ++++++++++++++-
 1 file changed, 14 insertions(+), 1 deletion(-)

diff --git a/src/js/popup.js b/src/js/popup.js
index e5b4dbf..6e9f3bb 100644
--- a/src/js/popup.js
+++ b/src/js/popup.js
@@ -382,6 +382,11 @@ const Logic = {
       }
     }
   },
+
+  getCurrentPanel() {
+    const panelItem = this._panels[this._currentPanel];
+    return document.querySelector(this.getPanelSelector(panelItem));
+  },
 };
 
 // P_ONBOARDING_1: First page for Onboarding.
@@ -550,6 +555,14 @@ Logic.registerPanel(P_CONTAINERS_LIST, {
       case 38:
         previous();
         break;
+      case 13: {
+        const panel = Logic.getCurrentPanel();
+        const button = panel.getElementsByTagName("A")[0];
+        if(button) {
+          button.click();
+        }
+        break;
+      }
       default:
         if ((e.keyCode >= 49 && e.keyCode <= 57) &&
             Logic._currentPanel === "containersList") {
@@ -1154,4 +1167,4 @@ window.addEventListener("resize", function () {
     root.style.setProperty("--overflow-size", difference + "px");
     root.style.setProperty("--icon-fit", "12");
   }
-});
\ No newline at end of file
+});

From 384ac486d9fb9a39d9df7bb4f194156c22214c38 Mon Sep 17 00:00:00 2001
From: Oksana Melnik <oksana@dedact.nl>
Date: Sat, 19 Oct 2019 14:43:03 +0200
Subject: [PATCH 10/31] duplitated-tabs: don't unhide duplicates of already
 opened tab

---
 src/js/background/backgroundLogic.js | 21 +++++++++++++--------
 src/js/background/messageHandler.js  | 19 ++++++++++++++++++-
 2 files changed, 31 insertions(+), 9 deletions(-)

diff --git a/src/js/background/backgroundLogic.js b/src/js/background/backgroundLogic.js
index 52d61a2..8542d52 100644
--- a/src/js/background/backgroundLogic.js
+++ b/src/js/background/backgroundLogic.js
@@ -113,11 +113,12 @@ const backgroundLogic = {
     return list.concat(containerState.hiddenTabs);
   },
 
-  async unhideContainer(cookieStoreId) {
+  async unhideContainer(cookieStoreId, toHide) {
     if (!this.unhideQueue.includes(cookieStoreId)) {
       this.unhideQueue.push(cookieStoreId);
       await this.showTabs({
-        cookieStoreId
+        cookieStoreId,
+        toHide
       });
       this.unhideQueue.splice(this.unhideQueue.indexOf(cookieStoreId), 1);
     }
@@ -309,12 +310,16 @@ const backgroundLogic = {
     const containerState = await identityState.storageArea.get(options.cookieStoreId);
 
     for (let object of containerState.hiddenTabs) { // eslint-disable-line prefer-const
-      promises.push(this.openNewTab({
-        userContextId: userContextId,
-        url: object.url,
-        nofocus: options.nofocus || false,
-        pinned: object.pinned,
-      }));
+      // do not show already opened url
+      if (object.url !== options.toHide) {
+        promises.push(this.openNewTab({
+          userContextId: userContextId,
+          url: object.url,
+          nofocus: options.nofocus || false,
+          pinned: object.pinned,
+        }));
+      }
+
     }
 
     containerState.hiddenTabs = [];
diff --git a/src/js/background/messageHandler.js b/src/js/background/messageHandler.js
index 9fbe88e..a1027ae 100644
--- a/src/js/background/messageHandler.js
+++ b/src/js/background/messageHandler.js
@@ -155,7 +155,24 @@ const messageHandler = {
           this.incrementCountOfContainerTabsOpened();
         }
 
-        backgroundLogic.unhideContainer(tab.cookieStoreId);
+        this.tabUpdateHandler = (tabId, changeInfo) => {
+          if (tabId === tab.id && changeInfo.status === "complete") {
+            // get current tab's url to not open the same one from hidden tabs
+            browser.tabs.get(tabId).then(loadedTab => {
+              backgroundLogic.unhideContainer(tab.cookieStoreId, loadedTab.url);
+            }).catch((e) => {
+              throw e;
+            });
+
+            browser.tabs.onUpdated.removeListener(this.tabUpdateHandler);
+          }
+        };
+
+        // if it's a container tab wait for it to complete and
+        // unhide other tabs from this container
+        if (tab.cookieStoreId.startsWith("firefox-container")) {
+          browser.tabs.onUpdated.addListener(this.tabUpdateHandler);
+        }
       }
       setTimeout(() => {
         this.lastCreatedTab = null;

From 9ff1a14e0e20a6779bee4c0bfe78a8019f871316 Mon Sep 17 00:00:00 2001
From: Karskaja <karskaja@gmail.com>
Date: Sat, 19 Oct 2019 08:12:51 -0400
Subject: [PATCH 11/31] Fix issue #1041- [Feature request] Open previously
 hidden tabs in the background

Add 'noload' property to openNewTab options, add 'discarded' parameter to browser.tabs.create. New tabs opened from showTabs will be discarded.
---
 src/js/background/backgroundLogic.js | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/src/js/background/backgroundLogic.js b/src/js/background/backgroundLogic.js
index 52d61a2..ee1bd22 100644
--- a/src/js/background/backgroundLogic.js
+++ b/src/js/background/backgroundLogic.js
@@ -55,6 +55,7 @@ const backgroundLogic = {
     let url = options.url || undefined;
     const userContextId = ("userContextId" in options) ? options.userContextId : 0;
     const active = ("nofocus" in options) ? options.nofocus : true;
+    const discarded = ("noload" in options) ? options.noload : false;
 
     const cookieStoreId = backgroundLogic.cookieStoreId(userContextId);
     // Autofocus url bar will happen in 54: https://bugzilla.mozilla.org/show_bug.cgi?id=1295072
@@ -71,6 +72,7 @@ const backgroundLogic = {
     return browser.tabs.create({
       url,
       active,
+      discarded,
       pinned: options.pinned || false,
       cookieStoreId
     });
@@ -313,6 +315,7 @@ const backgroundLogic = {
         userContextId: userContextId,
         url: object.url,
         nofocus: options.nofocus || false,
+        noload: true,
         pinned: object.pinned,
       }));
     }

From c832cf73aa041546c692116fe01aaf96c053ca0b Mon Sep 17 00:00:00 2001
From: Kendall Werts <kmwerts@gmail.com>
Date: Sat, 19 Oct 2019 22:31:12 -0500
Subject: [PATCH 12/31] edits from input

---
 src/js/background/assignManager.js | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/js/background/assignManager.js b/src/js/background/assignManager.js
index 536e467..659ecf7 100644
--- a/src/js/background/assignManager.js
+++ b/src/js/background/assignManager.js
@@ -4,7 +4,7 @@ const assignManager = {
   MENU_SEPARATOR_ID: "separator",
   MENU_HIDE_ID: "hide-container",
   MENU_MOVE_ID: "move-to-new-window-container",
-  OPEN_IN_CONTAINER: "open-link-in-container-tab",
+  OPEN_IN_CONTAINER: "open-bookmark-in-container-tab",
 
   storageArea: {
     area: browser.storage.local,
@@ -222,10 +222,10 @@ const assignManager = {
 
   init() {
     browser.contextMenus.onClicked.addListener((info, tab) => {
-      if (tab) {
-        this._onClickedHandler(info, tab);
-      } else {
+      if (info.bookmarkId) {
         this._onClickedBookmark(info);
+      } else {
+        this._onClickedHandler(info, tab);
       }
     });
 
@@ -467,7 +467,7 @@ const assignManager = {
   async initBookmarksMenu() {
     browser.contextMenus.create({
       id: this.OPEN_IN_CONTAINER,
-      title: "Open Link in Container Tab",
+      title: "Open Bookmark in Container Tab",
       contexts: ["bookmark"],
     });
 

From 7e4950b18444369f62cbff1f49ba154306fff6fb Mon Sep 17 00:00:00 2001
From: Kendall Werts <kmwerts@gmail.com>
Date: Wed, 23 Oct 2019 15:48:43 -0500
Subject: [PATCH 13/31] menu updates when containers are changed, added, or
 deleted. Tests need to be updated

---
 src/js/background/assignManager.js | 25 +++++++++++++++++++++++--
 1 file changed, 23 insertions(+), 2 deletions(-)

diff --git a/src/js/background/assignManager.js b/src/js/background/assignManager.js
index 659ecf7..b65f811 100644
--- a/src/js/background/assignManager.js
+++ b/src/js/background/assignManager.js
@@ -246,9 +246,30 @@ const assignManager = {
         delete this.canceledRequests[options.tabId];
       }
     },{urls: ["<all_urls>"], types: ["main_frame"]});
-
     this.initBookmarksMenu();
+    browser.contextualIdentities.onCreated.addListener(this.contextualIdentCreated);
+    browser.contextualIdentities.onUpdated.addListener(this.contextualIdentUpdated);
+    browser.contextualIdentities.onRemoved.addListener(this.contextualIdentRemoved);
+  },
 
+  contextualIdentCreated(changeInfo) {
+    browser.contextMenus.create({
+      parentId: assignManager.OPEN_IN_CONTAINER,
+      id: changeInfo.contextualIdentity.cookieStoreId,
+      title: changeInfo.contextualIdentity.name,
+      icons: { "16": `img/usercontext.svg#${changeInfo.contextualIdentity.icon}` }
+    });
+  },
+
+  contextualIdentUpdated(changeInfo) {
+    browser.contextMenus.update(changeInfo.contextualIdentity.cookieStoreId, {
+      title: changeInfo.contextualIdentity.name,
+      icons: { "16": `img/usercontext.svg#${changeInfo.contextualIdentity.icon}` }
+    });
+  },
+
+  contextualIdentRemoved(changeInfo) {
+    browser.contextMenus.remove(changeInfo.contextualIdentity.cookieStoreId);
   },
 
   async _onClickedHandler(info, tab) {
@@ -477,7 +498,7 @@ const assignManager = {
         parentId: this.OPEN_IN_CONTAINER,
         id: identity.cookieStoreId,
         title: identity.name,
-        icons: { "16": `img/usercontext.svg#${identity.icon}` }           
+        icons: { "16": `img/usercontext.svg#${identity.icon}` }
       });
     }
   }

From 29a0277398331a2ac05568e827315c8f7fabfaf9 Mon Sep 17 00:00:00 2001
From: dnahol <dalia.nahol@gmail.com>
Date: Thu, 24 Oct 2019 10:17:32 -0700
Subject: [PATCH 14/31] change getCurrentPanel to getCurrentPanelElement

---
 src/js/popup.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/js/popup.js b/src/js/popup.js
index 6e9f3bb..ffee10a 100644
--- a/src/js/popup.js
+++ b/src/js/popup.js
@@ -383,7 +383,7 @@ const Logic = {
     }
   },
 
-  getCurrentPanel() {
+  getCurrentPanelElement() {
     const panelItem = this._panels[this._currentPanel];
     return document.querySelector(this.getPanelSelector(panelItem));
   },
@@ -556,7 +556,7 @@ Logic.registerPanel(P_CONTAINERS_LIST, {
         previous();
         break;
       case 13: {
-        const panel = Logic.getCurrentPanel();
+        const panel = Logic.getCurrentPanelElement();
         const button = panel.getElementsByTagName("A")[0];
         if(button) {
           button.click();

From e7824f367b34b148ba0598948f0007b37d51bbca Mon Sep 17 00:00:00 2001
From: Kendall Werts <kmwerts@gmail.com>
Date: Thu, 24 Oct 2019 14:14:30 -0500
Subject: [PATCH 15/31] added bookmarks as optional_permission and added
 checkbox in preferences menu.

---
 src/js/background/assignManager.js   | 43 +++++++++++++++++++++-------
 src/js/background/backgroundLogic.js |  2 +-
 src/js/background/messageHandler.js  |  3 ++
 src/js/options.js                    | 41 ++++++++++++++++++++++++++
 src/manifest.json                    | 11 +++++--
 src/options.html                     | 16 +++++++++++
 6 files changed, 102 insertions(+), 14 deletions(-)
 create mode 100644 src/js/options.js
 create mode 100644 src/options.html

diff --git a/src/js/background/assignManager.js b/src/js/background/assignManager.js
index b65f811..2cdf23c 100644
--- a/src/js/background/assignManager.js
+++ b/src/js/background/assignManager.js
@@ -5,7 +5,6 @@ const assignManager = {
   MENU_HIDE_ID: "hide-container",
   MENU_MOVE_ID: "move-to-new-window-container",
   OPEN_IN_CONTAINER: "open-bookmark-in-container-tab",
-
   storageArea: {
     area: browser.storage.local,
     exemptedTabs: {},
@@ -222,11 +221,7 @@ const assignManager = {
 
   init() {
     browser.contextMenus.onClicked.addListener((info, tab) => {
-      if (info.bookmarkId) {
-        this._onClickedBookmark(info);
-      } else {
-        this._onClickedHandler(info, tab);
-      }
+      info.bookmarkId ? this._onClickedBookmark(info) : this._onClickedHandler(info, tab);
     });
 
     // Before a request is handled by the browser we decide if we should route through a different container
@@ -246,6 +241,24 @@ const assignManager = {
         delete this.canceledRequests[options.tabId];
       }
     },{urls: ["<all_urls>"], types: ["main_frame"]});
+    this.getPermissions();
+  },
+
+  getPermissions() {
+    browser.permissions.getAll().
+    then((permissions) => {
+      if (permissions.permissions.includes("bookmarks")) {
+        this.makeBookmarksMenu();
+      } else {
+        browser.contextMenus.remove(this.OPEN_IN_CONTAINER);
+      }
+    }).
+    catch((err) => {
+      return err.message;
+    });
+  },
+
+  makeBookmarksMenu() {
     this.initBookmarksMenu();
     browser.contextualIdentities.onCreated.addListener(this.contextualIdentCreated);
     browser.contextualIdentities.onUpdated.addListener(this.contextualIdentUpdated);
@@ -304,11 +317,19 @@ const assignManager = {
   },
 
   async _onClickedBookmark(info) {
-    let bookmarks = await browser.bookmarks.get(info.bookmarkId);
-    if (bookmarks[0].type === "folder") { 
-      bookmarks = await browser.bookmarks.getChildren(bookmarks[0].id);
+
+    async function _getBookmarksFromInfo(info) {
+      const bookmarkTreeNode = await browser.bookmarks.get(info.bookmarkId);
+      const firstBookmark = bookmarkTreeNode[0];
+      if (firstBookmark.type === "folder") {
+        return await browser.bookmarks.getChildren(firstBookmark.id);
+      } else {
+        return bookmarkTreeNode;
+      }
     }
-    for (let bookmark of bookmarks) { // eslint-disable-line prefer-const
+
+    const bookmarks = await _getBookmarksFromInfo(info);
+    for (const bookmark of bookmarks) {
       browser.tabs.create({
         cookieStoreId: info.menuItemId,
         url: bookmark.url
@@ -493,7 +514,7 @@ const assignManager = {
     });
 
     const identities = await browser.contextualIdentities.query({});
-    for (let identity of identities) { // eslint-disable-line prefer-const
+    for (const identity of identities) {
       browser.contextMenus.create({
         parentId: this.OPEN_IN_CONTAINER,
         id: identity.cookieStoreId,
diff --git a/src/js/background/backgroundLogic.js b/src/js/background/backgroundLogic.js
index 52d61a2..9857f9e 100644
--- a/src/js/background/backgroundLogic.js
+++ b/src/js/background/backgroundLogic.js
@@ -326,4 +326,4 @@ const backgroundLogic = {
   cookieStoreId(userContextId) {
     return `firefox-container-${userContextId}`;
   }
-};
+};
\ No newline at end of file
diff --git a/src/js/background/messageHandler.js b/src/js/background/messageHandler.js
index 9fbe88e..f545389 100644
--- a/src/js/background/messageHandler.js
+++ b/src/js/background/messageHandler.js
@@ -10,6 +10,9 @@ const messageHandler = {
       let response;
 
       switch (m.method) {
+      case "resetBookmarksContext":
+        response = assignManager.getPermissions();
+        break;
       case "deleteContainer":
         response = backgroundLogic.deleteContainer(m.message.userContextId);
         break;
diff --git a/src/js/options.js b/src/js/options.js
new file mode 100644
index 0000000..0eb1bb5
--- /dev/null
+++ b/src/js/options.js
@@ -0,0 +1,41 @@
+
+function requestPermissions() {
+  const checkbox = document.querySelector("#bookmarksPermissions");
+  if (checkbox.checked) {
+    browser.permissions.request({permissions: ["bookmarks"]}).
+    then((response) => {
+      if (response) {
+        browser.runtime.sendMessage({ method: "resetBookmarksContext" });
+      } else {
+        checkbox.checked = false;
+      }
+    }).
+    catch((err) => {
+      return err.message;
+    });
+  } else {
+    browser.permissions.remove({permissions: ["bookmarks"]}).
+    then(() => {
+      browser.runtime.sendMessage({ method: "resetBookmarksContext" });
+    }).
+    catch((err) => {
+      return err.message;
+    });
+  }
+}
+
+function restoreOptions() {
+  browser.permissions.getAll()
+    .then((permissions) => {
+      if (permissions.permissions.includes("bookmarks")) {
+        document.querySelector("#bookmarksPermissions").checked = true;
+      }
+    }).
+    catch((err) => {
+      return err.message;
+    });
+}
+
+
+document.addEventListener("DOMContentLoaded", restoreOptions);
+document.querySelector("#bookmarksPermissions").addEventListener( "change", requestPermissions);
\ No newline at end of file
diff --git a/src/manifest.json b/src/manifest.json
index 54946e0..27ce893 100644
--- a/src/manifest.json
+++ b/src/manifest.json
@@ -30,7 +30,10 @@
     "storage",
     "tabs",
     "webRequestBlocking",
-    "webRequest",
+    "webRequest"
+  ],
+
+  "optional_permissions": [
     "bookmarks"
   ],
 
@@ -71,5 +74,9 @@
 
   "web_accessible_resources": [
     "/img/container-site-d-24.png"
-  ]
+  ],
+
+  "options_ui": {
+    "page": "options.html"
+  }
 }
diff --git a/src/options.html b/src/options.html
new file mode 100644
index 0000000..86e3d03
--- /dev/null
+++ b/src/options.html
@@ -0,0 +1,16 @@
+<!DOCTYPE html>
+
+<html>
+  <head>
+    <meta charset="utf-8"/>
+  </head>
+
+  <body>
+    <form>
+      <input type="checkbox" id="bookmarksPermissions"/>
+      <label>Enable Bookmark Permissions</label>
+      <p>This setting allows you to open a bookmark or folder of bookmarks in a container.</p>
+    </form>
+    <script src="js/options.js"></script>
+  </body>
+</html>
\ No newline at end of file

From 1133d48103380305c7cbd3e52def5bb6c360f732 Mon Sep 17 00:00:00 2001
From: dnahol <dalia.nahol@gmail.com>
Date: Thu, 24 Oct 2019 14:02:28 -0700
Subject: [PATCH 16/31] left arrow now works without changing focus in right
 arrow case

---
 src/js/popup.js | 7 +------
 1 file changed, 1 insertion(+), 6 deletions(-)

diff --git a/src/js/popup.js b/src/js/popup.js
index 01e792d..401b2bd 100644
--- a/src/js/popup.js
+++ b/src/js/popup.js
@@ -543,7 +543,6 @@ Logic.registerPanel(P_CONTAINERS_LIST, {
           previousElement.focus();
         }
       }
-
       switch (e.keyCode) {
       case 40:
         next();
@@ -557,15 +556,11 @@ Logic.registerPanel(P_CONTAINERS_LIST, {
           if(showTabs) {
             showTabs.click();
           }
-          const panel = document.querySelector("html");
-          if(panel) {
-            panel.focus();
-          }
           break;
         }
       case 37:
         {
-          const hideTabs = element.parentNode.querySelector(".panel-back-arrow");
+          const hideTabs = document.querySelector(".panel-back-arrow");
           if(hideTabs) {
             hideTabs.click();
           }

From 87a2aa5f1e7a644bae46975c011befeecae0727a Mon Sep 17 00:00:00 2001
From: Kendall Werts <kmwerts@gmail.com>
Date: Thu, 24 Oct 2019 16:16:02 -0500
Subject: [PATCH 17/31] added url checks for edge case urls

---
 src/js/background/assignManager.js   | 30 +++++++++++++++++++---------
 src/js/background/backgroundLogic.js |  3 ---
 2 files changed, 21 insertions(+), 12 deletions(-)

diff --git a/src/js/background/assignManager.js b/src/js/background/assignManager.js
index 2cdf23c..1a3f527 100644
--- a/src/js/background/assignManager.js
+++ b/src/js/background/assignManager.js
@@ -319,21 +319,33 @@ const assignManager = {
   async _onClickedBookmark(info) {
 
     async function _getBookmarksFromInfo(info) {
-      const bookmarkTreeNode = await browser.bookmarks.get(info.bookmarkId);
-      const firstBookmark = bookmarkTreeNode[0];
-      if (firstBookmark.type === "folder") {
-        return await browser.bookmarks.getChildren(firstBookmark.id);
+      const [bookmarkTreeNode] = await browser.bookmarks.get(info.bookmarkId);
+      if (bookmarkTreeNode.type === "folder") {
+        return await browser.bookmarks.getChildren(bookmarkTreeNode.id);
       } else {
-        return bookmarkTreeNode;
+        return [bookmarkTreeNode];
       }
     }
 
     const bookmarks = await _getBookmarksFromInfo(info);
     for (const bookmark of bookmarks) {
-      browser.tabs.create({
-        cookieStoreId: info.menuItemId,
-        url: bookmark.url
-      });
+      // Some checks on the urls from https://github.com/Rob--W/bookmark-container-tab/ thanks!
+      if ( !/^(javascript|place):/i.test(bookmark.url) && bookmark.type !== "folder") {
+        const openInReaderMode = bookmark.url.startsWith("about:reader");
+        if(openInReaderMode) {
+          try {
+            const parsed = new URL(bookmark.url);
+            bookmark.url = parsed.searchParams.get("url") + parsed.hash; // can't believe const lets me do this ...
+          } catch (err) {
+            return err.message;
+          }
+        }
+        browser.tabs.create({
+          cookieStoreId: info.menuItemId,
+          url: bookmark.url,
+          openInReaderMode: openInReaderMode
+        });
+      }
     }
   },
 
diff --git a/src/js/background/backgroundLogic.js b/src/js/background/backgroundLogic.js
index 9857f9e..7556693 100644
--- a/src/js/background/backgroundLogic.js
+++ b/src/js/background/backgroundLogic.js
@@ -46,9 +46,6 @@ const backgroundLogic = {
       donePromise = browser.contextualIdentities.create(options.params);
     }
     await donePromise;
-    browser.runtime.sendMessage({
-      method: "refreshNeeded"
-    });
   },
 
   async openNewTab(options) {

From bd579fe9076bf18aabfc83850bed4481d62ad5bc Mon Sep 17 00:00:00 2001
From: Kendall Werts <kmwerts@gmail.com>
Date: Thu, 24 Oct 2019 16:32:49 -0500
Subject: [PATCH 18/31] added changes requested

---
 src/js/background/assignManager.js | 30 ++++++++++--------------------
 src/options.html                   |  2 +-
 2 files changed, 11 insertions(+), 21 deletions(-)

diff --git a/src/js/background/assignManager.js b/src/js/background/assignManager.js
index 1a3f527..0559220 100644
--- a/src/js/background/assignManager.js
+++ b/src/js/background/assignManager.js
@@ -244,28 +244,19 @@ const assignManager = {
     this.getPermissions();
   },
 
-  getPermissions() {
-    browser.permissions.getAll().
-    then((permissions) => {
-      if (permissions.permissions.includes("bookmarks")) {
-        this.makeBookmarksMenu();
-      } else {
-        browser.contextMenus.remove(this.OPEN_IN_CONTAINER);
-      }
-    }).
-    catch((err) => {
-      return err.message;
-    });
+  async getPermissions() {
+    const {permissions} = await browser.permissions.getAll()
+    permissions.includes("bookmarks") ? this.makeBookmarksMenu() : browser.contextMenus.remove(this.OPEN_IN_CONTAINER);
   },
 
   makeBookmarksMenu() {
     this.initBookmarksMenu();
-    browser.contextualIdentities.onCreated.addListener(this.contextualIdentCreated);
-    browser.contextualIdentities.onUpdated.addListener(this.contextualIdentUpdated);
-    browser.contextualIdentities.onRemoved.addListener(this.contextualIdentRemoved);
+    browser.contextualIdentities.onCreated.addListener(this.contextualIdentityCreated);
+    browser.contextualIdentities.onUpdated.addListener(this.contextualIdentityUpdated);
+    browser.contextualIdentities.onRemoved.addListener(this.contextualIdentityRemoved);
   },
 
-  contextualIdentCreated(changeInfo) {
+  contextualIdentityCreated(changeInfo) {
     browser.contextMenus.create({
       parentId: assignManager.OPEN_IN_CONTAINER,
       id: changeInfo.contextualIdentity.cookieStoreId,
@@ -274,14 +265,14 @@ const assignManager = {
     });
   },
 
-  contextualIdentUpdated(changeInfo) {
+  contextualIdentityUpdated(changeInfo) {
     browser.contextMenus.update(changeInfo.contextualIdentity.cookieStoreId, {
       title: changeInfo.contextualIdentity.name,
       icons: { "16": `img/usercontext.svg#${changeInfo.contextualIdentity.icon}` }
     });
   },
 
-  contextualIdentRemoved(changeInfo) {
+  contextualIdentityRemoved(changeInfo) {
     browser.contextMenus.remove(changeInfo.contextualIdentity.cookieStoreId);
   },
 
@@ -322,9 +313,8 @@ const assignManager = {
       const [bookmarkTreeNode] = await browser.bookmarks.get(info.bookmarkId);
       if (bookmarkTreeNode.type === "folder") {
         return await browser.bookmarks.getChildren(bookmarkTreeNode.id);
-      } else {
-        return [bookmarkTreeNode];
       }
+      return [bookmarkTreeNode];
     }
 
     const bookmarks = await _getBookmarksFromInfo(info);
diff --git a/src/options.html b/src/options.html
index 86e3d03..84f7353 100644
--- a/src/options.html
+++ b/src/options.html
@@ -8,7 +8,7 @@
   <body>
     <form>
       <input type="checkbox" id="bookmarksPermissions"/>
-      <label>Enable Bookmark Permissions</label>
+      <label>Enable Bookmark Menus</label>
       <p>This setting allows you to open a bookmark or folder of bookmarks in a container.</p>
     </form>
     <script src="js/options.js"></script>

From 6f94ae15007eaa2a719eec4d3665f6efbf633178 Mon Sep 17 00:00:00 2001
From: Kendall Werts <kmwerts@gmail.com>
Date: Thu, 24 Oct 2019 16:42:19 -0500
Subject: [PATCH 19/31] updated testing setup to understand my api calls

---
 src/js/background/assignManager.js |  2 +-
 test/browser.mock.js               | 14 +++++++++++++-
 2 files changed, 14 insertions(+), 2 deletions(-)

diff --git a/src/js/background/assignManager.js b/src/js/background/assignManager.js
index 0559220..adbc985 100644
--- a/src/js/background/assignManager.js
+++ b/src/js/background/assignManager.js
@@ -245,7 +245,7 @@ const assignManager = {
   },
 
   async getPermissions() {
-    const {permissions} = await browser.permissions.getAll()
+    const {permissions} = await browser.permissions.getAll();
     permissions.includes("bookmarks") ? this.makeBookmarksMenu() : browser.contextMenus.remove(this.OPEN_IN_CONTAINER);
   },
 
diff --git a/test/browser.mock.js b/test/browser.mock.js
index d6d38dd..fbff362 100644
--- a/test/browser.mock.js
+++ b/test/browser.mock.js
@@ -58,7 +58,16 @@ module.exports = () => {
     contextualIdentities: {
       create: sinon.stub(),
       get: sinon.stub(),
-      query: sinon.stub().resolves([])
+      query: sinon.stub().resolves([]),
+      onCreated: {
+        addListener: sinon.stub()
+      },
+      onUpdated: {
+        addListener: sinon.stub()
+      },
+      onRemoved: {
+        addListener: sinon.stub()
+      }
     },
     contextMenus: {
       create: sinon.stub(),
@@ -82,6 +91,9 @@ module.exports = () => {
     },
     extension: {
       getURL: sinon.stub().returns("moz-extension://multi-account-containers/confirm-page.html")
+    },
+    permissions: {
+      getAll: sinon.stub().returns({"permissions": ["bookmarks"]})
     }
   };
 

From ef894d847ed15ff1b00a9a00e2da4ad1aac272a4 Mon Sep 17 00:00:00 2001
From: dnahol <dalia.nahol@gmail.com>
Date: Thu, 24 Oct 2019 20:25:47 -0700
Subject: [PATCH 20/31] merge upstream commit 'remove HTML entities from
 tooltip'

---
 src/js/popup.js | 85 ++++++++++++++++++++++++++++---------------------
 1 file changed, 49 insertions(+), 36 deletions(-)

diff --git a/src/js/popup.js b/src/js/popup.js
index 401b2bd..c24d519 100644
--- a/src/js/popup.js
+++ b/src/js/popup.js
@@ -12,15 +12,15 @@ const NEW_CONTAINER_ID = "new";
 const ONBOARDING_STORAGE_KEY = "onboarding-stage";
 
 // List of panels
-const P_ONBOARDING_1     = "onboarding1";
-const P_ONBOARDING_2     = "onboarding2";
-const P_ONBOARDING_3     = "onboarding3";
-const P_ONBOARDING_4     = "onboarding4";
-const P_ONBOARDING_5     = "onboarding5";
-const P_CONTAINERS_LIST  = "containersList";
-const P_CONTAINERS_EDIT  = "containersEdit";
-const P_CONTAINER_INFO   = "containerInfo";
-const P_CONTAINER_EDIT   = "containerEdit";
+const P_ONBOARDING_1 = "onboarding1";
+const P_ONBOARDING_2 = "onboarding2";
+const P_ONBOARDING_3 = "onboarding3";
+const P_ONBOARDING_4 = "onboarding4";
+const P_ONBOARDING_5 = "onboarding5";
+const P_CONTAINERS_LIST = "containersList";
+const P_CONTAINERS_EDIT = "containersEdit";
+const P_CONTAINER_INFO = "containerInfo";
+const P_CONTAINER_EDIT = "containerEdit";
 const P_CONTAINER_DELETE = "containerDelete";
 const P_CONTAINERS_ACHIEVEMENT = "containersAchievement";
 
@@ -32,7 +32,7 @@ const P_CONTAINERS_ACHIEVEMENT = "containersAchievement";
  * @return {string} The escaped string.
  */
 function escapeXML(str) {
-  const replacements = {"&": "&amp;", "\"": "&quot;", "'": "&apos;", "<": "&lt;", ">": "&gt;", "/": "&#x2F;"};
+  const replacements = { "&": "&amp;", "\"": "&quot;", "'": "&apos;", "<": "&lt;", ">": "&gt;", "/": "&#x2F;" };
   return String(str).replace(/[&"'<>/]/g, m => replacements[m]);
 }
 
@@ -85,7 +85,7 @@ const Logic = {
 
     try {
       await identitiesPromise;
-    } catch(e) {
+    } catch (e) {
       throw new Error("Failed to retrieve the identities or variation. We cannot continue. ", e.message);
     }
 
@@ -125,7 +125,7 @@ const Logic = {
   async showAchievementOrContainersListPanel() {
     // Do we need to show an achievement panel?
     let showAchievements = false;
-    const achievementsStorage = await browser.storage.local.get({achievements: []});
+    const achievementsStorage = await browser.storage.local.get({ achievements: [] });
     for (const achievement of achievementsStorage.achievements) {
       if (!achievement.done) {
         showAchievements = true;
@@ -142,7 +142,7 @@ const Logic = {
   // they have to click the "Done" button to stop the panel
   // from showing
   async setAchievementDone(achievementName) {
-    const achievementsStorage = await browser.storage.local.get({achievements: []});
+    const achievementsStorage = await browser.storage.local.get({ achievements: [] });
     const achievements = achievementsStorage.achievements;
     achievements.forEach((achievement, index, achievementsArray) => {
       if (achievement.name === achievementName) {
@@ -150,7 +150,7 @@ const Logic = {
         achievementsArray[index] = achievement;
       }
     });
-    browser.storage.local.set({achievements});
+    browser.storage.local.set({ achievements });
   },
 
   setOnboardingStage(stage) {
@@ -161,9 +161,9 @@ const Logic = {
 
   async clearBrowserActionBadge() {
     const extensionInfo = await getExtensionInfo();
-    const storage = await browser.storage.local.get({browserActionBadgesClicked: []});
-    browser.browserAction.setBadgeBackgroundColor({color: null});
-    browser.browserAction.setBadgeText({text: ""});
+    const storage = await browser.storage.local.get({ browserActionBadgesClicked: [] });
+    browser.browserAction.setBadgeBackgroundColor({ color: null });
+    browser.browserAction.setBadgeText({ text: "" });
     storage.browserActionBadgesClicked.push(extensionInfo.version);
     // use set and spread to create a unique array
     const browserActionBadgesClicked = [...new Set(storage.browserActionBadgesClicked)];
@@ -184,7 +184,7 @@ const Logic = {
     // Handle old style rejection with null and also Promise.reject new style
     try {
       return await browser.contextualIdentities.get(cookieStoreId) || defaultContainer;
-    } catch(e) {
+    } catch (e) {
       return defaultContainer;
     }
   },
@@ -207,7 +207,7 @@ const Logic = {
   },
 
   async currentTab() {
-    const activeTabs = await browser.tabs.query({active: true, windowId: browser.windows.WINDOW_ID_CURRENT});
+    const activeTabs = await browser.tabs.query({ active: true, windowId: browser.windows.WINDOW_ID_CURRENT });
     if (activeTabs.length > 0) {
       return activeTabs[0];
     }
@@ -215,7 +215,7 @@ const Logic = {
   },
 
   async numTabs() {
-    const activeTabs = await browser.tabs.query({windowId: browser.windows.WINDOW_ID_CURRENT});
+    const activeTabs = await browser.tabs.query({ windowId: browser.windows.WINDOW_ID_CURRENT });
     return activeTabs.length;
   },
 
@@ -259,7 +259,7 @@ const Logic = {
 
   getPanelSelector(panel) {
     if (this._onboardingVariation === "securityOnboarding" &&
-        panel.hasOwnProperty("securityPanelSelector")) {
+      panel.hasOwnProperty("securityPanelSelector")) {
       return panel.securityPanelSelector;
     } else {
       return panel.panelSelector;
@@ -289,7 +289,13 @@ const Logic = {
         }
       }
     });
-    document.querySelector(this.getPanelSelector(this._panels[panel])).classList.remove("hide");
+    const panelEl = document.querySelector(this.getPanelSelector(this._panels[panel]));
+    panelEl.classList.remove("hide");
+
+    const focusEl = panelEl.querySelector(".firstTabindex");
+    if(focusEl) {
+      focusEl.focus();
+    }
   },
 
   showPreviousPanel() {
@@ -333,7 +339,7 @@ const Logic = {
 
     return browser.runtime.sendMessage({
       method: "deleteContainer",
-      message: {userContextId}
+      message: { userContextId }
     });
   },
 
@@ -347,7 +353,7 @@ const Logic = {
   getAssignmentObjectByContainer(userContextId) {
     return browser.runtime.sendMessage({
       method: "getAssignmentObjectByContainer",
-      message: {userContextId}
+      message: { userContextId }
     });
   },
 
@@ -376,7 +382,7 @@ const Logic = {
     });
 
     // Here we find the first valid id.
-    for (let id = 1;; ++id) {
+    for (let id = 1; ; ++id) {
       if (ids.indexOf(id) === -1) {
         return defaultName + (id < 10 ? "0" : "") + id;
       }
@@ -511,7 +517,7 @@ Logic.registerPanel(P_CONTAINERS_LIST, {
     });
 
     Logic.addEnterHandler(document.querySelector("#edit-containers-link"), (e) => {
-      if (!e.target.classList.contains("disable-edit-containers")){
+      if (!e.target.classList.contains("disable-edit-containers")) {
         Logic.showPanel(P_CONTAINERS_EDIT);
       }
     });
@@ -653,9 +659,10 @@ Logic.registerPanel(P_CONTAINERS_LIST, {
 
       context.classList.add("userContext-wrapper", "open-newtab", "clickable");
       manage.classList.add("show-tabs", "pop-button");
-      manage.title = escaped`View ${identity.name} container`;
+      manage.setAttribute("title", `View ${identity.name} container`);
       context.setAttribute("tabindex", "0");
-      context.title = escaped`Create ${identity.name} tab`;
+      context.classList.add("firstTabindex");
+      context.setAttribute("title", `Create ${identity.name} tab`);
       context.innerHTML = escaped`
         <div class="userContext-icon-wrapper open-newtab">
           <div class="usercontext-icon"
@@ -677,8 +684,8 @@ Logic.registerPanel(P_CONTAINERS_LIST, {
 
       Logic.addEnterHandler(tr, async (e) => {
         if (e.target.matches(".open-newtab")
-            || e.target.parentNode.matches(".open-newtab")
-            || e.type === "keydown") {
+          || e.target.parentNode.matches(".open-newtab")
+          || e.type === "keydown") {
           try {
             browser.tabs.create({
               cookieStoreId: identity.cookieStoreId
@@ -729,11 +736,15 @@ Logic.registerPanel(P_CONTAINER_INFO, {
 
   // This method is called when the object is registered.
   async initialize() {
-    Logic.addEnterHandler(document.querySelector("#close-container-info-panel"), () => {
+    const closeContEl = document.querySelector("#close-container-info-panel");
+    closeContEl.setAttribute("tabindex", "0");
+    closeContEl.classList.add("firstTabindex");
+    Logic.addEnterHandler(closeContEl, () => {
       Logic.showPreviousPanel();
     });
-
-    Logic.addEnterHandler(document.querySelector("#container-info-hideorshow"), async () => {
+    const hideContEl = document.querySelector("#container-info-hideorshow");
+    hideContEl.setAttribute("tabindex", "0");
+    Logic.addEnterHandler(hideContEl, async () => {
       const identity = Logic.currentIdentity();
       try {
         browser.runtime.sendMessage({
@@ -757,6 +768,7 @@ Logic.registerPanel(P_CONTAINER_INFO, {
       throw new Error("Could not check for incompatible add-ons.");
     }
     const moveTabsEl = document.querySelector("#container-info-movetabs");
+    moveTabsEl.setAttribute("tabindex","0");
     const numTabs = await Logic.numTabs();
     if (incompatible) {
       Logic._disableMoveTabs("Moving container tabs is incompatible with Pulse, PageShot, and SnoozeTabs.");
@@ -823,6 +835,7 @@ Logic.registerPanel(P_CONTAINER_INFO, {
         <td></td>
         <td class="container-info-tab-title truncate-text" title="${tab.url}" ><div class="container-tab-title">${tab.title}</div></td>`;
       tr.querySelector("td").appendChild(Utils.createFavIconElement(tab.favIconUrl));
+      tr.setAttribute("tabindex", "0");
       document.getElementById("container-info-table").appendChild(fragment);
 
       // On click, we activate this tab. But only if this tab is active.
@@ -846,7 +859,7 @@ Logic.registerPanel(P_CONTAINER_INFO, {
 
         tr.classList.add("clickable");
         Logic.addEnterHandler(tr, async () => {
-          await browser.tabs.update(tab.id, {active: true});
+          await browser.tabs.update(tab.id, { active: true });
           window.close();
         });
 
@@ -1034,7 +1047,7 @@ Logic.registerPanel(P_CONTAINER_EDIT, {
       return escaped`<input type="radio" value="${containerColor}" name="container-color" id="edit-container-panel-choose-color-${containerColor}" />
      <label for="edit-container-panel-choose-color-${containerColor}" class="usercontext-icon choose-color-icon" data-identity-icon="circle" data-identity-color="${containerColor}">`;
     };
-    const colors = ["blue", "turquoise", "green", "yellow", "orange", "red", "pink", "purple" ];
+    const colors = ["blue", "turquoise", "green", "yellow", "orange", "red", "pink", "purple"];
     const colorRadioFieldset = document.getElementById("edit-container-panel-choose-color");
     colors.forEach((containerColor) => {
       const templateInstance = document.createElement("div");
@@ -1109,7 +1122,7 @@ Logic.registerPanel(P_CONTAINER_DELETE, {
         await Logic.removeIdentity(Logic.userContextId(Logic.currentIdentity().cookieStoreId));
         await Logic.refreshIdentities();
         Logic.showPreviousPanel();
-      } catch(e) {
+      } catch (e) {
         Logic.showPanel(P_CONTAINERS_LIST);
       }
     });

From c3da5737229d12b7428ab44e3a0c0c54d11dc95c Mon Sep 17 00:00:00 2001
From: Oksana Melnik <oksana@dedact.nl>
Date: Fri, 25 Oct 2019 08:08:04 +0200
Subject: [PATCH 21/31] cleanup

---
 src/js/background/backgroundLogic.js |  6 +++---
 src/js/background/messageHandler.js  | 32 ++++++++++++++--------------
 2 files changed, 19 insertions(+), 19 deletions(-)

diff --git a/src/js/background/backgroundLogic.js b/src/js/background/backgroundLogic.js
index 8542d52..1e40a29 100644
--- a/src/js/background/backgroundLogic.js
+++ b/src/js/background/backgroundLogic.js
@@ -113,12 +113,12 @@ const backgroundLogic = {
     return list.concat(containerState.hiddenTabs);
   },
 
-  async unhideContainer(cookieStoreId, toHide) {
+  async unhideContainer(cookieStoreId, alreadyShowingUrl) {
     if (!this.unhideQueue.includes(cookieStoreId)) {
       this.unhideQueue.push(cookieStoreId);
       await this.showTabs({
         cookieStoreId,
-        toHide
+        alreadyShowingUrl
       });
       this.unhideQueue.splice(this.unhideQueue.indexOf(cookieStoreId), 1);
     }
@@ -311,7 +311,7 @@ const backgroundLogic = {
 
     for (let object of containerState.hiddenTabs) { // eslint-disable-line prefer-const
       // do not show already opened url
-      if (object.url !== options.toHide) {
+      if (object.url !== options.alreadyShowingUrl) {
         promises.push(this.openNewTab({
           userContextId: userContextId,
           url: object.url,
diff --git a/src/js/background/messageHandler.js b/src/js/background/messageHandler.js
index a1027ae..a2a5e11 100644
--- a/src/js/background/messageHandler.js
+++ b/src/js/background/messageHandler.js
@@ -153,25 +153,25 @@ const messageHandler = {
             !tab.url.startsWith("moz-extension")) {
           // increment the counter of container tabs opened
           this.incrementCountOfContainerTabsOpened();
-        }
 
-        this.tabUpdateHandler = (tabId, changeInfo) => {
-          if (tabId === tab.id && changeInfo.status === "complete") {
-            // get current tab's url to not open the same one from hidden tabs
-            browser.tabs.get(tabId).then(loadedTab => {
-              backgroundLogic.unhideContainer(tab.cookieStoreId, loadedTab.url);
-            }).catch((e) => {
-              throw e;
-            });
+          this.tabUpdateHandler = (tabId, changeInfo) => {
+            if (tabId === tab.id && changeInfo.status === "complete") {
+              // get current tab's url to not open the same one from hidden tabs
+              browser.tabs.get(tabId).then(loadedTab => {
+                backgroundLogic.unhideContainer(tab.cookieStoreId, loadedTab.url);
+              }).catch((e) => {
+                throw e;
+              });
 
-            browser.tabs.onUpdated.removeListener(this.tabUpdateHandler);
+              browser.tabs.onUpdated.removeListener(this.tabUpdateHandler);
+            }
+          };
+
+          // if it's a container tab wait for it to complete and
+          // unhide other tabs from this container
+          if (tab.cookieStoreId.startsWith("firefox-container")) {
+            browser.tabs.onUpdated.addListener(this.tabUpdateHandler);
           }
-        };
-
-        // if it's a container tab wait for it to complete and
-        // unhide other tabs from this container
-        if (tab.cookieStoreId.startsWith("firefox-container")) {
-          browser.tabs.onUpdated.addListener(this.tabUpdateHandler);
         }
       }
       setTimeout(() => {

From f653b5420f8c4edef1c74d32834c6a04c189c868 Mon Sep 17 00:00:00 2001
From: Kendall Werts <kmwerts@gmail.com>
Date: Wed, 30 Oct 2019 16:44:51 -0500
Subject: [PATCH 22/31] fixed #1564: cleanup updates requested for bookmark
 context menu

---
 src/js/background/assignManager.js  | 39 ++++++++++++++++++---------
 src/js/background/messageHandler.js |  2 +-
 src/js/options.js                   | 42 +++++++++--------------------
 src/options.html                    |  8 +++---
 test/browser.mock.js                |  2 +-
 5 files changed, 47 insertions(+), 46 deletions(-)

diff --git a/src/js/background/assignManager.js b/src/js/background/assignManager.js
index d5aca77..b48db75 100644
--- a/src/js/background/assignManager.js
+++ b/src/js/background/assignManager.js
@@ -240,19 +240,26 @@ const assignManager = {
         delete this.canceledRequests[options.tabId];
       }
     },{urls: ["<all_urls>"], types: ["main_frame"]});
-    this.getPermissions();
+    this.resetBookmarksMenuItem();
   },
 
-  async getPermissions() {
-    const {permissions} = await browser.permissions.getAll();
-    permissions.includes("bookmarks") ? this.makeBookmarksMenu() : browser.contextMenus.remove(this.OPEN_IN_CONTAINER);
-  },
-
-  makeBookmarksMenu() {
-    this.initBookmarksMenu();
-    browser.contextualIdentities.onCreated.addListener(this.contextualIdentityCreated);
-    browser.contextualIdentities.onUpdated.addListener(this.contextualIdentityUpdated);
-    browser.contextualIdentities.onRemoved.addListener(this.contextualIdentityRemoved);
+  async resetBookmarksMenuItem() {
+    const hasPermission = await browser.permissions.contains({permissions: ["bookmarks"]});
+    if (this.hadBookmark === hasPermission) {
+      return;
+    }
+    this.hadBookmark = hasPermission;
+    if (hasPermission) {
+      this.initBookmarksMenu();
+      browser.contextualIdentities.onCreated.addListener(this.contextualIdentityCreated);
+      browser.contextualIdentities.onUpdated.addListener(this.contextualIdentityUpdated);
+      browser.contextualIdentities.onRemoved.addListener(this.contextualIdentityRemoved);
+    } else {
+      this.removeBookmarksMenu();
+      browser.contextualIdentities.onCreated.removeListener(this.contextualIdentityCreated);
+      browser.contextualIdentities.onUpdated.removeListener(this.contextualIdentityUpdated);
+      browser.contextualIdentities.onRemoved.removeListener(this.contextualIdentityRemoved);
+    }
   },
 
   contextualIdentityCreated(changeInfo) {
@@ -324,7 +331,7 @@ const assignManager = {
         if(openInReaderMode) {
           try {
             const parsed = new URL(bookmark.url);
-            bookmark.url = parsed.searchParams.get("url") + parsed.hash; // can't believe const lets me do this ...
+            bookmark.url = parsed.searchParams.get("url") + parsed.hash;
           } catch (err) {
             return err.message;
           }
@@ -521,6 +528,14 @@ const assignManager = {
         icons: { "16": `img/usercontext.svg#${identity.icon}` }
       });
     }
+  },
+
+  async removeBookmarksMenu() {
+    browser.contextMenus.remove(this.OPEN_IN_CONTAINER);
+    const identities = await browser.contextualIdentities.query({});
+    for (const identity of identities) {
+      browser.contextMenus.remove(identity.cookieStoreId);
+    }
   }
 };
 
diff --git a/src/js/background/messageHandler.js b/src/js/background/messageHandler.js
index dcd8af6..fa95181 100644
--- a/src/js/background/messageHandler.js
+++ b/src/js/background/messageHandler.js
@@ -11,7 +11,7 @@ const messageHandler = {
 
       switch (m.method) {
       case "resetBookmarksContext":
-        response = assignManager.getPermissions();
+        response = assignManager.resetBookmarksMenuItem();
         break;
       case "deleteContainer":
         response = backgroundLogic.deleteContainer(m.message.userContextId);
diff --git a/src/js/options.js b/src/js/options.js
index 0eb1bb5..222a5b0 100644
--- a/src/js/options.js
+++ b/src/js/options.js
@@ -1,39 +1,23 @@
 
-function requestPermissions() {
+async function requestPermissions() {
   const checkbox = document.querySelector("#bookmarksPermissions");
   if (checkbox.checked) {
-    browser.permissions.request({permissions: ["bookmarks"]}).
-    then((response) => {
-      if (response) {
-        browser.runtime.sendMessage({ method: "resetBookmarksContext" });
-      } else {
-        checkbox.checked = false;
-      }
-    }).
-    catch((err) => {
-      return err.message;
-    });
+    const granted = await browser.permissions.request({permissions: ["bookmarks"]});
+    if (!granted) { 
+      checkbox.checked = false; 
+      return;
+    }
   } else {
-    browser.permissions.remove({permissions: ["bookmarks"]}).
-    then(() => {
-      browser.runtime.sendMessage({ method: "resetBookmarksContext" });
-    }).
-    catch((err) => {
-      return err.message;
-    });
+    await browser.permissions.remove({permissions: ["bookmarks"]});
   }
+  browser.runtime.sendMessage({ method: "resetBookmarksContext" });
 }
 
-function restoreOptions() {
-  browser.permissions.getAll()
-    .then((permissions) => {
-      if (permissions.permissions.includes("bookmarks")) {
-        document.querySelector("#bookmarksPermissions").checked = true;
-      }
-    }).
-    catch((err) => {
-      return err.message;
-    });
+async function restoreOptions() {
+  const hasPermission = await browser.permissions.contains({permissions: ["bookmarks"]});
+  if (hasPermission) {
+    document.querySelector("#bookmarksPermissions").checked = true;
+  }
 }
 
 
diff --git a/src/options.html b/src/options.html
index 84f7353..1dcdd9b 100644
--- a/src/options.html
+++ b/src/options.html
@@ -2,13 +2,15 @@
 
 <html>
   <head>
-    <meta charset="utf-8"/>
+    <meta charset="utf-8">
   </head>
 
   <body>
     <form>
-      <input type="checkbox" id="bookmarksPermissions"/>
-      <label>Enable Bookmark Menus</label>
+      <label>
+        <input type="checkbox" id="bookmarksPermissions">
+        Enable Bookmark Menus
+      </label>
       <p>This setting allows you to open a bookmark or folder of bookmarks in a container.</p>
     </form>
     <script src="js/options.js"></script>
diff --git a/test/browser.mock.js b/test/browser.mock.js
index fbff362..ad52c3d 100644
--- a/test/browser.mock.js
+++ b/test/browser.mock.js
@@ -93,7 +93,7 @@ module.exports = () => {
       getURL: sinon.stub().returns("moz-extension://multi-account-containers/confirm-page.html")
     },
     permissions: {
-      getAll: sinon.stub().returns({"permissions": ["bookmarks"]})
+      contains: sinon.stub().returns(true)
     }
   };
 

From 645fb6832c88453edf91c9941fc48f13cec019be Mon Sep 17 00:00:00 2001
From: dnahol <dalia.nahol@gmail.com>
Date: Sat, 2 Nov 2019 22:49:31 -0700
Subject: [PATCH 23/31] fix 'License' typo

---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index 92aec9c..e85c870 100644
--- a/README.md
+++ b/README.md
@@ -59,6 +59,6 @@ Finally, we also publish the release to GitHub for those followers.
 
 Facebook & Twitter icons CC-Attrib https://fairheadcreative.com.
 
-- [Licence](./LICENSE.txt)
+- [License](./LICENSE.txt)
 - [Contributing](./CONTRIBUTING.md)
 - [Code Of Conduct](./CODE_OF_CONDUCT.md)

From b0661f79aac0d47be35b20b951f24d6454c4b53f Mon Sep 17 00:00:00 2001
From: revealtheweb <aniudohr@gmail.com>
Date: Tue, 22 Oct 2019 11:55:59 +0100
Subject: [PATCH 24/31] fix odd edit arrow alignment

---
 src/css/popup.css | 17 ++++++++++-------
 src/popup.html    |  5 +++--
 2 files changed, 13 insertions(+), 9 deletions(-)

diff --git a/src/css/popup.css b/src/css/popup.css
index 5f45f10..d5f3295 100644
--- a/src/css/popup.css
+++ b/src/css/popup.css
@@ -754,21 +754,24 @@ span ~ .panel-header-text {
   background: var(--primary-action-color);
   block-size: 100%;
   color: #fff;
-  display: flex;
-  flex: 1;
+  display: inline-block;
   justify-content: center;
+  padding-block-start: 6px;
+  padding-inline-start: 30%;
 }
 
-.exit-edit-mode-link::before {
-  background: url('/img/container-arrow.svg') no-repeat;
+.edit-containers-panel-footer {
+  background: var(--primary-action-color);
+}
+
+.exit-edit-mode-link img {
   block-size: 16px;
-  content: "";
-  display: block;
+  display: inline;
   filter: grayscale(100%) brightness(5);
-  float: left;
   inline-size: 16px;
   margin-inline-end: 5px;
   transform: scaleX(-1);
+  vertical-align: bottom;
 }
 
 .delete-container-confirm {
diff --git a/src/popup.html b/src/popup.html
index 4cd8219..cf9878f 100644
--- a/src/popup.html
+++ b/src/popup.html
@@ -160,8 +160,9 @@
       </table>
     </div>
     <div class="panel-footer edit-containers-panel-footer">
-      <a href="#" id="exit-edit-mode-link" class="exit-edit-mode-link edit-containers-exit-text">Exit Edit Mode</a>
-    </div>
+      <a href="#" id="exit-edit-mode-link" class="exit-edit-mode-link edit-containers-exit-text">
+      <img src="/img/container-arrow.svg"/>Exit Edit Mode</a>
+  </div>
   </div>
 
 

From 426e81b88ba62e77488944529309299a789c3a06 Mon Sep 17 00:00:00 2001
From: stoically <stoically@protonmail.com>
Date: Wed, 18 Dec 2019 09:02:02 +0100
Subject: [PATCH 25/31] Fix eslint errors after bump to 6.6.0 (#1595)

* Bump eslint from 3.19.0 to 6.6.0

Bumps [eslint](https://github.com/eslint/eslint) from 3.19.0 to 6.6.0.
- [Release notes](https://github.com/eslint/eslint/releases)
- [Changelog](https://github.com/eslint/eslint/blob/master/CHANGELOG.md)
- [Commits](https://github.com/eslint/eslint/compare/v3.19.0...v6.6.0)

Signed-off-by: dependabot[bot] <support@github.com>

* Fix (and suppress) eslint errors
---
 package.json                        |  2 +-
 src/js/background/messageHandler.js |  1 +
 src/js/popup.js                     | 25 +++++++++++++------------
 3 files changed, 15 insertions(+), 13 deletions(-)

diff --git a/package.json b/package.json
index b72d3d5..eb31d53 100644
--- a/package.json
+++ b/package.json
@@ -12,7 +12,7 @@
     "addons-linter": "^1.3.2",
     "ajv": "^6.6.2",
     "chai": "^4.1.2",
-    "eslint": "^3.17.1",
+    "eslint": "^6.6.0",
     "eslint-plugin-no-unsanitized": "^2.0.0",
     "eslint-plugin-promise": "^3.4.0",
     "htmllint-cli": "0.0.7",
diff --git a/src/js/background/messageHandler.js b/src/js/background/messageHandler.js
index fa95181..9578e6e 100644
--- a/src/js/background/messageHandler.js
+++ b/src/js/background/messageHandler.js
@@ -82,6 +82,7 @@ const messageHandler = {
         if (!extensionInfo.permissions.includes("contextualIdentities")) {
           throw new Error("Missing contextualIdentities permission");
         }
+        // eslint-disable-next-line require-atomic-updates
         externalExtensionAllowed[sender.id] = true;
       }
       let response;
diff --git a/src/js/popup.js b/src/js/popup.js
index 433db3c..64dca45 100644
--- a/src/js/popup.js
+++ b/src/js/popup.js
@@ -259,6 +259,7 @@ const Logic = {
 
   getPanelSelector(panel) {
     if (this._onboardingVariation === "securityOnboarding" &&
+    // eslint-disable-next-line no-prototype-builtins
       panel.hasOwnProperty("securityPanelSelector")) {
       return panel.securityPanelSelector;
     } else {
@@ -570,21 +571,21 @@ Logic.registerPanel(P_CONTAINERS_LIST, {
         break;
       }
       case 39:
-        {
-          const showTabs = element.parentNode.querySelector(".show-tabs");
-          if(showTabs) {
-            showTabs.click();
-          }
-          break;
+      {
+        const showTabs = element.parentNode.querySelector(".show-tabs");
+        if(showTabs) {
+          showTabs.click();
         }
+        break;
+      }
       case 37:
-        {
-          const hideTabs = document.querySelector(".panel-back-arrow");
-          if(hideTabs) {
-            hideTabs.click();
-          }
-          break;
+      {
+        const hideTabs = document.querySelector(".panel-back-arrow");
+        if(hideTabs) {
+          hideTabs.click();
         }
+        break;
+      }
       default:
         if ((e.keyCode >= 49 && e.keyCode <= 57) &&
             Logic._currentPanel === "containersList") {

From 96ab4685e922e5120aac5245a5ae77bd94952aa0 Mon Sep 17 00:00:00 2001
From: stoically <stoically@protonmail.com>
Date: Wed, 18 Dec 2019 09:13:41 +0100
Subject: [PATCH 26/31] Bump test dependencies

---
 package.json | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/package.json b/package.json
index eb31d53..3bfcfba 100644
--- a/package.json
+++ b/package.json
@@ -11,17 +11,17 @@
   "devDependencies": {
     "addons-linter": "^1.3.2",
     "ajv": "^6.6.2",
-    "chai": "^4.1.2",
+    "chai": "^4.2.0",
     "eslint": "^6.6.0",
     "eslint-plugin-no-unsanitized": "^2.0.0",
     "eslint-plugin-promise": "^3.4.0",
     "htmllint-cli": "0.0.7",
     "jsdom": "^11.6.2",
     "json": "^9.0.6",
-    "mocha": "^5.0.0",
+    "mocha": "^6.2.2",
     "npm-run-all": "^4.0.0",
-    "sinon": "^4.4.0",
-    "sinon-chai": "^2.14.0",
+    "sinon": "^7.5.0",
+    "sinon-chai": "^3.3.0",
     "stylelint": "^7.9.0",
     "stylelint-config-standard": "^16.0.0",
     "stylelint-order": "^0.3.0",

From 77fd843b3de62903f56ffd72ce92421610bebfab Mon Sep 17 00:00:00 2001
From: stoically <stoically@protonmail.com>
Date: Wed, 18 Dec 2019 09:18:10 +0100
Subject: [PATCH 27/31] Replace manual mock/jsdom with webextensions-jsdom

---
 package.json         |   4 +-
 test/.eslintrc.js    |   4 ++
 test/browser.mock.js | 149 -------------------------------------------
 test/helper.js       |  63 +++++++++---------
 test/setup.js        | 110 +++++++++++++-------------------
 5 files changed, 81 insertions(+), 249 deletions(-)
 delete mode 100644 test/browser.mock.js

diff --git a/package.json b/package.json
index 3bfcfba..bf05207 100644
--- a/package.json
+++ b/package.json
@@ -16,7 +16,6 @@
     "eslint-plugin-no-unsanitized": "^2.0.0",
     "eslint-plugin-promise": "^3.4.0",
     "htmllint-cli": "0.0.7",
-    "jsdom": "^11.6.2",
     "json": "^9.0.6",
     "mocha": "^6.2.2",
     "npm-run-all": "^4.0.0",
@@ -25,7 +24,8 @@
     "stylelint": "^7.9.0",
     "stylelint-config-standard": "^16.0.0",
     "stylelint-order": "^0.3.0",
-    "web-ext": "^2.9.3"
+    "web-ext": "^2.9.3",
+    "webextensions-jsdom": "^1.1.0"
   },
   "homepage": "https://github.com/mozilla/multi-account-containers#readme",
   "license": "MPL-2.0",
diff --git a/test/.eslintrc.js b/test/.eslintrc.js
index 0b29fac..d32e265 100644
--- a/test/.eslintrc.js
+++ b/test/.eslintrc.js
@@ -3,10 +3,14 @@ module.exports = {
       "node": true,
       "mocha": true
     },
+    "parserOptions": {
+      "ecmaVersion": 2018
+    },
     globals: {
       "sinon": false,
       "expect": false,
       "nextTick": false,
+      "buildDom": false,
       "buildBackgroundDom": false,
       "background": false,
       "buildPopupDom": false,
diff --git a/test/browser.mock.js b/test/browser.mock.js
deleted file mode 100644
index ad52c3d..0000000
--- a/test/browser.mock.js
+++ /dev/null
@@ -1,149 +0,0 @@
-module.exports = () => {
-  const _storage = {};
-
-  // could maybe be replaced by https://github.com/acvetkov/sinon-chrome
-  const browserMock = {
-    _storage,
-    runtime: {
-      onMessage: {
-        addListener: sinon.stub(),
-      },
-      onMessageExternal: {
-        addListener: sinon.stub(),
-      },
-      sendMessage: sinon.stub().resolves(),
-    },
-    webRequest: {
-      onBeforeRequest: {
-        addListener: sinon.stub()
-      },
-      onCompleted: {
-        addListener: sinon.stub()
-      },
-      onErrorOccurred: {
-        addListener: sinon.stub()
-      }
-    },
-    windows: {
-      getCurrent: sinon.stub().resolves({}),
-      onFocusChanged: {
-        addListener: sinon.stub(),
-      }
-    },
-    tabs: {
-      onActivated: {
-        addListener: sinon.stub()
-      },
-      onCreated: {
-        addListener: sinon.stub()
-      },
-      onUpdated: {
-        addListener: sinon.stub()
-      },
-      sendMessage: sinon.stub(),
-      query: sinon.stub().resolves([{}]),
-      get: sinon.stub(),
-      create: sinon.stub().resolves({}),
-      remove: sinon.stub().resolves()
-    },
-    history: {
-      deleteUrl: sinon.stub()
-    },
-    storage: {
-      local: {
-        get: sinon.stub(),
-        set: sinon.stub()
-      }
-    },
-    contextualIdentities: {
-      create: sinon.stub(),
-      get: sinon.stub(),
-      query: sinon.stub().resolves([]),
-      onCreated: {
-        addListener: sinon.stub()
-      },
-      onUpdated: {
-        addListener: sinon.stub()
-      },
-      onRemoved: {
-        addListener: sinon.stub()
-      }
-    },
-    contextMenus: {
-      create: sinon.stub(),
-      remove: sinon.stub(),
-      onClicked: {
-        addListener: sinon.stub()
-      }
-    },
-    browserAction: {
-      setBadgeBackgroundColor: sinon.stub(),
-      setBadgeText: sinon.stub()
-    },
-    management: {
-      get: sinon.stub(),
-      onInstalled: {
-        addListener: sinon.stub()
-      },
-      onUninstalled: {
-        addListener: sinon.stub()
-      }
-    },
-    extension: {
-      getURL: sinon.stub().returns("moz-extension://multi-account-containers/confirm-page.html")
-    },
-    permissions: {
-      contains: sinon.stub().returns(true)
-    }
-  };
-
-  // inmemory local storage
-  browserMock.storage.local = {
-    get: sinon.spy(async key => {
-      if (!key) {
-        return _storage;
-      }
-      let result = {};
-      if (Array.isArray(key)) {
-        key.map(akey => {
-          if (typeof _storage[akey] !== "undefined") {
-            result[akey] = _storage[akey];
-          }
-        });
-      } else if (typeof key === "object") {
-        // TODO support nested objects
-        Object.keys(key).map(oKey => {
-          if (typeof _storage[oKey] !== "undefined") {
-            result[oKey] = _storage[oKey];
-          } else {
-            result[oKey] = key[oKey];
-          }
-        });
-      } else {
-        result = _storage[key];
-      }
-      return result;
-    }),
-    set: sinon.spy(async (key, value) => {
-      if (typeof key === "object") {
-        // TODO support nested objects
-        Object.keys(key).map(oKey => {
-          _storage[oKey] = key[oKey];
-        });
-      } else {
-        _storage[key] = value;
-      }
-    }),
-    remove: sinon.spy(async (key) => {
-      if (Array.isArray(key)) {
-        key.map(aKey => {
-          delete _storage[aKey];
-        });
-      } else {
-        delete _storage[key];
-      }
-    }),
-  };
-
-  return browserMock;
-};
diff --git a/test/helper.js b/test/helper.js
index 555ee7a..2704bac 100644
--- a/test/helper.js
+++ b/test/helper.js
@@ -1,47 +1,44 @@
 module.exports = {
   browser: {
-    async initializeWithTab(tab) {
-      await buildBackgroundDom({
-        beforeParse(window) {
-          window.browser.tabs.get.resolves(tab);
-          window.browser.tabs.query.resolves([tab]);
-          window.browser.contextualIdentities.get.resolves({
-            cookieStoreId: tab.cookieStoreId
-          });
-        }
-      });
-      await buildPopupDom({
-        beforeParse(window) {
-          window.browser.tabs.get.resolves(tab);
-          window.browser.tabs.query.resolves([tab]);
+    async initializeWithTab(details = {
+      cookieStoreId: "firefox-default"
+    }) {
+      let tab;
+      await buildDom({
+        background: {
+          async afterBuild(background) {
+            tab = await background.browser.tabs._create(details);
+          }
+        },
+        popup: {
+          jsdom: {
+            beforeParse(window) {
+              window.browser.storage.local.set({
+                "browserActionBadgesClicked": [],
+                "onboarding-stage": 5,
+                "achievements": []
+              });
+              window.browser.storage.local.set.resetHistory();
+            }
+          }
         }
       });
+
+      return tab;
     },
 
     async openNewTab(tab, options = {}) {
-      if (options.resetHistory) {
-        background.browser.tabs.create.resetHistory();
-        background.browser.tabs.remove.resetHistory();
-      }
-      background.browser.tabs.get.resolves(tab);
-      background.browser.tabs.onCreated.addListener.yield(tab);
-      const [promise] = background.browser.webRequest.onBeforeRequest.addListener.yield({
-        frameId: 0,
-        tabId: tab.id,
-        url: tab.url,
-        requestId: options.requestId
-      });
-
-      return promise;
+      return background.browser.tabs._create(tab, options);
     }
   },
 
   popup: {
     async clickElementById(id) {
-      const clickEvent = popup.document.createEvent("HTMLEvents");
-      clickEvent.initEvent("click");
-      popup.document.getElementById(id).dispatchEvent(clickEvent);
-      await nextTick();
+      await popup.helper.clickElementById(id);
+    },
+
+    async clickLastMatchingElementByQuerySelector(querySelector) {
+      await popup.helper.clickElementByQuerySelectorAll(querySelector, "last");
     }
-  },
+  }
 };
diff --git a/test/setup.js b/test/setup.js
index b6d563d..0cc45ee 100644
--- a/test/setup.js
+++ b/test/setup.js
@@ -2,7 +2,6 @@ if (!process.listenerCount("unhandledRejection")) {
   // eslint-disable-next-line no-console
   process.on("unhandledRejection", r => console.log(r));
 }
-const jsdom = require("jsdom");
 const path = require("path");
 const chai = require("chai");
 const sinonChai = require("sinon-chai");
@@ -19,83 +18,64 @@ global.nextTick = () => {
 };
 
 global.helper = require("./helper");
-const browserMock = require("./browser.mock");
-const srcBasePath = path.resolve(path.join(__dirname, "..", "src"));
-const srcJsBackgroundPath = path.join(srcBasePath, "js", "background");
-global.buildBackgroundDom = async (options = {}) => {
-  const dom = await jsdom.JSDOM.fromFile(path.join(srcJsBackgroundPath, "index.html"), {
-    runScripts: "dangerously",
-    resources: "usable",
-    virtualConsole: (new jsdom.VirtualConsole).sendTo(console),
-    beforeParse(window) {
-      window.browser = browserMock();
-      window.fetch = sinon.stub().resolves({
-        json: sinon.stub().resolves({})
-      });
 
-      if (options.beforeParse) {
-        options.beforeParse(window);
+const webExtensionsJSDOM = require("webextensions-jsdom");
+const manifestPath = path.resolve(path.join(__dirname, "../src/manifest.json"));
+
+global.buildDom = async ({background = {}, popup = {}}) => {
+  background = {
+    ...background,
+    jsdom: {
+      ...background.jsom,
+      beforeParse(window) {
+        window.browser.permissions.getAll.resolves({permissions: ["bookmarks"]});
       }
     }
-  });
-  await new Promise(resolve => {
-    dom.window.document.addEventListener("DOMContentLoaded", resolve);
-  });
-  await nextTick();
-
-  global.background = {
-    dom,
-    browser: dom.window.browser
   };
-};
 
-global.buildPopupDom = async (options = {}) => {
-  const dom = await jsdom.JSDOM.fromFile(path.join(srcBasePath, "popup.html"), {
-    runScripts: "dangerously",
-    resources: "usable",
-    virtualConsole: (new jsdom.VirtualConsole).sendTo(console),
-    beforeParse(window) {
-      window.browser = browserMock();
-      window.browser.storage.local.set("browserActionBadgesClicked", []);
-      window.browser.storage.local.set("onboarding-stage", 5);
-      window.browser.storage.local.set("achievements", []);
-      window.browser.storage.local.set.resetHistory();
-      window.fetch = sinon.stub().resolves({
-        json: sinon.stub().resolves({})
-      });
-
-      if (options.beforeParse) {
-        options.beforeParse(window);
-      }
+  popup = {
+    ...popup,
+    jsdom: {
+      ...popup.jsdom,
+      pretendToBeVisual: true
     }
-  });
-  await new Promise(resolve => {
-    dom.window.document.addEventListener("DOMContentLoaded", resolve);
-  });
-  await nextTick();
-  dom.window.browser.runtime.sendMessage.resetHistory();
-
-  if (global.background) {
-    dom.window.browser.runtime.sendMessage = sinon.spy(function() {
-      global.background.browser.runtime.onMessage.addListener.yield(...arguments);
-    });
-  }
-
-  global.popup = {
-    dom,
-    document: dom.window.document,
-    browser: dom.window.browser
   };
+  
+  const webExtension = await webExtensionsJSDOM.fromManifest(manifestPath, {
+    apiFake: true,
+    wiring: true,
+    sinon: global.sinon,
+    background,
+    popup
+  });
+
+  // eslint-disable-next-line require-atomic-updates
+  global.background = webExtension.background;
+  // eslint-disable-next-line require-atomic-updates
+  global.popup = webExtension.popup;
 };
 
+global.buildBackgroundDom = async background => {
+  await global.buildDom({
+    background,
+    popup: false
+  });
+};
+
+global.buildPopupDom = async popup => {
+  await global.buildDom({
+    popup,
+    background: false
+  });
+};
+
+
 global.afterEach(() => {
   if (global.background) {
-    global.background.dom.window.close();
-    delete global.background;
+    global.background.destroy();
   }
 
   if (global.popup) {
-    global.popup.dom.window.close();
-    delete global.popup;
+    global.popup.destroy();
   }
 });

From 5eb79949e9876a45aba96b8103ed43ec0c996371 Mon Sep 17 00:00:00 2001
From: stoically <stoically@protonmail.com>
Date: Wed, 18 Dec 2019 09:19:01 +0100
Subject: [PATCH 28/31] Adapt existing tests to use webextensions-jsdom

---
 test/features/assignment.test.js             |  49 ++--
 test/features/external-webextensions.test.js |  48 ++--
 test/issues/940.test.js                      | 236 +++++++++----------
 3 files changed, 153 insertions(+), 180 deletions(-)

diff --git a/test/features/assignment.test.js b/test/features/assignment.test.js
index 632c60b..43bb981 100644
--- a/test/features/assignment.test.js
+++ b/test/features/assignment.test.js
@@ -1,12 +1,12 @@
 describe("Assignment Feature", () => {
-  const activeTab = {
-    id: 1,
-    cookieStoreId: "firefox-container-1",
-    url: "http://example.com",
-    index: 0
-  };
+  const url = "http://example.com";
+
+  let activeTab;
   beforeEach(async () => {
-    await helper.browser.initializeWithTab(activeTab);
+    activeTab = await helper.browser.initializeWithTab({
+      cookieStoreId: "firefox-container-1",
+      url
+    });
   });
 
   describe("click the 'Always open in' checkbox in the popup", () => {
@@ -16,23 +16,24 @@ describe("Assignment Feature", () => {
     });
 
     describe("open new Tab with the assigned URL in the default container", () => {
-      const newTab = {
-        id: 2,
-        cookieStoreId: "firefox-default",
-        url: activeTab.url,
-        index: 1,
-        active: true
-      };
+      let newTab;
       beforeEach(async () => {
         // new Tab opening activeTab.url in default container
-        await helper.browser.openNewTab(newTab);
+        newTab = await helper.browser.openNewTab({
+          cookieStoreId: "firefox-default",
+          url
+        }, {
+          options: {
+            webRequestError: true // because request is canceled due to reopening
+          }
+        });
       });
 
       it("should open the confirm page", async () => {
         // should have created a new tab with the confirm page
-        background.browser.tabs.create.should.have.been.calledWith({
-          url: "moz-extension://multi-account-containers/confirm-page.html?" +
-               `url=${encodeURIComponent(activeTab.url)}` +
+        background.browser.tabs.create.should.have.been.calledWithMatch({
+          url: "moz-extension://fake/confirm-page.html?" +
+               `url=${encodeURIComponent(url)}` +
                `&cookieStoreId=${activeTab.cookieStoreId}`,
           cookieStoreId: undefined,
           openerTabId: null,
@@ -53,16 +54,12 @@ describe("Assignment Feature", () => {
       });
 
       describe("open new Tab with the no longer assigned URL in the default container", () => {
-        const newTab = {
-          id: 3,
-          cookieStoreId: "firefox-default",
-          url: activeTab.url,
-          index: 3,
-          active: true
-        };
         beforeEach(async () => {
           // new Tab opening activeTab.url in default container
-          await helper.browser.openNewTab(newTab);
+          await helper.browser.openNewTab({
+            cookieStoreId: "firefox-default",
+            url
+          });
         });
 
         it("should not open the confirm page", async () => {
diff --git a/test/features/external-webextensions.test.js b/test/features/external-webextensions.test.js
index fe32e4d..30e6b49 100644
--- a/test/features/external-webextensions.test.js
+++ b/test/features/external-webextensions.test.js
@@ -1,12 +1,11 @@
 describe("External Webextensions", () => {
-  const activeTab = {
-    id: 1,
-    cookieStoreId: "firefox-container-1",
-    url: "http://example.com",
-    index: 0
-  };
+  const url = "http://example.com";
+
   beforeEach(async () => {
-    await helper.browser.initializeWithTab(activeTab);
+    await helper.browser.initializeWithTab({
+      cookieStoreId: "firefox-container-1",
+      url
+    });
     await helper.popup.clickElementById("container-page-assigned");
   });
 
@@ -18,25 +17,18 @@ describe("External Webextensions", () => {
 
       const message = {
         method: "getAssignment",
-        url: "http://example.com"
+        url
       };
       const sender = {
         id: "external-webextension"
       };
 
-      // currently not possible to get the return value of yielding with sinon
-      // so we expect that if no error is thrown and the storage was called, everything is ok
-      // maybe i get around to provide a PR https://github.com/sinonjs/sinon/issues/903
-      //
-      // the alternative would be to expose the actual messageHandler and call it directly
-      // but personally i think that goes against the black-box-ish nature of these feature tests
-      const rejectionStub = sinon.stub();
-      process.on("unhandledRejection", rejectionStub);
-      background.browser.runtime.onMessageExternal.addListener.yield(message, sender);
-      await nextTick();
-      process.removeListener("unhandledRejection", rejectionStub);
-      rejectionStub.should.not.have.been.called;
-      background.browser.storage.local.get.should.have.been.called;
+      const [promise] = background.browser.runtime.onMessageExternal.addListener.yield(message, sender);
+      const answer = await promise;
+      expect(answer).to.deep.equal({
+        userContextId: "1",
+        neverAsk: false
+      });
     });
   });
 
@@ -48,20 +40,16 @@ describe("External Webextensions", () => {
 
       const message = {
         method: "getAssignment",
-        url: "http://example.com"
+        url
       };
       const sender = {
         id: "external-webextension"
       };
 
-      const rejectionStub = sinon.spy();
-      process.on("unhandledRejection", rejectionStub);
-      background.browser.runtime.onMessageExternal.addListener.yield(message, sender);
-      await nextTick();
-      process.removeListener("unhandledRejection", rejectionStub);
-      rejectionStub.should.have.been.calledWith(sinon.match({
-        message: "Missing contextualIdentities permission"
-      }));
+      const [promise] = background.browser.runtime.onMessageExternal.addListener.yield(message, sender);
+      return promise.catch(error => {
+        expect(error.message).to.equal("Missing contextualIdentities permission");
+      });
     });
   });
 });
diff --git a/test/issues/940.test.js b/test/issues/940.test.js
index b889035..4a7eb0e 100644
--- a/test/issues/940.test.js
+++ b/test/issues/940.test.js
@@ -1,112 +1,82 @@
 describe("#940", () => {
   describe("when other onBeforeRequestHandlers are faster and redirect with the same requestId", () => {
     it("should not open two confirm pages", async () => {
-      // init
-      const activeTab = {
-        id: 1,
+      await helper.browser.initializeWithTab({
         cookieStoreId: "firefox-container-1",
-        url: "http://example.com",
-        index: 0
-      };
-      await helper.browser.initializeWithTab(activeTab);
-      // assign the activeTab.url
+        url: "http://example.com"
+      });
       await helper.popup.clickElementById("container-page-assigned");
 
-      // start request and don't await the requests at all
-      // so the second request below is actually comparable to an actual redirect that also fires immediately
-      const newTab = {
-        id: 2,
-        cookieStoreId: "firefox-default",
-        url: activeTab.url,
-        index: 1,
-        active: true
-      };
-      helper.browser.openNewTab(newTab, {
-        requestId: 1
+      const responses = {};
+      await helper.browser.openNewTab({
+        url: "http://example.com"
+      }, {
+        options: {
+          webRequestRedirects: ["https://example.com"],
+          webRequestError: true,
+          instantRedirects: true
+        },
+        responses
       });
 
-      // other addon sees the same request
-      // and redirects to the https version of activeTab.url
-      // since it's a redirect the request has the same requestId
-      background.browser.webRequest.onBeforeRequest.addListener.yield({
-        frameId: 0,
-        tabId: newTab.id,
-        url: "https://example.com",
-        requestId: 1
+      const result = await responses.webRequest.onBeforeRequest[1];
+      expect(result).to.deep.equal({
+        cancel: true
       });
-      await nextTick();
-
       background.browser.tabs.create.should.have.been.calledOnce;
     });
   });
 
   describe("when redirects change requestId midflight", () => {
-    let promiseResults;
+    let newTab;
+    const newTabResponses = {};
+    const redirectedRequest = async (options = {}) => {
+      global.clock = sinon.useFakeTimers();
+      newTab = await helper.browser.openNewTab({
+        url: "http://youtube.com"
+      }, {
+        options: Object.assign({
+          webRequestRedirects: [
+            "https://youtube.com",
+            "https://www.youtube.com",
+            {
+              url: "https://www.youtube.com",
+              webRequest: {
+                requestId: 2
+              }
+            }
+          ],
+          webRequestError: true,
+          instantRedirects: true
+        }, options),
+        responses: newTabResponses
+      });
+    };
+
     beforeEach(async () => {
-      // init
-      const activeTab = {
-        id: 1,
+      await helper.browser.initializeWithTab({
         cookieStoreId: "firefox-container-1",
-        url: "https://www.youtube.com",
-        index: 0
-      };
-      await helper.browser.initializeWithTab(activeTab);
-      // assign the activeTab.url
+        url: "https://www.youtube.com"
+      });
       await helper.popup.clickElementById("container-page-assigned");
-
-      // http://youtube.com
-      const newTab = {
-        id: 2,
-        cookieStoreId: "firefox-default",
-        url: "http://youtube.com",
-        index: 1,
-        active: true
-      };
-      const promise1 = helper.browser.openNewTab(newTab, {
-        requestId: 1
-      });
-
-      // https://youtube.com
-      const [promise2] = background.browser.webRequest.onBeforeRequest.addListener.yield({
-        frameId: 0,
-        tabId: newTab.id,
-        url: "https://youtube.com",
-        requestId: 1
-      });
-
-      // https://www.youtube.com
-      const [promise3] = background.browser.webRequest.onBeforeRequest.addListener.yield({
-        frameId: 0,
-        tabId: newTab.id,
-        url: "https://www.youtube.com",
-        requestId: 1
-      });
-
-      // https://www.youtube.com
-      const [promise4] = background.browser.webRequest.onBeforeRequest.addListener.yield({
-        frameId: 0,
-        tabId: newTab.id,
-        url: "https://www.youtube.com",
-        requestId: 2
-      });
-
-      promiseResults = await Promise.all([promise1, promise2, promise3, promise4]);
     });
 
     it("should not open two confirm pages", async () => {
+      await redirectedRequest();
+
       // http://youtube.com is not assigned, no cancel, no reopening
-      expect(promiseResults[0]).to.deep.equal({});
+      expect(await newTabResponses.webRequest.onBeforeRequest[0]).to.deep.equal({});
 
       // https://youtube.com is not assigned, no cancel, no reopening
-      expect(promiseResults[1]).to.deep.equal({});
+      expect(await newTabResponses.webRequest.onBeforeRequest[1]).to.deep.equal({});
 
       // https://www.youtube.com is assigned, this triggers reopening, cancel
-      expect(promiseResults[2]).to.deep.equal({
+      expect(await newTabResponses.webRequest.onBeforeRequest[2]).to.deep.equal({
         cancel: true
       });
 
       // https://www.youtube.com is assigned, this was a redirect, cancel early, no reopening
-      expect(promiseResults[3]).to.deep.equal({
+      expect(await newTabResponses.webRequest.onBeforeRequest[3]).to.deep.equal({
         cancel: true
       });
 
@@ -114,67 +84,85 @@ describe("#940", () => {
     });
 
     it("should uncancel after webRequest.onCompleted", async () => {
-      const [promise1] = background.browser.webRequest.onCompleted.addListener.yield({
-        tabId: 2
+      await redirectedRequest();
+      // remove onCompleted listeners because in the real world this request would never complete
+      // and thus might trigger unexpected behavior because the tab gets removed when reopening
+      background.browser.webRequest.onCompleted.addListener = sinon.stub();
+      background.browser.tabs.create.resetHistory();
+      // we create a tab with the same id and use the same request id to see if uncanceled
+      await helper.browser.openNewTab({
+        id: newTab.id,
+        url: "https://www.youtube.com"
+      }, {
+        options: {
+          webRequest: {
+            requestId: newTabResponses.webRequest.request.requestId
+          }
+        }
       });
-      await promise1;
 
-      const [promise2] = background.browser.webRequest.onBeforeRequest.addListener.yield({
-        frameId: 0,
-        tabId: 2,
-        url: "https://www.youtube.com",
-        requestId: 123
-      });
-      await promise2;
-
-      background.browser.tabs.create.should.have.been.calledTwice;
+      background.browser.tabs.create.should.have.been.calledOnce;
     });
 
     it("should uncancel after webRequest.onErrorOccurred", async () => {
-      const [promise1] = background.browser.webRequest.onErrorOccurred.addListener.yield({
-        tabId: 2
+      await redirectedRequest();
+      background.browser.tabs.create.resetHistory();
+      // we create a tab with the same id and use the same request id to see if uncanceled
+      await helper.browser.openNewTab({
+        id: newTab.id,
+        url: "https://www.youtube.com"
+      }, {
+        options: {
+          webRequest: {
+            requestId: newTabResponses.webRequest.request.requestId
+          },
+          webRequestError: true
+        }
       });
-      await promise1;
 
-      // request to assigned url in same tab
-      const [promise2] = background.browser.webRequest.onBeforeRequest.addListener.yield({
-        frameId: 0,
-        tabId: 2,
-        url: "https://www.youtube.com",
-        requestId: 123
-      });
-      await promise2;
-
-      background.browser.tabs.create.should.have.been.calledTwice;
+      background.browser.tabs.create.should.have.been.calledOnce;
     });
 
     it("should uncancel after 2 seconds", async () => {
-      await new Promise(resolve => setTimeout(resolve, 2000));
-      // request to assigned url in same tab
-      const [promise2] = background.browser.webRequest.onBeforeRequest.addListener.yield({
-        frameId: 0,
-        tabId: 2,
-        url: "https://www.youtube.com",
-        requestId: 123
+      await redirectedRequest({
+        webRequestDontYield: ["onCompleted", "onErrorOccurred"]
       });
-      await promise2;
+      global.clock.tick(2000);
 
-      background.browser.tabs.create.should.have.been.calledTwice;
-    }).timeout(2002);
+      background.browser.tabs.create.resetHistory();
+      // we create a tab with the same id and use the same request id to see if uncanceled
+      await helper.browser.openNewTab({
+        id: newTab.id,
+        url: "https://www.youtube.com"
+      }, {
+        options: {
+          webRequest: {
+            requestId: newTabResponses.webRequest.request.requestId
+          },
+          webRequestError: true
+        }
+      });
+
+      background.browser.tabs.create.should.have.been.calledOnce;
+    });
 
     it("should not influence the canceled url in other tabs", async () => {
-      const newTab = {
-        id: 123,
+      await redirectedRequest();
+      background.browser.tabs.create.resetHistory();
+      await helper.browser.openNewTab({
         cookieStoreId: "firefox-default",
-        url: "https://www.youtube.com",
-        index: 10,
-        active: true
-      };
-      await helper.browser.openNewTab(newTab, {
-        requestId: 321
+        url: "https://www.youtube.com"
+      }, {
+        options: {
+          webRequestError: true
+        }
       });
 
-      background.browser.tabs.create.should.have.been.calledTwice;
+      background.browser.tabs.create.should.have.been.calledOnce;
+    });
+
+    afterEach(() => {
+      global.clock.restore();
     });
   });
 });

From 703a7cd3c20c2c8be4ef744471a1a3eef8fa2d6b Mon Sep 17 00:00:00 2001
From: stoically <stoically@protonmail.com>
Date: Wed, 18 Dec 2019 09:24:05 +0100
Subject: [PATCH 29/31] Add test coverage with nyc

---
 .eslintignore | 1 +
 .gitignore    | 4 ++++
 package.json  | 6 ++++--
 3 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/.eslintignore b/.eslintignore
index 9f1953c..3a5b5a0 100644
--- a/.eslintignore
+++ b/.eslintignore
@@ -1 +1,2 @@
 lib/testpilot/*.js
+coverage
\ No newline at end of file
diff --git a/.gitignore b/.gitignore
index c745683..ff6bfab 100644
--- a/.gitignore
+++ b/.gitignore
@@ -12,3 +12,7 @@ src/web-ext-artifacts/*
 
 # JetBrains IDE files
 .idea
+
+# IstanbulJS
+.nyc_output
+coverage
\ No newline at end of file
diff --git a/package.json b/package.json
index bf05207..753f292 100644
--- a/package.json
+++ b/package.json
@@ -19,6 +19,7 @@
     "json": "^9.0.6",
     "mocha": "^6.2.2",
     "npm-run-all": "^4.0.0",
+    "nyc": "^14.1.1",
     "sinon": "^7.5.0",
     "sinon-chai": "^3.3.0",
     "stylelint": "^7.9.0",
@@ -42,7 +43,8 @@
     "lint:html": "htmllint *.html",
     "lint:js": "eslint .",
     "package": "rm -rf src/web-ext-artifacts && npm run build && mv src/web-ext-artifacts/firefox_multi-account_containers-*.zip addon.xpi",
-    "test": "npm run lint && mocha ./test/setup.js test/**/*.test.js",
-    "test-watch": "mocha ./test/setup.js test/**/*.test.js --watch"
+    "test": "npm run lint && npm run coverage",
+    "test-watch": "mocha ./test/setup.js test/**/*.test.js --watch",
+    "coverage": "nyc --reporter=html --reporter=text mocha ./test/setup.js test/**/*.test.js --timeout 60000"
   }
 }

From e37440720f91eec22f099e2c9f8e95ed6ea5046d Mon Sep 17 00:00:00 2001
From: stoically <stoically@protonmail.com>
Date: Wed, 18 Dec 2019 09:24:17 +0100
Subject: [PATCH 30/31] Add container feature test

---
 test/features/containers.test.js | 28 ++++++++++++++++++++++++++++
 1 file changed, 28 insertions(+)
 create mode 100644 test/features/containers.test.js

diff --git a/test/features/containers.test.js b/test/features/containers.test.js
new file mode 100644
index 0000000..ac5bccd
--- /dev/null
+++ b/test/features/containers.test.js
@@ -0,0 +1,28 @@
+describe("Containers Management", () => {
+  beforeEach(async () => {
+    await helper.browser.initializeWithTab();
+  });
+
+  describe("creating a new container", () => {
+    beforeEach(async () => {
+      await helper.popup.clickElementById("container-add-link");
+      await helper.popup.clickElementById("edit-container-ok-link");
+    });
+
+    it("should create it in the browser as well", () => {
+      background.browser.contextualIdentities.create.should.have.been.calledOnce;
+    });
+
+    describe("removing it afterwards", () => {
+      beforeEach(async () => {
+        await helper.popup.clickElementById("edit-containers-link");
+        await helper.popup.clickLastMatchingElementByQuerySelector(".delete-container-icon");
+        await helper.popup.clickElementById("delete-container-ok-link");
+      });
+
+      it("should remove it in the browser as well", () => {
+        background.browser.contextualIdentities.remove.should.have.been.calledOnce;
+      });
+    });
+  });
+});
\ No newline at end of file

From dc9e8f6399ffc1d434254a56ab64cb20a77e6cd4 Mon Sep 17 00:00:00 2001
From: stoically <stoically@protonmail.com>
Date: Wed, 18 Dec 2019 09:24:52 +0100
Subject: [PATCH 31/31] Add test for unresolved issue

See: https://github.com/mozilla/multi-account-containers/issues/1168#issuecomment-378394091
---
 test/issues/1168.test.js | 34 ++++++++++++++++++++++++++++++++++
 1 file changed, 34 insertions(+)
 create mode 100644 test/issues/1168.test.js

diff --git a/test/issues/1168.test.js b/test/issues/1168.test.js
new file mode 100644
index 0000000..50f463a
--- /dev/null
+++ b/test/issues/1168.test.js
@@ -0,0 +1,34 @@
+describe("#1168", () => {
+  describe("when navigation happens too slow after opening new tab to a page which then redirects", () => {
+    let clock, tab;
+
+    beforeEach(async () => {
+      await helper.browser.initializeWithTab({
+        cookieStoreId: "firefox-container-1",
+        url: "https://bugzilla.mozilla.org"
+      });
+      await helper.popup.clickElementById("container-page-assigned");
+
+      clock = sinon.useFakeTimers();
+      tab = await helper.browser.openNewTab({});
+
+      clock.tick(2000);
+
+      await background.browser.tabs._navigate(tab.id, "https://duckduckgo.com/?q=%21bugzilla+thing&t=ffab");
+      await background.browser.tabs._redirect(tab.id, [
+        "https://bugzilla.mozilla.org"
+      ]);
+    });
+
+    // Not solved yet
+    // See: https://github.com/mozilla/multi-account-containers/issues/1168#issuecomment-378394091
+    it.skip("should remove the old tab", async () => {
+      expect(background.browser.tabs.create).to.have.been.calledOnce;
+      expect(background.browser.tabs.remove).to.have.been.calledWith(tab.id);
+    });
+
+    afterEach(() => {
+      clock.restore();
+    });
+  });
+});
\ No newline at end of file