Skip to content

Commit

Permalink
Update ci-pr to dev6 (#610)
Browse files Browse the repository at this point in the history
# Why
a new dev version is out, and we need to run against to ensure nothing is
broken
  • Loading branch information
MikeSchulze authored Dec 9, 2024
1 parent 7ad82a5 commit 8864385
Show file tree
Hide file tree
Showing 6 changed files with 12 additions and 13 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/ci-pr-publish-report.yml
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ jobs:
godot-net: ['-net', '']
include:
- godot-version: '4.4'
godot-status: 'dev5'
godot-status: 'dev6'

steps:
- uses: actions/checkout@v4
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/ci-pr.yml
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ jobs:
godot-net: ['.Net', '']
include:
- godot-version: '4.4'
godot-status: 'dev5'
godot-status: 'dev6'

permissions:
actions: write
Expand Down
10 changes: 4 additions & 6 deletions addons/gdUnit4/src/ui/menu/EditorFileSystemContextMenuHandler.gd
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,6 @@ func on_context_menu_show(context_menu: PopupMenu, file_tree: Tree) -> void:


func on_context_menu_pressed(id: int, file_tree: Tree) -> void:
#prints("on_context_menu_pressed", id)
if !_context_menus.has(id):
return
var menu_item: GdUnitContextMenuItem = _context_menus[id]
Expand All @@ -54,11 +53,10 @@ func collect_testsuites(_menu_item: GdUnitContextMenuItem, file_tree: Tree) -> P
selected_test_suites.append(resource_path)
elif is_dir or file_type == "GDScript" or file_type == "CSharpScript":
# find a performant way to check if the selected item a testsuite
#var resource := ResourceLoader.load(resource_path, "GDScript", ResourceLoader.CACHE_MODE_REUSE)
#prints("loaded", resource)
#if resource is GDScript and menu_item.is_visible(resource):
@warning_ignore("return_value_discarded")
selected_test_suites.append(resource_path)
var resource := ResourceLoader.load(resource_path, "Script", ResourceLoader.CACHE_MODE_REUSE)
if _menu_item.is_visible(resource):
@warning_ignore("return_value_discarded")
selected_test_suites.append(resource_path)
selected_item = file_tree.get_next_selected(selected_item)
return selected_test_suites

Expand Down
2 changes: 1 addition & 1 deletion addons/gdUnit4/test/core/GdArrayToolsTest.gd
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ func test_as_string(_test :String, value :Variant, expected :String, test_parame
['ArrayVector2i', Array([Vector2i.ZERO, Vector2i.LEFT]) as Array[Vector2i], '[Vector2i(), Vector2i'+str(Vector2i(-1, 0))+']'],
['ArrayVector3', Array([Vector3.ZERO, Vector3.LEFT]) as Array[Vector3], '[Vector3(), Vector3'+str(Vector3(-1, 0, 0))+']'],
['ArrayVector3i', Array([Vector3i.ZERO, Vector3i.LEFT]) as Array[Vector3i], '[Vector3i(), Vector3i'+str(Vector3i(-1, 0, 0))+']'],
['ArrayVector4', Array([Vector4.ZERO, Vector4.ONE]) as Array[Vector4], '[Vector4(), Vector4(1, 1, 1, 1)]'],
['ArrayVector4', Array([Vector4.ZERO, Vector4.ONE]) as Array[Vector4], '[Vector4(), Vector4%s]' % Vector4(1, 1, 1, 1)],
['ArrayVector4i', Array([Vector4i.ZERO, Vector4i.ONE]) as Array[Vector4i], '[Vector4i(), Vector4i(1, 1, 1, 1)]'],
['ArrayColor', Array([Color.RED, Color.GREEN]) as Array[Color], '[Color'+str(Color(1, 0, 0, 1))+', Color'+str(Color(0, 1, 0, 1))+']'],
['PackedByteArray', PackedByteArray([1, 2]), 'PackedByteArray[1, 2]'],
Expand Down
7 changes: 4 additions & 3 deletions addons/gdUnit4/test/core/parse/GdDefaultValueDecoderTest.gd
Original file line number Diff line number Diff line change
Expand Up @@ -93,10 +93,11 @@ func test_decode_Transforms(variant_type :int, value :Variant, expected :String,
[TYPE_TRANSFORM3D, Transform3D(Vector3(1,2,3), Vector3(4,5,6), Vector3(7,8,9), Vector3.ONE),
"Transform3D(Vector3"+str(Vector3(1, 2, 3))+", Vector3"+str(Vector3(4, 5, 6))
+", Vector3"+str(Vector3(7, 8, 9))+", Vector3"+str(Vector3(1, 1, 1))+")"],
[TYPE_PROJECTION, Projection(),
"Projection(Vector4(1, 0, 0, 0), Vector4(0, 1, 0, 0), Vector4(0, 0, 1, 0), Vector4(0, 0, 0, 1))"],
[TYPE_PROJECTION, Projection(), "Projection(Vector4%s, Vector4%s, Vector4%s, Vector4%s)"
% [Vector4(1, 0, 0, 0), Vector4(0, 1, 0, 0), Vector4(0, 0, 1, 0), Vector4(0, 0, 0, 1)]],
[TYPE_PROJECTION, Projection(Vector4.ONE, Vector4.ONE*2, Vector4.ONE*3, Vector4.ZERO),
"Projection(Vector4(1, 1, 1, 1), Vector4(2, 2, 2, 2), Vector4(3, 3, 3, 3), Vector4(0, 0, 0, 0))"]
"Projection(Vector4%s, Vector4%s, Vector4%s, Vector4%s)" %
[Vector4.ONE, Vector4.ONE*2, Vector4.ONE*3, Vector4.ZERO]]
]) -> void:
assert_that(GdDefaultValueDecoder.decode_typed(variant_type, value)).is_equal(expected)
_tested_types[variant_type] = 1
Expand Down
2 changes: 1 addition & 1 deletion project.godot
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ config_version=5

config/name="gdUnit4"
config/tags=PackedStringArray("addon", "godot4", "testing")
config/features=PackedStringArray("4.3", "C#")
config/features=PackedStringArray("4.4", "C#")
config/icon="res://icon.png"

[audio]
Expand Down

0 comments on commit 8864385

Please sign in to comment.