diff --git a/.gitignore b/.gitignore index 20fd699e727..3f2b0c0c6d5 100644 --- a/.gitignore +++ b/.gitignore @@ -11,6 +11,7 @@ pom.xml.asc /.nrepl-port .hgignore .hg/ +.nbb/ node_modules/ static/** diff --git a/deps/graph-parser/README.md b/deps/graph-parser/README.md index 791d4008a8c..e620eca85e6 100644 --- a/deps/graph-parser/README.md +++ b/deps/graph-parser/README.md @@ -42,6 +42,18 @@ This step is not needed if you're just running the frontend application. Since this library is compatible with cljs and nbb-logseq, tests are run against both languages. +Nbb tests use [nbb-test-runner](https://github.com/nextjournal/nbb-test-runner). +Some basic usage: + +``` +# Run all tests +$ yarn test +# List available options +$ yarn test -H +# Run tests with :focus metadata flag +$ yarn test -i focus +``` + ClojureScript tests use https://github.com/Olical/cljs-test-runner. To run tests: ``` clojure -M:test @@ -49,11 +61,6 @@ clojure -M:test To see available options that can run specific tests or namespaces: `clojure -M:test --help` -To run nbb-logseq tests: -``` -yarn test -``` - ### Managing dependencies The package.json dependencies are just for testing and should be updated if there is diff --git a/deps/graph-parser/nbb.edn b/deps/graph-parser/nbb.edn new file mode 100644 index 00000000000..90583c25bb8 --- /dev/null +++ b/deps/graph-parser/nbb.edn @@ -0,0 +1,6 @@ +{:paths ["src"] + :deps + {logseq/db + {:local/root "../db"} + io.github.nextjournal/nbb-test-runner + {:git/sha "60ed57aa04bca8d604f5ba6b28848bd887109347"}}} diff --git a/deps/graph-parser/package.json b/deps/graph-parser/package.json index 3b85295dabe..53d90720727 100644 --- a/deps/graph-parser/package.json +++ b/deps/graph-parser/package.json @@ -9,6 +9,6 @@ "mldoc": "^1.5.1" }, "scripts": { - "test": "nbb-logseq -cp src:test:../db/src -m logseq.graph-parser.nbb-test-runner/run-tests" + "test": "nbb-logseq -cp test -m nextjournal.test-runner" } } diff --git a/deps/graph-parser/test/logseq/graph_parser/nbb_test_runner.cljs b/deps/graph-parser/test/logseq/graph_parser/nbb_test_runner.cljs deleted file mode 100644 index 598015feae1..00000000000 --- a/deps/graph-parser/test/logseq/graph_parser/nbb_test_runner.cljs +++ /dev/null @@ -1,31 +0,0 @@ -(ns logseq.graph-parser.nbb-test-runner - "Nbb tests for graph-parser" - (:require [cljs.test :as t] - [logseq.graph-parser.text-test] - [logseq.graph-parser.mldoc-test] - [logseq.graph-parser.block-test] - [logseq.graph-parser.property-test] - [logseq.graph-parser.extract-test] - [logseq.graph-parser.cli-test] - [logseq.graph-parser.util.page-ref-test] - [logseq.graph-parser.util-test] - [logseq.graph-parser.util.file-name-test] - [logseq.graph-parser-test])) - -(defmethod t/report [:cljs.test/default :end-run-tests] [m] - (when-not (t/successful? m) - (set! (.-exitCode js/process) 1))) - -;; run this function with: nbb-logseq -m logseq.test.nbb-test-runner/run-tests -(defn run-tests [] - (t/run-tests - 'logseq.graph-parser.mldoc-test - 'logseq.graph-parser.text-test - 'logseq.graph-parser.property-test - 'logseq.graph-parser.block-test - 'logseq.graph-parser.extract-test - 'logseq.graph-parser.cli-test - 'logseq.graph-parser.util.page-ref-test - 'logseq.graph-parser-test - 'logseq.graph-parser.util.file-name-test - 'logseq.graph-parser.util-test))