Merge branch 'tasks-cleanup-and-debug-page' of github.com:metabase/metabase...

Merge branch 'tasks-cleanup-and-debug-page' of github.com:metabase/metabase into tasks-cleanup-and-debug-page

frontend/src/metabase/admin/routes.jsx

@@ -41,7 +41,7 @@ const getRoutes = (store, IsAdmin) => (
     title={t`Admin`}
     component={withBackground("bg-white")(IsAdmin)}
   >
-    <IndexRedirect to="/admin/settings" />
+    <IndexRedirect to="settings" />
 
     <Route path="databases" title={t`Databases`}>
       <IndexRoute component={DatabaseListApp} />
@@ -103,7 +103,7 @@ const getRoutes = (store, IsAdmin) => (
 
     {/* SETTINGS */}
     <Route path="settings" title={t`Settings`}>
-      <IndexRedirect to="/admin/settings/setup" />
+      <IndexRedirect to="setup" />
       {/* <IndexRoute component={SettingsEditorApp} /> */}
       <Route path=":section/:authType" component={SettingsEditorApp} />
       <Route path=":section" component={SettingsEditorApp} />

test/metabase/task/task_history_cleanup_test.clj

@@ -14,7 +14,7 @@
 (let [task-2 (tu/random-name)
       task-3 (tu/random-name)]
   (expect
-    #{task-2 task-3 (var-get #'cleanup-task/job-name)}
+    #{task-2 task-3 "task-history-cleanup"}
     (let [t1-start (time/now)
           t2-start (tht/add-second t1-start)
           t3-start (tht/add-second t2-start)]
@@ -34,7 +34,7 @@
       task-2 (tu/random-name)
       task-3 (tu/random-name)]
   (expect
-    #{task-1 task-2 task-3 (var-get #'cleanup-task/job-name)}
+    #{task-1 task-2 task-3 "task-history-cleanup"}
     (let [t1-start (time/now)
           t2-start (tht/add-second t1-start)
           t3-start (tht/add-second t2-start)]