Skip to content

The easy-to-use open source Business Intelligence and Embedded Analytics tool that lets everyone work with data :bar_chart:

Remove `mage` tests from the core classpath (#65046)

Nemanja Glumac49c0589aa828
diff --git a/.github/workflows/mage.yml b/.github/workflows/mage.yml
index 15f735cdfa6..6deefd0c635 100644
--- a/.github/workflows/mage.yml
+++ b/.github/workflows/mage.yml
@@ -2,7 +2,7 @@ name: Mage Tests
on:
pull_request:
- paths: ["mage/**", "test/mage/**"]
+ paths: ["mage/**"]
jobs:
# run mage tests even if the rest of be isnt needed
@@ -22,4 +22,4 @@ jobs:
- name: bb task list
run: bb tasks
- name: Run mage tests
- run: bb ./test/mage/runtests.clj
+ run: bb ./mage/test/mage/runtests.clj
diff --git a/bb.edn b/bb.edn
index d40f98372ae..0b233e84a7c 100644
--- a/bb.edn
+++ b/bb.edn
@@ -1,7 +1,7 @@
{:min-bb-version "1.12.208"
;; we put path as bin, and everything is in the ./mage subdirectory,
;; so the namespaces are mage.cli, mage.format, etc.
- :paths ["mage" "test" "bin/lint-migrations-file/src"]
+ :paths ["mage/src" "mage/test" "bin/lint-migrations-file/src"]
:deps {org.babashka/json {:mvn/version "0.1.6"}
metosin/malli {:mvn/version "0.17.0"}
table/table {:mvn/version "0.5.0"}
diff --git a/deps.edn b/deps.edn
index 7e1cc1cd6e8..9d77f71d052 100644
--- a/deps.edn
+++ b/deps.edn
@@ -663,7 +663,7 @@
:ns-regex
["^metabase\\..*" "^metabase-enterprise\\..*"]
- ;; don't instrument Postgres/MySQL driver namespaces, because we don't current run tests for them
+ ;; don't instrument Postgres/MySQL driver namespaces, because we don't currently run tests for them
;; as part of recording test coverage, which means they can give us false positives.
;;
;; regex literals aren't allowed in EDN. We parse them in `./test/cloverage.clj`
diff --git a/enterprise/backend/test/metabase_enterprise/documents/models/dashboard_card_test.clj b/enterprise/backend/test/metabase_enterprise/documents/models/dashboard_card_test.clj
index ee974fe7919..9378a589722 100644
--- a/enterprise/backend/test/metabase_enterprise/documents/models/dashboard_card_test.clj
+++ b/enterprise/backend/test/metabase_enterprise/documents/models/dashboard_card_test.clj
@@ -1,4 +1,4 @@
-(ns backend.test.metabase-enterprise.documents.models.dashboard-card-test
+(ns metabase-enterprise.documents.models.dashboard-card-test
(:require
[clojure.test :refer :all]
[metabase.dashboards.models.dashboard-card :as dashboard-card]
diff --git a/mage/mage/alias.clj b/mage/src/mage/alias.clj
similarity index 100%
rename from mage/mage/alias.clj
rename to mage/src/mage/alias.clj
diff --git a/mage/mage/be_dev.clj b/mage/src/mage/be_dev.clj
similarity index 100%
rename from mage/mage/be_dev.clj
rename to mage/src/mage/be_dev.clj
diff --git a/mage/mage/check.clj b/mage/src/mage/check.clj
similarity index 100%
rename from mage/mage/check.clj
rename to mage/src/mage/check.clj
diff --git a/mage/mage/cli.clj b/mage/src/mage/cli.clj
similarity index 100%
rename from mage/mage/cli.clj
rename to mage/src/mage/cli.clj
diff --git a/mage/mage/color.clj b/mage/src/mage/color.clj
similarity index 100%
rename from mage/mage/color.clj
rename to mage/src/mage/color.clj
diff --git a/mage/mage/escherize/fix_whitespace.clj b/mage/src/mage/escherize/fix_whitespace.clj
similarity index 100%
rename from mage/mage/escherize/fix_whitespace.clj
rename to mage/src/mage/escherize/fix_whitespace.clj
diff --git a/mage/mage/escherize/pr_summary.clj b/mage/src/mage/escherize/pr_summary.clj
similarity index 100%
rename from mage/mage/escherize/pr_summary.clj
rename to mage/src/mage/escherize/pr_summary.clj
diff --git a/mage/mage/format.clj b/mage/src/mage/format.clj
similarity index 100%
rename from mage/mage/format.clj
rename to mage/src/mage/format.clj
diff --git a/mage/mage/jar_download.clj b/mage/src/mage/jar_download.clj
similarity index 100%
rename from mage/mage/jar_download.clj
rename to mage/src/mage/jar_download.clj
diff --git a/mage/mage/kondo.clj b/mage/src/mage/kondo.clj
similarity index 100%
rename from mage/mage/kondo.clj
rename to mage/src/mage/kondo.clj
diff --git a/mage/mage/readability_check.clj b/mage/src/mage/readability_check.clj
similarity index 100%
rename from mage/mage/readability_check.clj
rename to mage/src/mage/readability_check.clj
diff --git a/mage/mage/shell.clj b/mage/src/mage/shell.clj
similarity index 100%
rename from mage/mage/shell.clj
rename to mage/src/mage/shell.clj
diff --git a/mage/mage/start_db.clj b/mage/src/mage/start_db.clj
similarity index 100%
rename from mage/mage/start_db.clj
rename to mage/src/mage/start_db.clj
diff --git a/mage/mage/start_maildev.clj b/mage/src/mage/start_maildev.clj
similarity index 100%
rename from mage/mage/start_maildev.clj
rename to mage/src/mage/start_maildev.clj
diff --git a/mage/mage/stats_repl.clj b/mage/src/mage/stats_repl.clj
similarity index 100%
rename from mage/mage/stats_repl.clj
rename to mage/src/mage/stats_repl.clj
diff --git a/mage/mage/token_scan.clj b/mage/src/mage/token_scan.clj
similarity index 100%
rename from mage/mage/token_scan.clj
rename to mage/src/mage/token_scan.clj
diff --git a/mage/mage/util.clj b/mage/src/mage/util.clj
similarity index 97%
rename from mage/mage/util.clj
rename to mage/src/mage/util.clj
index 442564748a4..0c9712990ff 100644
--- a/mage/mage/util.clj
+++ b/mage/src/mage/util.clj
@@ -14,8 +14,9 @@
(def ^String project-root-directory
"Root directory of the Metabase repo."
(.. (java.io.File. (.toURI (io/resource "mage/util.clj"))) ; this file
- getParentFile ; /Users/me/metabase/bin/mage
- getParentFile ; /Users/me/metabase/bin
+ getParentFile ; /Users/me/metabase/mage/src/mage
+ getParentFile ; /Users/me/metabase/mage/src
+ getParentFile ; /Users/me/metabase/mage
getParentFile ; /Users/me/metabase
getCanonicalPath))
diff --git a/test/mage/core_test.clj b/mage/test/mage/core_test.clj
similarity index 100%
rename from test/mage/core_test.clj
rename to mage/test/mage/core_test.clj
diff --git a/test/mage/examples_test.clj b/mage/test/mage/examples_test.clj
similarity index 100%
rename from test/mage/examples_test.clj
rename to mage/test/mage/examples_test.clj
diff --git a/test/mage/runtests.clj b/mage/test/mage/runtests.clj
similarity index 100%
rename from test/mage/runtests.clj
rename to mage/test/mage/runtests.clj
diff --git a/test/mage/start_db_test.clj b/mage/test/mage/start_db_test.clj
similarity index 100%
rename from test/mage/start_db_test.clj
rename to mage/test/mage/start_db_test.clj
diff --git a/test/mage/token_scan_test.clj b/mage/test/mage/token_scan_test.clj
similarity index 100%
rename from test/mage/token_scan_test.clj
rename to mage/test/mage/token_scan_test.clj