Merge branch 'master' into include-root-collection-in-collections-list-endpoint

frontend/src/metabase/components/CollectionLanding.jsx

@@ -80,7 +80,7 @@ const QuestionEmptyState = () => (
     <Box>
       <Icon name="beaker" size={32} />
     </Box>
-    <h3>{t`Quesitons are a saved look at your data.`}</h3>
+    <h3>{t`Questions are a saved look at your data.`}</h3>
   </EmptyStateWrapper>
 );
 

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) {