From cd51107234091a9f01f699921b9505788d665e40 Mon Sep 17 00:00:00 2001 From: Tomasz Heimowski Date: Fri, 10 Aug 2018 14:02:23 +0200 Subject: [PATCH] Fix compiler warnings in tests --- tests/Main.fs | 10 +++--- tests/Tests.fs | 86 ++++++++++++++++++++++++++------------------------ 2 files changed, 50 insertions(+), 46 deletions(-) diff --git a/tests/Main.fs b/tests/Main.fs index 2dc27c69..806e38f3 100644 --- a/tests/Main.fs +++ b/tests/Main.fs @@ -2,11 +2,11 @@ module ExpectoTemplate open Expecto let config = - { defaultConfig with - // Disabling parallel run due to yarn concurrency issue when - // installing packages in parallel - // https://github.com/yarnpkg/yarn/issues/2629 - parallel = false } + { defaultConfig with + // Disabling parallel run due to yarn concurrency issue when + // installing packages in parallel + // https://github.com/yarnpkg/yarn/issues/2629 + parallel = false } [] let main argv = diff --git a/tests/Tests.fs b/tests/Tests.fs index 42179498..39a1cb54 100644 --- a/tests/Tests.fs +++ b/tests/Tests.fs @@ -54,32 +54,36 @@ type TemplateArgs = |> List.choose id |> String.concat " " -let serverGen = Gen.elements [ - None - Some "giraffe" - Some "suave" -] - -let deployGen = Gen.elements [ - None - Some "docker" - Some "azure" -] - -let layoutGen = Gen.elements [ - None - Some "fulma-basic" - Some "fulma-admin" - Some "fulma-cover" - Some "fulma-hero" - Some "fulma-landing" - Some "fulma-login" -] - -let jsDepsGen = Gen.elements [ - None - Some "npm" -] +let serverGen = + Gen.elements [ + None + Some "giraffe" + Some "suave" + ] + +let deployGen = + Gen.elements [ + None + Some "docker" + Some "azure" + ] + +let layoutGen = + Gen.elements [ + None + Some "fulma-basic" + Some "fulma-admin" + Some "fulma-cover" + Some "fulma-hero" + Some "fulma-landing" + Some "fulma-login" + ] + +let jsDepsGen = + Gen.elements [ + None + Some "npm" + ] type TemplateArgsArb () = static member Arb () : Arbitrary = @@ -136,22 +140,22 @@ let fsCheckConfig = [] let tests = - testList "Project created from template" [ - testPropertyWithConfig fsCheckConfig "Project should build properly" (fun (x : TemplateArgs) -> - let newSAFEArgs = x.ToString() - let uid = Guid.NewGuid().ToString("n") - let dir = Path.GetTempPath() uid - Directory.create dir + testList "Project created from template" [ + testPropertyWithConfig fsCheckConfig "Project should build properly" (fun (x : TemplateArgs) -> + let newSAFEArgs = x.ToString() + let uid = Guid.NewGuid().ToString("n") + let dir = Path.GetTempPath() uid + Directory.create dir - run dotnet (sprintf "new SAFE %s" newSAFEArgs) dir + run dotnet (sprintf "new SAFE %s" newSAFEArgs) dir - Expect.isTrue (File.exists (dir "paket.lock")) (sprintf "paket.lock not present for '%s'" newSAFEArgs) + Expect.isTrue (File.exists (dir "paket.lock")) (sprintf "paket.lock not present for '%s'" newSAFEArgs) - run fake "build" dir + run fake "build" dir - logger.info( - eventX "Deleting `{dir}`" - >> setField "dir" dir) - Directory.delete dir - ) - ] + logger.info( + eventX "Deleting `{dir}`" + >> setField "dir" dir) + Directory.delete dir + ) + ]