(closes Szer#10) Unignore spec validation

bessgeor · Oct 24, 2020 · ec85264 · ec85264
1 parent c323581
commit ec85264
Show file tree

Hide file tree

Showing 7 changed files with 60 additions and 12 deletions.
diff --git a/src/GiraffeGenerator/Program.fs b/src/GiraffeGenerator/Program.fs
@@ -18,7 +18,12 @@ let main argv =
     let inputFile = getArg argv "--inputfile"
     let outputFile = getArg argv "--outputfile"
 
-    let doc,_ = read inputFile
+    let doc, errors = read inputFile
+    if errors <> null && errors.Errors <> null && errors.Errors.Count > 0 then 
+        errors.Errors
+        |> Seq.map (fun err -> sprintf "%s (at %s)" err.Message err.Pointer)
+        |> String.concat "\n"
+        |> failwith
     let api = parse doc
 
     let resultSource =

diff --git a/tests/GiraffeGenerator.IntegrationTests/SpecSimpleTests.fs b/tests/GiraffeGenerator.IntegrationTests/SpecSimpleTests.fs
@@ -1,6 +1,7 @@
 namespace GiraffeGenerator.IntegrationTests
 
 open System.Net
+open System.Threading.Tasks
 open FSharp.Control.Tasks.V2.ContextInsensitive
 open System
 open Giraffe
@@ -16,9 +17,9 @@ type SpecSimpleTests() =
 
     let simpleSpecService =
         { new SpecSimpleAPI.Service() with
-            member _.ListVersionsv2 = text "123"
-            member _.GetVersionDetailsv2 = text "234"
-            member _.PostVersionDetailsv2 = text "345" }
+            member _.ListVersionsv2Input _ = Task.FromResult "123"
+            member _.GetVersionDetailsv2Input _ = Task.FromResult "234"
+            member _.PostVersionDetailsv2Input _ = Task.FromResult "345" }
 
     let configureApp (app : IApplicationBuilder) =
         app.UseGiraffe SpecSimpleAPI.webApp
@@ -47,23 +48,23 @@ type SpecSimpleTests() =
     let ``GET / -> OK "123"``() = task {
         let! response = client.GetAsync("/")
         let! text = response.Content.ReadAsStringAsync()
-        Assert.Equal("123",text)
+        Assert.Equal("\"123\"",text)
         Assert.Equal(HttpStatusCode.OK ,response.StatusCode)
     }
 
     [<Fact>]
     let ``GET /v2 -> OK "234"``() = task {
         let! response = client.GetAsync("/v2")
         let! text = response.Content.ReadAsStringAsync()
-        Assert.Equal("234",text)
+        Assert.Equal("\"234\"",text)
         Assert.Equal(HttpStatusCode.OK ,response.StatusCode)
     }
 
     [<Fact>]
     let ``POST /v2 -> OK "345"``() = task {
         let! response = client.PostAsync("/v2", null)
         let! text = response.Content.ReadAsStringAsync()
-        Assert.Equal("345",text)
+        Assert.Equal("\"345\"",text)
         Assert.Equal(HttpStatusCode.OK ,response.StatusCode)
     }
 

diff --git a/tests/GiraffeGenerator.IntegrationTests/SpecWithSchemasTests.fs b/tests/GiraffeGenerator.IntegrationTests/SpecWithSchemasTests.fs
@@ -1,6 +1,7 @@
 namespace GiraffeGenerator.IntegrationTests
 
 open System.Net
+open System.Threading.Tasks
 open FSharp.Control.Tasks.V2.ContextInsensitive
 open System
 open Giraffe
@@ -17,12 +18,12 @@ type SpecWithSchemasTests() =
     let specWithSchemasService=
         { new SpecwithschemasAPI.Service() with
 
-            member _.ListVersionsv2 = text "123"
+            member _.ListVersionsv2Input _ = Task.FromResult "123"
 
             member _.GetVersionDetailsv2Input ctx = task {
                 return { SpecwithschemasAPI.dataSetList.apis = [||]; total = 123 }
             }
-            member _.PostVersionDetailsv2 = text "345"}
+            member _.PostVersionDetailsv2Input _ = Task.FromResult "345"}
 
     let configureApp (app : IApplicationBuilder) =
         app.UseGiraffe SpecwithschemasAPI.webApp
