Merge branch 'master' into a11y

hihus · Aug 23, 2020 · dd667e5 · dd667e5
2 parents 5cafc7b + 6f013de
commit dd667e5
Show file tree

Hide file tree

Showing 3 changed files with 390 additions and 30 deletions.
diff --git a/helpers/strategies/ExtensionStrategy.js b/helpers/strategies/ExtensionStrategy.js
@@ -32,7 +32,7 @@ const extensionWithProxy = async (req, { state }) => {
   }
 
   if (parsedData.isBinary) {
-    parsedData.data = decodeB64StringToArrayBuffer(data.data)
+    parsedData.data = decodeB64StringToArrayBuffer(parsedData.data)
   }
 
   return parsedData

diff --git a/helpers/strategies/__tests__/AxiosStrategy-Proxy.spec.js b/helpers/strategies/__tests__/AxiosStrategy-Proxy.spec.js
@@ -152,33 +152,4 @@ describe("axiosStrategy", () => {
       await expect(axiosStrategy({}, store)).rejects.toBe("errr")
     })
   })
-
-  describe("No-Proxy Requests", () => {
-    const store = {
-      state: {
-        postwoman: {
-          settings: {
-            PROXY_ENABLED: false,
-            PROXY_URL: "test",
-          },
-        },
-      },
-    }
-
-    test("sends request to the actual sender if proxy disabled", async () => {
-      // jest.mock("axios")
-      // await axiosStrategy({ url: "test" }, store)
-      // expect(axiosFunc).toBeCalledWith(expect.objectContaining({
-      //     url: "test"
-      // }))
-    })
-
-    test("asks axios to return data as arraybuffer", () => {})
-
-    test("resolves successful requests", () => {})
-
-    test("rejects cancel errors with text 'cancellation'", () => {})
-
-    test("rejects non-cancellation errors as-is", () => {})
-  })
 })