Skip to content

Commit c536845

Browse files
committed
Merge branch 'main' into clubshare-vrs
2 parents 218d90a + 7a913db commit c536845

58 files changed

Lines changed: 1311 additions & 410 deletions

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

.github/workflows/update visual snapshots.yml

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,11 @@ jobs:
1919
# Support runs of this action in forks
2020
repository: ${{ github.event.pull_request.head.repo.full_name }}
2121

22+
- name: Fix repository permission issue
23+
# Workaround for upstream issue: https://github.com/actions/checkout/issues/1169
24+
run: |
25+
git config --system --add safe.directory $GITHUB_WORKSPACE
26+
2227
- name: Prepare for build
2328
run: apt-get update && apt-get install -y -q gcc make unzip
2429

lua/spec/array_spec.lua

Lines changed: 12 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -81,6 +81,15 @@ describe('array', function()
8181
it('check', function()
8282
local a = {1, 2, 3, {5, 3}, {6, 4}}
8383
assert.are_same({1, 2, 3, 5, 3, 6, 4}, Array.flatten(a))
84+
85+
local b = {
86+
{
87+
hello = 'world'
88+
},
89+
2,
90+
3
91+
}
92+
assert.are_same(b, Array.flatten(b))
8493
end)
8594
end)
8695

@@ -155,9 +164,11 @@ describe('array', function()
155164

156165
describe('ExtendWith', function()
157166
it('check', function()
158-
local a, b, c = {2, 3}, {5, 7, 11}, {13}
167+
local a, b, c, d = {2, 3}, {5, 7, 11}, {13}, {hello = 'world'}
159168
assert.are_same({2, 3, 5, 7, 11, 13}, Array.extendWith(a, b, c))
160169
assert.are_same({2, 3, 5, 7, 11, 13}, a)
170+
assert.are_same({2, 3, 5, 7, 11, 13, {hello = 'world'}}, Array.extendWith(a, d))
171+
assert.are_same({2, 3, 5, 7, 11, 13, {hello = 'world'}}, a)
161172
end)
162173
end)
163174

-7.68 KB
Loading
4.29 KB
Loading
1.19 KB
Loading
-554 Bytes
Loading
-554 Bytes
Loading
-2.38 KB
Loading
-1.19 KB
Loading
-1.19 KB
Loading

0 commit comments

Comments
 (0)