Update and add specs

Author: timhall

specs/Excel-REST - Specs.xlsm

@@ -13,21 +13,15 @@ Public Function Specs() As SpecSuite
     Client.BaseUrl = "http://localhost:3000"
 
     Dim Request As RestRequest
-    
-    With Specs.It("should wait")
-        Dim GoalTime As Long
-        GoalTime = GetTickCount() + 100
-        
-        Wait 100
-        .Expect(GetTickCount()).ToBeGTE GoalTime
-    End With
+    Dim WaitTime As Integer
+    WaitTime = 500
 
     With Specs.It("should pass response to callback")
         Set Request = New RestRequest
         Request.Resource = "get"
 
         Client.ExecuteAsync Request, "SimpleCallback"
-        Wait 200
+        Wait WaitTime * 2
         .Expect(AsyncResponse).ToBeDefined
     End With
 
@@ -36,7 +30,7 @@ Public Function Specs() As SpecSuite
         Request.Resource = "get"
 
         Client.ExecuteAsync Request, "ComplexCallback", Array("A", "B", "C")
-        Wait 200
+        Wait WaitTime
         .Expect(AsyncResponse).ToBeDefined
         If UBound(AsyncArgs) > 1 Then
             .Expect(AsyncArgs(0)).ToEqual "A"
@@ -53,25 +47,25 @@ Public Function Specs() As SpecSuite
 
         Request.AddUrlSegment "code", 200
         Client.ExecuteAsync Request, "SimpleCallback"
-        Wait 200
+        Wait WaitTime
         .Expect(AsyncResponse.StatusCode).ToEqual 200
         .Expect(AsyncResponse.StatusDescription).ToEqual "OK"
 
         Request.AddUrlSegment "code", 304
         Client.ExecuteAsync Request, "SimpleCallback"
-        Wait 200
+        Wait WaitTime
         .Expect(AsyncResponse.StatusCode).ToEqual 304
         .Expect(AsyncResponse.StatusDescription).ToEqual "Not Modified"
 
         Request.AddUrlSegment "code", 404
         Client.ExecuteAsync Request, "SimpleCallback"
-        Wait 200
+        Wait WaitTime
         .Expect(AsyncResponse.StatusCode).ToEqual 404
         .Expect(AsyncResponse.StatusDescription).ToEqual "Not Found"
 
         Request.AddUrlSegment "code", 500
         Client.ExecuteAsync Request, "SimpleCallback"
-        Wait 200
+        Wait WaitTime
         .Expect(AsyncResponse.StatusCode).ToEqual 500
         .Expect(AsyncResponse.StatusDescription).ToEqual "Internal Server Error"
     End With
@@ -81,9 +75,9 @@ Public Function Specs() As SpecSuite
         Request.Resource = "timeout"
         Request.AddQuerystringParam "ms", 2000
 
-        Client.TimeoutMS = 500
+        Client.TimeoutMS = 100
         Client.ExecuteAsync Request, "SimpleCallback"
-        Wait 1000
+        Wait 500
         .Expect(AsyncResponse).ToBeDefined
         If Not AsyncResponse Is Nothing Then
             .Expect(AsyncResponse.StatusCode).ToEqual 504
@@ -105,7 +99,7 @@ Public Sub ComplexCallback(Response As RestResponse, Args As Variant)
 End Sub
 
 Public Sub Reset()
-    Set AsyncResponse = Nothing
+    Set AsyncResponse = New RestResponse
     AsyncArgs = Array()
 End Sub
 

specs/RestClientAsyncSpecs.bas

@@ -79,7 +79,8 @@ Public Function Specs() As SpecSuite
 
         .Expect(Client.Execute(Request).Data("body")).ToEqual "Howdy!"
 
-        Dim Body As New Dictionary
+        Dim Body As Object
+        Set Body = CreateObject("Scripting.Dictionary")
         Body.Add "a", 3.14
 
         Set Request = New RestRequest
@@ -104,5 +105,19 @@ Public Function Specs() As SpecSuite
         .Expect(Response.Data("query")("d")).ToEqual "False"
     End With
 
+    With Specs.It("should return 504 on request timeout")
+        Set Request = New RestRequest
+        Request.Resource = "timeout"
+        Request.AddQuerystringParam "ms", 2000
+
+        Client.TimeoutMS = 500
+        Set Response = Client.Execute(Request)
+        .Expect(Response.StatusCode).ToEqual 504
+        .Expect(Response.StatusDescription).ToEqual "Gateway Timeout"
+        Debug.Print Response.Content
+    End With
+    
+    Set Client = Nothing
+    
     InlineRunner.RunSuite Specs
 End Function

specs/RestClientSpecs.bas

@@ -77,6 +77,17 @@ Public Function Specs() As SpecSuite
 
         .Expect(Request.FormattedResource).ToEqual "?A=123&B=456&C=789"
     End With
+    
+    With Specs.It("should not add ? if already in resource")
+        Set Request = New RestRequest
+        Request.IncludeCacheBreaker = False
+        
+        Request.AddParameter "B", "456"
+        Request.Method = httpGET
+        Request.Resource = "?A=123"
+        
+        .Expect(Request.FormattedResource).ToEqual "?A=123&B=456"
+    End With
 
     With Specs.It("should URL encode querystring")
         Set Request = New RestRequest
@@ -122,7 +133,8 @@ Public Function Specs() As SpecSuite
     With Specs.It("should only combine body and parameters if not GET Request")
         Set Request = New RestRequest
 
-        Dim Body As New Dictionary
+        Dim Body As Object
+        Set Body = CreateObject("Scripting.Dictionary")
         Body.Add "A", 123
 
         Request.AddBody Body

specs/RestRequestSpecs.bas

@@ -1,15 +1,15 @@
 var express = require('express');
 var app = express();
 
-app.use(plain());
-app.use(express.json());
-app.use(express.urlencoded());
-
 app.use(function(req, res, next){
   console.log('%s %s', req.method, req.url);
   next();
 });
 
+app.use(plain());
+app.use(express.json());
+app.use(express.urlencoded());
+
 // Standard
 app.get('/get', standardResponse);
 app.post('/post', standardResponse);