From d3b7843270c808576ec683051a9db266bb430300 Mon Sep 17 00:00:00 2001
From: Tom Robinson <tlrobinson@gmail.com>
Date: Wed, 18 Jul 2018 12:09:25 -0700
Subject: [PATCH] Potential fix for _location CI failures
---
frontend/test/__support__/integrated_tests.js | 18 ++++++++++++++++++
1 file changed, 18 insertions(+)
diff --git a/frontend/test/__support__/integrated_tests.js b/frontend/test/__support__/integrated_tests.js
index b242270a8bf..e4eec58f8b6 100644
--- a/frontend/test/__support__/integrated_tests.js
+++ b/frontend/test/__support__/integrated_tests.js
@@ -668,6 +668,14 @@ api._makeRequest = async (method, url, headers, requestBody, data, options) => {
? { status: 0, responseText: "" }
: await fetch(api.basename + url, fetchOptions);
+ if (!window.document) {
+ console.warn(
+ "API request completed after test ended. Ignoring result.",
+ url,
+ );
+ return;
+ }
+
if (isCancelled) {
throw { status: 0, data: "", isCancelled: true };
}
@@ -710,6 +718,16 @@ api._makeRequest = async (method, url, headers, requestBody, data, options) => {
throw error;
}
+ } catch (e) {
+ if (!window.document) {
+ console.warn(
+ "API request failed after test ended. Ignoring result.",
+ url,
+ e,
+ );
+ return;
+ }
+ throw e;
} finally {
pendingRequests--;
if (pendingRequests === 0 && pendingRequestsDeferred) {
--
GitLab