no need for test cljs

AndreaCrotti · Mar 30, 2020 · b7b41b7 · b7b41b7
1 parent 7634750
commit b7b41b7
Show file tree

Hide file tree

Showing 7 changed files with 9 additions and 54 deletions.
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -25,7 +25,7 @@ jobs:
       - checkout
       - restore_cache:
           keys:
-            - clj-deps-{{ checksum "project.clj" }}
+            - clj-deps-{{ checksum "deps.edn" }}
 
       # - run: lein cljfmt check
       - run: clojure -A:eastwood
@@ -36,7 +36,7 @@ jobs:
       - checkout
       - restore_cache:
           keys:
-            - clj-deps-{{ checksum "project.clj" }}
+            - clj-deps-{{ checksum "deps.edn" }}
 
       - run: bin/migrate
       - run: bin/kaocha --plugin kaocha.plugin/junit-xml --junit-xml-file test-results/kaocha/results.xml
@@ -48,26 +48,15 @@ jobs:
             - ~/.m2/repository
             - ~/.lein
 
-          key: clj-deps-{{ checksum "project.clj" }}
-
-  test_cljs:
-    <<: *base_docker
-    steps:
-      - checkout
-      - run: sudo apt install rhino
-      - restore_cache:
-          keys:
-            - clj-deps-{{ checksum "project.clj" }}
-
-      - run: lein test-cljs || true
+          key: clj-deps-{{ checksum "deps.edn" }}
 
   coverage_clj:
     <<: *base_docker
     steps:
       - checkout
       - restore_cache:
           keys:
-            - clj-deps-{{ checksum "project.clj" }}
+            - clj-deps-{{ checksum "deps.edn" }}
 
       - run: bin/migrate
       - run: bin/kaocha --plugin cloverage --codecov
@@ -83,7 +72,6 @@ workflows:
   version: 2
   build:
     jobs:
-      - test_cljs
       - test_clj
       - coverage_clj
       - cljfmt
diff --git a/bin/kaocha b/bin/kaocha
@@ -1,3 +1,3 @@
 #!/usr/bin/env bash
 
-clj -A:kaocha "$@"
+clojure -A:kaocha "$@"
diff --git a/project.clj b/project.clj
@@ -101,7 +101,6 @@
   :aliases {"fig" ["trampoline" "run" "-m" "figwheel.main"]
             "fig:build" ["trampoline" "run" "-m" "figwheel.main" "-b" "dev"]
             "cljs-prod" ["run" "-m" "figwheel.main" "--build-once" "prod"]
-            "test-cljs" ["doo" "rhino" "test" "once"]
             "kaocha" ["with-profile" "+kaocha" "run" "-m" "kaocha.runner"]
             "seed" ["run" "-m" "byf.seed"]}
 
@@ -142,13 +141,7 @@
                    [ring/ring-mock "0.4.0"]]}}
   :cljsbuild
   {:builds
-   [{:id "test"
-     :source-paths ["src/cljs" "src/cljc" "test/cljs" "test/cljc"]
-     :compiler {:output-to "target/unit-test.js"
-                :main 'byf.runner
-                :optimizations :whitespace}}
-
-    {:id "min"
+   [{:id "min"
      :source-paths ["src/cljs" "src/cljc"]
      :compiler     {:main byf.core
                     :output-to "resources/public/cljs-out/dev-main.js"

diff --git a/setup_db.sh b/setup_db.sh
@@ -9,7 +9,7 @@ dropdb --if-exists $DEV; createdb $DEV
 
 dropdb --if-exists $TEST; createdb $TEST
 
-DATABASE_URL="postgres://byf@localhost:5445/byf" lein migratus migrate
-DATABASE_URL="postgres://byf@localhost:5445/byf_test" lein migratus migrate
+DATABASE_URL="postgres://byf@localhost:5445/byf" bin/migrate
+DATABASE_URL="postgres://byf@localhost:5445/byf_test" bin/migrate 
 
 DATABASE_URL="postgres://byf@localhost:5445/byf" lein run -m byf.seed
diff --git a/src/clj/byf/migrate.clj b/src/clj/byf/migrate.clj
@@ -6,7 +6,7 @@
 (defn config
   []
   {:store         :database
-   :migration-dir "migrations"
+   :migration-dir "resources/migrations"
    :db            (value :database-url)})
 
 (defn -main

diff --git a/test/cljs/byf/common/handlers_test.cljs b/test/cljs/byf/common/handlers_test.cljs
diff --git a/test/cljs/byf/runner.cljs b/test/cljs/byf/runner.cljs