diff --git a/frontend/elm.json b/frontend/elm.json index a634f60..085913e 100644 --- a/frontend/elm.json +++ b/frontend/elm.json @@ -3,7 +3,7 @@ "source-directories": [ "src" ], - "elm-version": "0.19.1", + "elm-version": "0.19.2", "dependencies": { "direct": { "NoRedInk/elm-json-decode-pipeline": "1.0.0", @@ -28,8 +28,10 @@ }, "test-dependencies": { "direct": { - "elm-explorations/test": "1.0.0" + "elm-explorations/test": "2.2.1" }, - "indirect": {} + "indirect": { + "elm/bytes": "1.0.8" + } } } diff --git a/frontend/package-lock.json b/frontend/package-lock.json index 005dea7..236166f 100644 --- a/frontend/package-lock.json +++ b/frontend/package-lock.json @@ -17,9 +17,9 @@ "@parcel/transformer-elm": "^2.16.4", "@parcel/transformer-webmanifest": "2.16.4", "@parcel/transformer-xml": "2.16.4", - "elm": "^0.19.1-6", + "elm": "^0.19.2-0", "elm-format": "^0.8.8", - "elm-test": "^0.19.1-revision7", + "elm-test": "^0.19.2-0", "parcel": "^2.16.4", "parcel-plugin-browserconfig": "^1.0.5", "process": "^0.11.10", @@ -97,9 +97,9 @@ ] }, "node_modules/@elm_binaries/darwin_arm64": { - "version": "0.19.1-0", - "resolved": "https://registry.npmjs.org/@elm_binaries/darwin_arm64/-/darwin_arm64-0.19.1-0.tgz", - "integrity": "sha512-mjbsH7BNHEAmoE2SCJFcfk5fIHwFIpxtSgnEAqMsVLpBUFoEtAeX+LQ+N0vSFJB3WAh73+QYx/xSluxxLcL6dA==", + "version": "0.19.2-0", + "resolved": "https://registry.npmjs.org/@elm_binaries/darwin_arm64/-/darwin_arm64-0.19.2-0.tgz", + "integrity": "sha512-vhgvWAgc+jkB/oSCqI0BK1w908ivNbV6OBWIGtJgbzAXFh6RYLcGdE04+X6CTLgj+u5ufl81lsnMG6lWEMzbJg==", "cpu": [ "arm64" ], @@ -111,9 +111,9 @@ ] }, "node_modules/@elm_binaries/darwin_x64": { - "version": "0.19.1-0", - "resolved": "https://registry.npmjs.org/@elm_binaries/darwin_x64/-/darwin_x64-0.19.1-0.tgz", - "integrity": "sha512-QGUtrZTPBzaxgi9al6nr+9313wrnUVHuijzUK39UsPS+pa+n6CmWyV/69sHZeX9qy6UfeugE0PzF3qcUiy2GDQ==", + "version": "0.19.2-0", + "resolved": "https://registry.npmjs.org/@elm_binaries/darwin_x64/-/darwin_x64-0.19.2-0.tgz", + "integrity": "sha512-CQub4GhTa9nOHkUpi4eVGy34mxhfQOpVteLWkgsFwSHxXathKzNaOR9W7nVHR1iKEMBNcYJpXS2MoQognOUMkA==", "cpu": [ "x64" ], @@ -124,10 +124,24 @@ "darwin" ] }, + "node_modules/@elm_binaries/linux_arm64": { + "version": "0.19.2-0", + "resolved": "https://registry.npmjs.org/@elm_binaries/linux_arm64/-/linux_arm64-0.19.2-0.tgz", + "integrity": "sha512-50LdOV2ddvgBqcgfVKC3yCKg3/3RQdkfE7Be5k7Zj2xYLALQolk3X2ualXUmXIbP6Zo1xYKymDAfa/M1PTF+dw==", + "cpu": [ + "arm64" + ], + "dev": true, + "license": "BSD-3-Clause", + "optional": true, + "os": [ + "linux" + ] + }, "node_modules/@elm_binaries/linux_x64": { - "version": "0.19.1-0", - "resolved": "https://registry.npmjs.org/@elm_binaries/linux_x64/-/linux_x64-0.19.1-0.tgz", - "integrity": "sha512-T1ZrWVhg2kKAsi8caOd3vp/1A3e21VuCpSG63x8rDie50fHbCytTway9B8WHEdnBFv4mYWiA68dzGxYCiFmU2w==", + "version": "0.19.2-0", + "resolved": "https://registry.npmjs.org/@elm_binaries/linux_x64/-/linux_x64-0.19.2-0.tgz", + "integrity": "sha512-03EXHZZBCEFcKKh2kKUGPsFysKXnHANYw2XubBwT3Vj/5uOI/doG0g8kij5ng8n50vma/pNwAWqvVQLSRDmPMA==", "cpu": [ "x64" ], @@ -139,9 +153,9 @@ ] }, "node_modules/@elm_binaries/win32_x64": { - "version": "0.19.1-0", - "resolved": "https://registry.npmjs.org/@elm_binaries/win32_x64/-/win32_x64-0.19.1-0.tgz", - "integrity": "sha512-yDleiXqSE9EcqKtd9SkC/4RIW8I71YsXzMPL79ub2bBPHjWTcoyyeBbYjoOB9SxSlArJ74HaoBApzT6hY7Zobg==", + "version": "0.19.2-0", + "resolved": "https://registry.npmjs.org/@elm_binaries/win32_x64/-/win32_x64-0.19.2-0.tgz", + "integrity": "sha512-FCzv6KAlo/L2/FZe3rsIH5dgFfljlgKWpMUDxVgNm1mFKep4TeFEnwRlSUh7hFnKCDVyjUL9oNL+x4OwYr3KWg==", "cpu": [ "x64" ], @@ -2960,9 +2974,9 @@ "license": "ISC" }, "node_modules/elm": { - "version": "0.19.1-6", - "resolved": "https://registry.npmjs.org/elm/-/elm-0.19.1-6.tgz", - "integrity": "sha512-mKYyierHICPdMx/vhiIacdPmTPnh889gjHOZ75ZAoCxo3lZmSWbGP8HMw78wyctJH0HwvTmeKhlYSWboQNYPeQ==", + "version": "0.19.2-0", + "resolved": "https://registry.npmjs.org/elm/-/elm-0.19.2-0.tgz", + "integrity": "sha512-a2N4WJ6ge+cXOemAgo6tu8gN17cIzzitYoPcJRpvbiPbay1+BfQAv9wyWtgTyR3YkrduN5oQwzLgSIaUBZwjYQ==", "dev": true, "hasInstallScript": true, "license": "BSD-3-Clause", @@ -2973,10 +2987,11 @@ "node": ">=7.0.0" }, "optionalDependencies": { - "@elm_binaries/darwin_arm64": "0.19.1-0", - "@elm_binaries/darwin_x64": "0.19.1-0", - "@elm_binaries/linux_x64": "0.19.1-0", - "@elm_binaries/win32_x64": "0.19.1-0" + "@elm_binaries/darwin_arm64": "0.19.2-0", + "@elm_binaries/darwin_x64": "0.19.2-0", + "@elm_binaries/linux_arm64": "0.19.2-0", + "@elm_binaries/linux_x64": "0.19.2-0", + "@elm_binaries/win32_x64": "0.19.2-0" } }, "node_modules/elm-format": { @@ -3012,20 +3027,19 @@ "license": "MPL-2.0" }, "node_modules/elm-test": { - "version": "0.19.1-revision9", - "resolved": "https://registry.npmjs.org/elm-test/-/elm-test-0.19.1-revision9.tgz", - "integrity": "sha512-lvHJbh16sy7oUBBPIEMN+0v6dGDZFmfvwq+V+TnGPk5ZlI64vcykx8E8+zLt/E+Ja42UKMMXXgN1ZHQ1V6Ic2Q==", + "version": "0.19.2-0", + "resolved": "https://registry.npmjs.org/elm-test/-/elm-test-0.19.2-0.tgz", + "integrity": "sha512-vXr9HS3ikJA8fNYtMYusha1sG8exjigeg/4Gh+wedd9412DKb0sNMNg7hXOF3N4jxc+SroyyL6SoBxLSJ/bBlw==", "dev": true, "license": "BSD-3-Clause", "dependencies": { - "chalk": "^4.1.2", "chokidar": "^3.5.3", - "commander": "^9.3.0", - "cross-spawn": "^7.0.3", - "elm-solve-deps-wasm": "^1.0.1", - "glob": "^8.0.3", + "commander": "^9.4.1", + "cross-spawn": "^7.0.6", + "elm-solve-deps-wasm": "^1.0.2 || ^2.0.0", "graceful-fs": "^4.2.10", "split": "^1.0.1", + "tinyglobby": "^0.2.10", "which": "^2.0.2", "xmlbuilder": "^15.1.1" }, @@ -3036,50 +3050,6 @@ "node": ">=12.20.0" } }, - "node_modules/elm-test/node_modules/brace-expansion": { - "version": "2.0.2", - "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-2.0.2.tgz", - "integrity": "sha512-Jt0vHyM+jmUBqojB7E1NIYadt0vI0Qxjxd2TErW94wDz+E2LAm5vKMXXwg6ZZBTHPuUlDgQHKXvjGBdfcF1ZDQ==", - "dev": true, - "license": "MIT", - "dependencies": { - "balanced-match": "^1.0.0" - } - }, - "node_modules/elm-test/node_modules/glob": { - "version": "8.1.0", - "resolved": "https://registry.npmjs.org/glob/-/glob-8.1.0.tgz", - "integrity": "sha512-r8hpEjiQEYlF2QU0df3dS+nxxSIreXQS1qRhMJM0Q5NDdR386C7jb7Hwwod8Fgiuex+k0GFjgft18yvxm5XoCQ==", - "deprecated": "Glob versions prior to v9 are no longer supported", - "dev": true, - "license": "ISC", - "dependencies": { - "fs.realpath": "^1.0.0", - "inflight": "^1.0.4", - "inherits": "2", - "minimatch": "^5.0.1", - "once": "^1.3.0" - }, - "engines": { - "node": ">=12" - }, - "funding": { - "url": "https://github.com/sponsors/isaacs" - } - }, - "node_modules/elm-test/node_modules/minimatch": { - "version": "5.1.9", - "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-5.1.9.tgz", - "integrity": "sha512-7o1wEA2RyMP7Iu7GNba9vc0RWWGACJOCZBJX2GJWip0ikV+wcOsgVuY9uE8CPiyQhkGFSlhuSkZPavN7u1c2Fw==", - "dev": true, - "license": "ISC", - "dependencies": { - "brace-expansion": "^2.0.1" - }, - "engines": { - "node": ">=10" - } - }, "node_modules/entities": { "version": "4.5.0", "resolved": "https://registry.npmjs.org/entities/-/entities-4.5.0.tgz", @@ -4322,6 +4292,54 @@ "dev": true, "license": "MIT" }, + "node_modules/tinyglobby": { + "version": "0.2.17", + "resolved": "https://registry.npmjs.org/tinyglobby/-/tinyglobby-0.2.17.tgz", + "integrity": "sha512-wXR/dYpcqKmfWpEdZjiKJOwCNFndD0DMnrW/cYjVGttEkBfVgcLFHoNrlj47mjOVic9yyNu65alsgF4NQyTa2g==", + "dev": true, + "license": "MIT", + "dependencies": { + "fdir": "^6.5.0", + "picomatch": "^4.0.4" + }, + "engines": { + "node": ">=12.0.0" + }, + "funding": { + "url": "https://github.com/sponsors/SuperchupuDev" + } + }, + "node_modules/tinyglobby/node_modules/fdir": { + "version": "6.5.0", + "resolved": "https://registry.npmjs.org/fdir/-/fdir-6.5.0.tgz", + "integrity": "sha512-tIbYtZbucOs0BRGqPJkshJUYdL+SDH7dVM8gjy+ERp3WAUjLEFJE+02kanyHtwjWOnwrKYBiwAmM0p4kLJAnXg==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=12.0.0" + }, + "peerDependencies": { + "picomatch": "^3 || ^4" + }, + "peerDependenciesMeta": { + "picomatch": { + "optional": true + } + } + }, + "node_modules/tinyglobby/node_modules/picomatch": { + "version": "4.0.5", + "resolved": "https://registry.npmjs.org/picomatch/-/picomatch-4.0.5.tgz", + "integrity": "sha512-RvwwcruNjI1ncT5xRakeyS9Lf8lcItv34KD+aif+VH9kduAyfYBipGh12274xtenIPZ119/R9BdTBa8gAwSh0A==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=12" + }, + "funding": { + "url": "https://github.com/sponsors/jonschlinkert" + } + }, "node_modules/to-regex-range": { "version": "5.0.1", "resolved": "https://registry.npmjs.org/to-regex-range/-/to-regex-range-5.0.1.tgz", diff --git a/frontend/package.json b/frontend/package.json index 5558cbe..f1c5fca 100644 --- a/frontend/package.json +++ b/frontend/package.json @@ -19,9 +19,9 @@ "@parcel/transformer-elm": "^2.16.4", "@parcel/transformer-webmanifest": "2.16.4", "@parcel/transformer-xml": "2.16.4", - "elm": "^0.19.1-6", + "elm": "^0.19.2-0", "elm-format": "^0.8.8", - "elm-test": "^0.19.1-revision7", + "elm-test": "^0.19.2-0", "parcel": "^2.16.4", "parcel-plugin-browserconfig": "^1.0.5", "process": "^0.11.10", @@ -29,5 +29,11 @@ }, "dependencies": { "partysocket": "^1.1.16" + }, + "//": "elm override: @parcel/transformer-elm's peer range doesn't allow elm 0.19.2 yet; remove when it does", + "overrides": { + "@parcel/transformer-elm": { + "elm": "$elm" + } } } diff --git a/frontend/tests/LogicTest.elm b/frontend/tests/LogicTest.elm index b557b8e..85a6a40 100644 --- a/frontend/tests/LogicTest.elm +++ b/frontend/tests/LogicTest.elm @@ -67,18 +67,21 @@ all = [ test "returns true for a busted player" <| \_ -> isBusted PreFlopRound (testPlayer True) - |> Expect.true "isBusted should return True for a busted player" + |> Expect.equal True + |> Expect.onFail "isBusted should return True for a busted player" , test "returns False for a player that is not busted" <| \_ -> isBusted PreFlopRound (testPlayer False) - |> Expect.false "isBusted should return False for a non-busted player" + |> Expect.equal False + |> Expect.onFail "isBusted should return False for a non-busted player" , test "returns false for a non-busted player that has an empty stack during a showdown" <| -- this is so that the "temporary" showdown status is reflected in the UI \_ -> isBusted (ShowdownRound testCard testCard testCard testCard testCard []) (testPlayerWithNoStack False) - |> Expect.true "isBusted should return True here, even though the player isn't directly busted" + |> Expect.equal True + |> Expect.onFail "isBusted should return True here, even though the player isn't directly busted" ] , describe "gameIsFinished" [ test "returns False if no players are busted" <|