Skip to content

Commit

Permalink
Update rbx_dom_lua to rojo-rbx/rbx-dom@7b03132 (#775)
Browse files Browse the repository at this point in the history
Fixes a problem where the MaterialColors Lua encoder would return nothing
  • Loading branch information
kennethloeffler authored Aug 16, 2023
1 parent 066a0b1 commit c9ab933
Show file tree
Hide file tree
Showing 2 changed files with 12 additions and 16 deletions.
1 change: 1 addition & 0 deletions plugin/rbx_dom_lua/EncodedValue.lua
Original file line number Diff line number Diff line change
Expand Up @@ -282,6 +282,7 @@ types = {
math.round(math.clamp(color.B, 0, 1) * 255)
}
end
return pod
end,
},

Expand Down
27 changes: 11 additions & 16 deletions plugin/rbx_dom_lua/EncodedValue.spec.lua
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
return function()
local HttpService = game:GetService("HttpService")

local EncodedValue = require(script.Parent.EncodedValue)
local allValues = require(script.Parent.allValues)

Expand All @@ -13,16 +13,16 @@ return function()

if ty == "table" then
local visited = {}
for key, valueA in pairs(a) do

for key, valueA in a do
visited[key] = true

if not deepEq(valueA, b[key]) then
return false
end
end

for key, valueB in pairs(b) do
for key, valueB in b do
if visited[key] then
continue
end
Expand All @@ -44,28 +44,23 @@ return function()
end,
}

for testName, testEntry in pairs(allValues) do
for testName, testEntry in allValues do
it("round trip " .. testName, function()
local ok, decoded = EncodedValue.decode(testEntry.value)
assert(ok, decoded)
local decodeOk, decoded = EncodedValue.decode(testEntry.value)
assert(decodeOk, decoded)

if extraAssertions[testName] ~= nil then
extraAssertions[testName](decoded)
end

local ok, encoded = EncodedValue.encode(decoded, testEntry.ty)
assert(ok, encoded)
local encodeOk, encoded = EncodedValue.encode(decoded, testEntry.ty)
assert(encodeOk, encoded)

if not deepEq(encoded, testEntry.value) then
local expected = HttpService:JSONEncode(testEntry.value)
local actual = HttpService:JSONEncode(encoded)

local message = string.format(
"Round-trip results did not match.\nExpected:\n%s\nActual:\n%s",
expected, actual
)

error(message)
error(`Round-trip results did not match.\nExpected:\n{expected}\nActual:\n{actual}`)
end
end)
end
Expand Down

0 comments on commit c9ab933

Please sign in to comment.