855ab1a0a3
Merge remote-tracking branch 'lethosor/test-mocks' into develop
2021-04-10 16:12:33 -04:00
757736728d
Add a mock.func() helper for mocking functions
2021-04-10 01:22:03 -04:00
846cf9a8ff
Auto-update submodules
...
scripts: master
2021-04-09 07:08:20 +00:00
f44442e5e9
Use mock.patch() in ci/test.lua
...
Other tests that could benefit are currently only in the scripts repo.
2021-04-09 00:50:11 -04:00
5424392273
mock.patch(): propagate return values
2021-04-09 00:41:39 -04:00
f25b8a0d14
Fix patching value with nil
2021-04-09 00:35:54 -04:00
7b2f01d45b
Add initial mock.patch() implementation for tests
2021-04-09 00:32:10 -04:00
e2d56b9b8f
Merge remote-tracking branch 'lethosor/tweak-hide-priority-improvements' into develop
2021-04-08 23:43:14 -04:00
781dff7144
Merge remote-tracking branch 'myk002/myk_kdevelop_cmake' into develop
2021-04-08 23:42:25 -04:00
70b85631aa
Merge remote-tracking branch 'myk002/myk_run_script_wrap' into develop
2021-04-08 23:35:16 -04:00
172821af17
Auto-update submodules
...
library/xml: master
scripts: master
2021-04-07 07:07:27 +00:00
449fa42906
ignore build/.cmake cache created by kdevelop
2021-04-06 11:47:52 -07:00
12315fc5dd
wrap dfhack.run_script for tests
...
so dfhack.internal.scripts isn't polluted with IN_TEST envs
2021-04-06 11:33:49 -07:00
106fa4a5cf
Merge remote-tracking branch 'myk002/myk_printerr_match' into develop
2021-04-06 00:39:16 -04:00
761cf19e99
tweak hide-priority: make toggle state persist across designation menu uses
...
To reproduce:
1. Enter the `d`esignation menu
2. Press `-+` to change priorities
3. Create a designation
4. Press `Alt-p` to hide priorities
5. Exit and re-enter the designation menu (`Esc`, `d`)
Previously, priorities would be visible again after step 5. With this change, they are not visible until you press `Alt-p` again.
Fixes #1068 . Note that this is a relatively unobtrusive fix: selecting a priority with `+-` will still result in priorities being shown again. This is native DF behavior that I am reluctant to override because users of designation priorities likely want to see them.
2021-04-05 21:58:51 -04:00
642d8cbe4b
handle nil values sent to printerr
2021-04-05 01:37:43 -07:00
81bfdf4182
update changelog
2021-04-04 17:40:59 -07:00
13ca7f8c9e
move expect.lua from internal/ to test_util/
2021-04-04 17:37:37 -07:00
c8abecd082
detect dfhack.printerr usage at the test level
...
not the expect level. this allows us to properly nest expect calls
inside of expect.printerr_match() as originally intended.
2021-04-04 17:37:36 -07:00
5af1b627cb
add tests, move expect.lua
...
I moved expect.lua from library/lua/test/ to library/lua/internal since
luacov is configured to ignore any file with /test/ in its path
2021-04-04 17:37:36 -07:00
757dbeb238
update existing calls to expect.error* to new API
2021-04-04 17:37:36 -07:00
a6561911c1
error on unmatched printerr output during a test
...
- provides expect,printerr_match for matching printerr output
- fails tests if printerr is called outside the printerr_match wrapper
- changes api of expect.error_match to mirror the new printerr_match api
2021-04-04 17:37:33 -07:00
9d723dc256
Switch to DFHack luacov fork
...
Fixes behavior of `push.recurseSubmodules`: since the commit we track is
currently only a tag (v0.15.0), pushing with `recurseSubmodules = check` fails
since that checks that submodule commits are on a branch. In our own fork, we
can add a `dfhack` branch that resolves this issue, which is consistent with
other dependencies.
2021-04-03 18:12:09 -04:00
ea1bc9e01b
Add GitHub issues/discussions to troubleshooting section
2021-04-03 00:24:58 -04:00
8b38bf0e28
Move contribution-related information from Compile.rst to Contributing.rst
2021-04-03 00:20:15 -04:00
cb2d8e0903
Compile.rst: remove old git note and rearrange
...
Very unlikely that this affects anyone now
2021-04-02 23:52:32 -04:00
dfb52a2aba
Merge remote-tracking branch 'lethosor/command-prompt-fix-gui-scripts' into develop
...
Conflicts:
docs/changelog.txt
2021-04-02 21:53:14 -04:00
81905fa8fc
Merge remote-tracking branch 'lethosor/fix-buildingplan-construction-sizing' into develop
2021-04-01 22:01:50 -04:00
257f8dbe00
buildingplan: fix size calculation for constructions
...
Planning a 4x2 construction with DF's `umkh` keys (i.e. not automaterial's box-select) would previously produce a 5x3 construction instead, for example.
2021-04-01 00:16:54 -04:00
8129fdab4e
Merge remote-tracking branch 'myk002/myk_invalidate_scripts' into develop
2021-03-31 00:50:31 -04:00
c06d1f8e52
tagged union support for lua ( #1818 )
2021-03-30 15:55:06 -05:00
5e7653bbf5
Don't run update-submodules job in forks
2021-03-29 20:03:50 -04:00
4e844f39ae
undo formatting change in script_environment
2021-03-29 12:29:15 -07:00
d71a816b20
remove debug marker
2021-03-29 12:28:19 -07:00
54a1e8d98a
move script_environment changes to test.lua
2021-03-29 12:23:53 -07:00
e4cab1b1c6
load scripts into different namespace for testing
2021-03-29 11:26:28 -07:00
badf471434
Auto-update submodules
...
library/xml: master
2021-03-29 07:07:32 +00:00
8ccacd94e0
clarify clean_reqscript() function comment
2021-03-28 15:41:05 -07:00
035c9eec04
force reloading of scripts under test
...
and invalidate scripts once tests are complete. this ensures that the
IN_TEST flag is respected.
2021-03-28 15:40:59 -07:00
2332009825
Merge remote-tracking branch 'myk002/myk_enable_luacov' into develop
2021-03-28 00:38:36 -04:00
5e09fd882d
Fix Painter:viewport()
...
This works because Painter inherits from ViewRect. Unsure how this went unnoticed.
2021-03-27 16:55:48 -04:00
d5ba1a3d23
Auto-update submodules
...
library/xml: master
2021-03-27 07:11:38 +00:00
572b6ebab5
Fix warning ( #1796 )
2021-03-27 00:11:50 -04:00
d61c4aa234
Merge remote-tracking branch 'myk002/myk_xlsxreader_classes' into develop
2021-03-27 00:10:03 -04:00
4d2af8438f
always read all cells to work around xlsxio bug
...
otherwise xlsxio will return a spurious empty row on next row read
2021-03-26 19:43:15 -07:00
ceae4723cd
Update scripts, authors ( dfhack/scripts#264 )
2021-03-26 00:37:28 -04:00
26e41005e3
Fix fastdwarf warning
2021-03-25 17:20:33 -04:00
dbd35359be
Update xml
2021-03-24 22:07:37 -04:00
2249b32ef0
Merge branch 'myk_move_main' into develop
2021-03-24 22:07:21 -04:00
62776f5568
Move `expect` functions to a separate file
...
This allows tests to test these functions without needing to include the test
wrapper directly (now ci/test.lua, formerly test/main.lua). Hopefully this
location is also more stable, similar to other libraries that are already tested.
2021-03-24 00:48:52 -04:00
lethosor
DFHack-Urist via GitHub Actions
myk002
Ben Lubar