From b017138c32df2df2799ebb480bf1b8f5a461d300 Mon Sep 17 00:00:00 2001 From: Andreas Rumpf Date: Fri, 7 Sep 2018 13:13:35 +0200 Subject: added a test for 'nim doc' --- .../expected/subdir/subdir_b/utils.html | 1299 ++++++++++++++++++++ 1 file changed, 1299 insertions(+) create mode 100644 nimdoc/testproject/expected/subdir/subdir_b/utils.html (limited to 'nimdoc/testproject/expected/subdir/subdir_b') diff --git a/nimdoc/testproject/expected/subdir/subdir_b/utils.html b/nimdoc/testproject/expected/subdir/subdir_b/utils.html new file mode 100644 index 000000000..0e09b10cd --- /dev/null +++ b/nimdoc/testproject/expected/subdir/subdir_b/utils.html @@ -0,0 +1,1299 @@ + + + + + + + + + + + + + + + + + +Module utils + + + + + + + + +
+
+

Module utils

+
+
+ +
+ Search: +
+
+ Group by: + +
+ + +
+
+
+

+
+

Types

+
+
SomeType = int
+
+ + +
+ +
+
+

Procs

+
+
proc someType(): SomeType {...}{.raises: [], tags: [].}
+
+constructor. + +
+ +
+ +
+
+ +
+
+ +
+ Made with Nim. Generated: 1970-01-02 03:46:40 UTC +
+
+
+
+ + + -- cgit 1.4.1-2-gfad0 From 9b29436f629b85301e1cfce8c0a502d45a2ad6fe Mon Sep 17 00:00:00 2001 From: Araq Date: Thu, 13 Sep 2018 23:18:51 +0200 Subject: make documentation generator tests green again --- .gitignore | 2 +- nimdoc/tester.nim | 2 +- nimdoc/testproject/expected/subdir/subdir_b/utils.html | 6 ++++-- nimdoc/testproject/expected/testproject.html | 7 +++++-- 4 files changed, 11 insertions(+), 6 deletions(-) (limited to 'nimdoc/testproject/expected/subdir/subdir_b') diff --git a/.gitignore b/.gitignore index eb29dfc04..8cd092639 100644 --- a/.gitignore +++ b/.gitignore @@ -45,7 +45,7 @@ xcuserdata/ # Generated files. /compile.json -/compiler/nimrod.dot +/compiler/nim.dot /reject.json /run.json # for `nim doc foo.nim` diff --git a/nimdoc/tester.nim b/nimdoc/tester.nim index 58117987b..e0afe6b94 100644 --- a/nimdoc/tester.nim +++ b/nimdoc/tester.nim @@ -14,7 +14,7 @@ proc test(dir: string; fixup = false) = quit("FAILURE: nim buildIndex failed") for expected in walkDirRec(dir / "expected/"): - let produced = expected.replace("/expected/", "/htmldocs/") + let produced = expected.replace('\\', '/').replace("/expected/", "/htmldocs/") if not fileExists(produced): echo "FAILURE: files not found: ", produced inc failures diff --git a/nimdoc/testproject/expected/subdir/subdir_b/utils.html b/nimdoc/testproject/expected/subdir/subdir_b/utils.html index 0e09b10cd..285d09d5c 100644 --- a/nimdoc/testproject/expected/subdir/subdir_b/utils.html +++ b/nimdoc/testproject/expected/subdir/subdir_b/utils.html @@ -1242,7 +1242,8 @@ function main() { Types @@ -1264,7 +1265,8 @@ function main() {

Types

-
SomeType = int
+
SomeType = enum
+  enumValueA, enumValueB, enumValueC
diff --git a/nimdoc/testproject/expected/testproject.html b/nimdoc/testproject/expected/testproject.html index b1f8489f1..784fbe9b7 100644 --- a/nimdoc/testproject/expected/testproject.html +++ b/nimdoc/testproject/expected/testproject.html @@ -1276,8 +1276,11 @@ function main() {

This is the top level module.

Examples:

-
doAssert bar(3, 4) == 7
-foo(1, 2)

+
import
+  subdir / subdir_b / utils
+
+doAssert bar(3, 4) == 7
+foo(enumValueA, enumValueB)

Imports

-- cgit 1.4.1-2-gfad0