Skip to content

Re-enable React tests #3120

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
alfonsogarciacaro merged 1 commit into from
Aug 29, 2022
Merged

Re-enable React tests #3120

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 3 additions & 4 deletions build.fsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -420,8 +420,8 @@ let testStandalone(minify) =
runInDir fableDir "npm unlink ../fable-standalone && cd ../fable-standalone && npm unlink"

let testReact() =
runFableWithArgs "tests/Js/React" ["--noCache"]
runInDir "tests/Js/React" "npm i && npm test"
runFableWithArgs "tests/React" ["--noCache"]
runInDir "tests/React" "npm i && npm test"

let compileAndRunTestsWithMocha clean projectName =
let projectDir = "tests/Js/" + projectName
Expand Down Expand Up @@ -474,8 +474,7 @@ let testJs() =
// Adaptive tests must go in a different project to avoid conflicts with Queue shim, see #2559
compileAndRunTestsWithMocha true "Adaptive"

// TODO: Re-enable React tests after updating Feliz ReactComponent plugin
// testReact()
testReact()

if envVarOrNone "CI" |> Option.isSome then
testStandaloneFast()
Expand Down
Binary file modified lib/fcs/FSharp.Compiler.Service.dll
View file
Open in desktop
Binary file not shown.
2 changes: 1 addition & 1 deletion lib/fcs/FSharp.Compiler.Service.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4965,7 +4965,7 @@
</member>
<member name="M:FSComp.SR.optsUnknownSignatureData(System.String)">
<summary>
Invalid value &apos;%s&apos; for --interfacedata, valid value are: none, file, compress.&quot;
Invalid value &apos;%s&apos; for --interfacedata, valid value are: none, file, compress.
(Originally from FSComp.txt:933)
</summary>
</member>
Expand Down
9 changes: 7 additions & 2 deletions src/Fable.Transforms/OverloadSuffix.fs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,8 +49,13 @@ let rec private getTypeFastFullName (genParams: IDictionary<_,_>) (t: Fable.Type
let genArgs = genArgs |> Seq.map (getTypeFastFullName genParams) |> String.concat " * "
if isStruct then "struct " + genArgs
else genArgs
| Fable.Array(genArg, _) -> // TODO: check kind
getTypeFastFullName genParams genArg + "[]"
| Fable.Array(genArg, kind) ->
let name =
match kind with
| Fable.ResizeArray -> "array"
| Fable.MutableArray -> "resizearray"
| Fable.ImmutableArray -> "immutablearray"
getTypeFastFullName genParams genArg + " " + name
| Fable.List genArg ->
getTypeFastFullName genParams genArg + " list"
| Fable.Option(genArg, isStruct) ->
Expand Down
10 changes: 6 additions & 4 deletions tests/React/Fable.Tests.React.fsproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,9 +8,11 @@
<Compile Include="__tests__/Tests.fs" />
</ItemGroup>
<ItemGroup>
<PackageReference Include="Fable.FluentUI" Version="0.6.0" />
<PackageReference Include="Fable.Jester" Version="0.29.1" />
<PackageReference Include="Fable.ReactTestingLibrary" Version="0.29.1" />
<PackageReference Include="Feliz" Version="1.22.0" />
<PackageReference Include="Fable.FluentUI" Version="0.7.0" />
<PackageReference Include="Fable.Jester" Version="0.33.0" />
<PackageReference Include="Fable.React" Version="8.0.1" />
<PackageReference Include="Fable.ReactTestingLibrary" Version="0.33.0" />
<PackageReference Include="Feliz" Version="1.68.0" />
<PackageReference Include="Feliz.CompilerPlugins" Version="2.0.0-prerelease-001" />
</ItemGroup>
</Project>