From 32b017e6609802fa03bb33694340393fbb3a84e6 Mon Sep 17 00:00:00 2001 From: Tobiasz Laskowski Date: Sun, 16 Mar 2025 10:40:57 +0000 Subject: [PATCH 1/2] Use up to date fork for mockatoo This fork includes the DoclerLabs patches merged into the latest version of the original repository, with a fix for the mconsole dependency issue. --- .github/workflows/test.yml | 6 +----- test-each.hxml | 4 +--- 2 files changed, 2 insertions(+), 8 deletions(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 4e1a630..3c381e7 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -23,11 +23,7 @@ jobs: haxe-version: ${{ matrix.haxe-version }} - run: | - curl -sL https://github.com/massive-oss/mconsole/archive/refs/tags/1.6.1.zip -o mconsole-1.6.1.zip - haxelib install mconsole-1.6.1.zip - haxelib install hscript --quiet - - haxelib install all --quiet --always --skip-dependencies + haxelib install all --quiet --always haxelib install minject 2.0.0-rc.1 && haxelib set minject 2.0.0-rc.1 haxelib list diff --git a/test-each.hxml b/test-each.hxml index 150c2b5..6b561e8 100644 --- a/test-each.hxml +++ b/test-each.hxml @@ -10,9 +10,7 @@ -lib minject -lib tink_core -lib tink_macro --lib mockatoo:git:https://github.com/DoclerLabs/mockatoo -# this mockatoo fork depends on mconsole 1.6.1 -# available here: https://github.com/massive-oss/mconsole/releases/tag/1.6.1 +-lib mockatoo:git:https://github.com/FunkinCrew/mockatoo#13d77a0a8eaf5e789ef5dae6cd33eee812deda36 -cp src # Things need for tests From 134fd9a62b396d10790b396bf5ee5bc89b87211a Mon Sep 17 00:00:00 2001 From: Tobiasz Laskowski Date: Sun, 16 Mar 2025 10:46:03 +0000 Subject: [PATCH 2/2] Avoid including mockatoo outside client tests --- test-each.hxml | 1 - test-js-browser.hxml | 3 ++- test/ufront/api/ApiMacrosTest.hx | 4 +++- 3 files changed, 5 insertions(+), 3 deletions(-) diff --git a/test-each.hxml b/test-each.hxml index 6b561e8..861d55e 100644 --- a/test-each.hxml +++ b/test-each.hxml @@ -10,7 +10,6 @@ -lib minject -lib tink_core -lib tink_macro --lib mockatoo:git:https://github.com/FunkinCrew/mockatoo#13d77a0a8eaf5e789ef5dae6cd33eee812deda36 -cp src # Things need for tests diff --git a/test-js-browser.hxml b/test-js-browser.hxml index adc19b3..19a748f 100644 --- a/test-js-browser.hxml +++ b/test-js-browser.hxml @@ -1,6 +1,7 @@ test-each.hxml -D client -lib pushstate +-lib mockatoo:git:https://github.com/FunkinCrew/mockatoo#13d77a0a8eaf5e789ef5dae6cd33eee812deda36 # -lib detox -js build/js_client_test.js --xml doc/js_browser.xml \ No newline at end of file +-xml doc/js_browser.xml diff --git a/test/ufront/api/ApiMacrosTest.hx b/test/ufront/api/ApiMacrosTest.hx index 9975d89..50026db 100644 --- a/test/ufront/api/ApiMacrosTest.hx +++ b/test/ufront/api/ApiMacrosTest.hx @@ -6,9 +6,11 @@ import utest.Assert; import haxe.rtti.Meta; import haxe.EnumFlags; import haxe.macro.MacroType; -import mockatoo.Mockatoo.*; using tink.CoreApi; +#if client +import mockatoo.Mockatoo.*; using mockatoo.Mockatoo; +#end class ApiMacrosTest { public function new() {}