From 3a3d59bb0ff3f8ecdd33e09104e426d12f5a9c2a Mon Sep 17 00:00:00 2001
From: Cam Saul <cam@geotip.com>
Date: Fri, 6 Mar 2015 17:23:31 -0800
Subject: [PATCH] test fix
---
project.clj | 6 +++---
test/metabase/api/meta/table_test.clj | 2 +-
2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/project.clj b/project.clj
index c6e79078ae8..9527d5c799a 100644
--- a/project.clj
+++ b/project.clj
@@ -49,8 +49,7 @@
:java-source-paths ["src/java"]
:main ^:skip-aot metabase.core
:target-path "target/%s"
- :jar-exclusions [#"\.java"]
- :prep-tasks ["npm" "gulp" "javac" "compile"]
+ ;; :jar-exclusions [#"\.java"] Circle CI doesn't like regexes because it's using the EDN reader and is retarded
:ring {:handler metabase.core/app}
:eastwood {:exclude-namespaces [:test-paths]
:add-linters [:unused-private-vars]
@@ -58,4 +57,5 @@
:profiles {:dev {:dependencies [[expectations "2.0.16"] ; unit tests
[ring/ring-mock "0.2.0"]]
:jvm-opts ["-Dlogfile.path=target/log"]}
- :uberjar {:aot :all}})
+ :uberjar {:aot :all
+ :prep-tasks ["npm" "gulp" "javac" "compile"]}})
diff --git a/test/metabase/api/meta/table_test.clj b/test/metabase/api/meta/table_test.clj
index 867a51cd469..6dab3bb2a28 100644
--- a/test/metabase/api/meta/table_test.clj
+++ b/test/metabase/api/meta/table_test.clj
@@ -79,7 +79,7 @@
{:created_at $
:engine "h2"
:id $
- :details {:conn_str "file:t.db;AUTO_SERVER=TRUE"}
+ :details $
:updated_at $
:name "Test Database"
:organization_id (:id @test-org)
--
GitLab