Change forBothAdminsAndNormalUsers

frontend/test/__support__/integrated_tests.js

@@ -98,11 +98,15 @@ export function useSharedNormalLogin() {
     id: process.env.TEST_FIXTURE_SHARED_NORMAL_LOGIN_SESSION_ID,
   };
 }
-export const forBothAdminsAndNormalUsers = async tests => {
-  useSharedAdminLogin();
-  await tests();
-  useSharedNormalLogin();
-  await tests();
+export const forBothAdminsAndNormalUsers = tests => {
+  describe("for admins", () => {
+    beforeEach(useSharedAdminLogin);
+    tests();
+  });
+  describe("for normal users", () => {
+    beforeEach(useSharedNormalLogin);
+    tests();
+  });
 };
 
 export function logout() {

frontend/test/alert/alert.integ.spec.js

@@ -188,8 +188,8 @@ describe("Alerts", () => {
   });
 
   describe("missing email/slack credentials", () => {
-    it("should prompt you to add email/slack credentials", async () => {
-      await forBothAdminsAndNormalUsers(async () => {
+    forBothAdminsAndNormalUsers(() => {
+      it("should prompt you to add email/slack credentials", async () => {
         MetabaseCookies.getHasSeenAlertSplash = () => false;
 
         const store = await createTestStore();

frontend/test/query_builder/new_question.integ.spec.js

@@ -86,8 +86,8 @@ describe("new question flow", async () => {
       expect(store.getPath()).toBe("/question/new");
     });
 
-    it("renders all options for both admins and normal users if metrics & segments exist", async () => {
-      await forBothAdminsAndNormalUsers(async () => {
+    forBothAdminsAndNormalUsers(() => {
+      it("renders all options for both admins and normal users if metrics & segments exist", async () => {
         const store = await createTestStore();
 
         store.pushPath(Urls.newQuestion());
@@ -181,8 +181,8 @@ describe("new question flow", async () => {
       );
     });
 
-    it("shows an empty state if there are no databases", async () => {
-      await forBothAdminsAndNormalUsers(async () => {
+    forBothAdminsAndNormalUsers(() => {
+      it("shows an empty state if there are no databases", async () => {
         await withApiMocks([[Databases.api, "list", () => []]], async () => {
           const store = await createTestStore();