@@ -51,7 +52,7 @@ type SpecWithSchemasTests() =
     let ``GET / -> OK "123"``() = task {
         let! response = client.GetAsync("/")
         let! text = response.Content.ReadAsStringAsync()
-        Assert.Equal("123",text)
+        Assert.Equal("\"123\"",text)
         Assert.Equal(HttpStatusCode.OK ,response.StatusCode)
     }
 
@@ -67,7 +68,7 @@ type SpecWithSchemasTests() =
     let ``POST /v2 -> OK "345"``() = task {
         let! response = client.PostAsync("/v2", null)
         let! text = response.Content.ReadAsStringAsync()
-        Assert.Equal("345",text)
+        Assert.Equal("\"345\"",text)
         Assert.Equal(HttpStatusCode.OK ,response.StatusCode)
     }
 

diff --git a/tests/GiraffeGenerator.IntegrationTests/specs/specSimple.yaml b/tests/GiraffeGenerator.IntegrationTests/specs/specSimple.yaml
@@ -1,12 +1,34 @@
 openapi: "3.0.0"
 info:
   title: Spec Simple API
+  version: 1
 paths:
   /:
     get:
       operationId: listVersionsv2
+      responses:
+        '200':
+          description: returns string
+          content:
+            application/json:
+              schema:
+                type: string
   /v2:
     get:
       operationId: getVersionDetailsv2
+      responses:
+        '200':
+          description: returns string
+          content:
+            application/json:
+              schema:
+                type: string
     post:
-      operationId: postVersionDetailsv2
+      operationId: postVersionDetailsv2
+      responses:
+        '200':
+          description: returns string
+          content:
+            application/json:
+              schema:
+                type: string
diff --git a/tests/GiraffeGenerator.IntegrationTests/specs/specWithArguments.yaml b/tests/GiraffeGenerator.IntegrationTests/specs/specWithArguments.yaml
@@ -1,6 +1,7 @@
 openapi: "3.0.0"
 info:
   title: Spec with arguments API
+  version: 1
 paths:
   /{dataset}/{version}/fields:
     get:

diff --git a/tests/GiraffeGenerator.IntegrationTests/specs/specWithParametersAndRequestBodySchemas.yaml b/tests/GiraffeGenerator.IntegrationTests/specs/specWithParametersAndRequestBodySchemas.yaml
@@ -1,6 +1,7 @@
 openapi: "3.0.0"
 info:
   title: Spec with parameters and request body API
+  version: 1
 paths:
   /id/{param}:
     parameters:
@@ -24,6 +25,7 @@ paths:
               $ref: '#/components/schemas/dataSetListInput'
       responses:
         '200':
+          description: returns all input parameters in one object
           content:
             application/json:
               schema:

diff --git a/tests/GiraffeGenerator.IntegrationTests/specs/specWithSchemas.yaml b/tests/GiraffeGenerator.IntegrationTests/specs/specWithSchemas.yaml
@@ -1,21 +1,37 @@
 openapi: "3.0.0"
 info:
   title: Spec with schemas API
+  version: 1
 paths:
   /:
     get:
       operationId: listVersionsv2
+      responses:
+        '200':
+          description: returns string
+          content:
+            application/json:
+              schema:
+                type: string
   /v2:
     get:
       operationId: getVersionDetailsv2
       responses:
         '200':
+          description: returns dataset
           content:
             application/json:
               schema:
                 $ref: '#/components/schemas/dataSetList'
     post:
       operationId: postVersionDetailsv2
+      responses:
+        '200':
+          description: returns string
+          content:
+            application/json:
+              schema:
+                type: string
 components:
   schemas:
     dataSetList: