From 29857a5accbb87d6ef65ad56e4cbf4b2c342ef3b Mon Sep 17 00:00:00 2001 From: Andrea Crotti Date: Sat, 26 Jan 2019 20:38:20 +0000 Subject: [PATCH 1/5] add circleci step --- .circleci/config.yml | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/.circleci/config.yml b/.circleci/config.yml index b88ff5f..ea7881c 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -59,6 +59,19 @@ jobs: - store_test_results: path: target/test2junit + test_cljs: + docker: + - image: circleci/clojure:lein-2.8.1 + + steps: + - checkout + - restore_cache: + keys: + - clj-deps-{{ checksum "project.clj" }} + + - run: sudo apt update && sudo apt install chromium sassc + - run: lein test-cljs + coverage_clj: <<: *base_docker steps: @@ -85,6 +98,10 @@ workflows: build: jobs: - dependencies + - test_cljs: + requires: + - dependencies + - test_clj: requires: - dependencies From dcc21e17a048115f8e71f44ae28e7cbb9bff6a63 Mon Sep 17 00:00:00 2001 From: Andrea Crotti Date: Sat, 26 Jan 2019 20:53:46 +0000 Subject: [PATCH 2/5] cljs test file --- project.clj | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/project.clj b/project.clj index e40f819..a4c3bd2 100644 --- a/project.clj +++ b/project.clj @@ -140,10 +140,15 @@ [ring/ring-mock "0.3.2"]]}} :cljsbuild {:builds - [{:id "min" + [{:id "test" + :source-paths ["src/cljs" "src/cljc" "test/cljc"] + :compiler {:output-to "resources/public/js/testable.js" + :main your-project.runner + :optimizations :none}} + + {:id "min" :source-paths ["src/cljs" "src/cljc"] :compiler {:main elo.core - :output-to "resources/public/cljs-out/elo-main.js" :asset-path "resources/public/cljs-out/elo" :optimizations :simple From 93f3e9c5b97de1acb9507cf3d6f50c45217e4fe5 Mon Sep 17 00:00:00 2001 From: Andrea Crotti Date: Sat, 26 Jan 2019 20:54:00 +0000 Subject: [PATCH 3/5] karma dependency --- package.json | 3 +++ 1 file changed, 3 insertions(+) diff --git a/package.json b/package.json index 7a4634b..97dd08e 100644 --- a/package.json +++ b/package.json @@ -1,5 +1,8 @@ { "dependencies": { "react-datepicker": "1.5.0" + }, + "devDependencies": { + "karma-chrome-launcher": "^2.2.0" } } From 23cf025068950cae9047ec1aebb6f223f3c98770 Mon Sep 17 00:00:00 2001 From: Andrea Crotti Date: Sat, 26 Jan 2019 20:55:48 +0000 Subject: [PATCH 4/5] move out --- project.clj | 2 +- test/doo/test_runner.cljs | 15 ++++++++++----- 2 files changed, 11 insertions(+), 6 deletions(-) diff --git a/project.clj b/project.clj index a4c3bd2..9be0477 100644 --- a/project.clj +++ b/project.clj @@ -143,7 +143,7 @@ [{:id "test" :source-paths ["src/cljs" "src/cljc" "test/cljc"] :compiler {:output-to "resources/public/js/testable.js" - :main your-project.runner + :main doo.test-runner :optimizations :none}} {:id "min" diff --git a/test/doo/test_runner.cljs b/test/doo/test_runner.cljs index ccd96af..58fb459 100644 --- a/test/doo/test_runner.cljs +++ b/test/doo/test_runner.cljs @@ -1,6 +1,11 @@ -;; (ns doo.test-runner -;; (:require [doo.runner :refer-macros [doo-tests]] -;; [elo.algorithms.elo] -;; [elo.algorithms.elo-test])) +(ns doo.test-runner + (:require [doo.runner :refer-macros [doo-tests]] + [elo.rankings-test] + [elo.games-test] + [elo.stats-test] + [elo.algorithms.elo-test])) -;; (doo-tests 'elo.algorithms.elo-test) +(doo-tests 'elo.rankings-test + 'elo.games-test + 'elo.stats-test + 'elo.algorithms.elo-test) From a2c26cfab9bcc5fbc679fef13e21d4665985720f Mon Sep 17 00:00:00 2001 From: Andrea Crotti Date: Sat, 26 Jan 2019 20:59:05 +0000 Subject: [PATCH 5/5] add karma --- package.json | 1 + 1 file changed, 1 insertion(+) diff --git a/package.json b/package.json index 97dd08e..c47acc7 100644 --- a/package.json +++ b/package.json @@ -3,6 +3,7 @@ "react-datepicker": "1.5.0" }, "devDependencies": { + "karma": "^4.0.0", "karma-chrome-launcher": "^2.2.0" } }