Add form-urlencoded specs

Author: timhall

specs/Excel-REST - Specs.xlsm

@@ -18,11 +18,12 @@ Public Function Specs() As SpecSuite
     Dim Parsed As Object
     Dim Obj As Object
     Dim Coll As Collection
-    Dim A As Object
-    Dim B As Object
-    Dim Combined As Object
+    Dim A As Dictionary
+    Dim B As Dictionary
+    Dim Combined As Dictionary
     Dim Whitelist As Variant
-    Dim Filtered As Object
+    Dim Filtered As Dictionary
+    Dim Encoded As String
     Dim ResponseHeaders As String
     Dim Headers As Collection
     Dim Cookies As Dictionary
@@ -107,10 +108,14 @@ Public Function Specs() As SpecSuite
 
     With Specs.It("should url encode values")
         .Expect(RestHelpers.URLEncode(" !""#$%&'")).ToEqual "%20%21%22%23%24%25%26%27"
+        .Expect(RestHelpers.URLEncode("A + B")).ToEqual "A%20%2B%20B"
+        .Expect(RestHelpers.URLEncode("A + B", True)).ToEqual "A+%2B+B"
     End With
 
     With Specs.It("should decode url values")
         .Expect(RestHelpers.URLDecode("+%20%21%22%23%24%25%26%27")).ToEqual "  !""#$%&'"
+        .Expect(RestHelpers.URLDecode("A%20%2B%20B")).ToEqual "A + B"
+        .Expect(RestHelpers.URLDecode("A+%2B+B")).ToEqual "A + B"
     End With
 
     With Specs.It("should join url with /")
@@ -155,6 +160,29 @@ Public Function Specs() As SpecSuite
         .Expect(Filtered.Exists("dangerous")).ToEqual False
     End With
 
+    With Specs.It("should combine and convert parameters to url-encoded string")
+        Set A = New Dictionary
+        Set B = New Dictionary
+        
+        A.Add "a", 1
+        A.Add "b", 3.14
+        B.Add "b", 4.14
+        B.Add "c", "Howdy!"
+        B.Add "d & e", "A + B"
+        
+        Encoded = RestHelpers.DictionariesToUrlEncodedString(A, B)
+        .Expect(Encoded).ToEqual "a=1&b=4.14&c=Howdy%21&d+%26+e=A+%2B+B"
+    End With
+    
+    With Specs.It("should parse url-encoded string")
+        Set Parsed = RestHelpers.ParseUrlEncoded("a=1&b=3.14&c=Howdy%21&d+%26+e=A+%2B+B")
+        
+        .Expect(Parsed("a")).ToEqual "1"
+        .Expect(Parsed("b")).ToEqual "3.14"
+        .Expect(Parsed("c")).ToEqual "Howdy!"
+        .Expect(Parsed("d & e")).ToEqual "A + B"
+    End With
+    
     With Specs.It("should extract headers from response headers")
         ResponseHeaders = "Connection: keep -alive" & vbCrLf & _
             "Date: Tue, 18 Feb 2014 15:00:26 GMT" & vbCrLf & _

specs/RestHelpersSpecs.bas

@@ -97,7 +97,7 @@ Public Function Specs() As SpecSuite
         Request.AddParameter "A B", " !""#$%&'"
         Request.Method = httpGET
 
-        .Expect(Request.FormattedResource).ToEqual "?A%20B=%20%21%22%23%24%25%26%27"
+        .Expect(Request.FormattedResource).ToEqual "?A+B=+%21%22%23%24%25%26%27"
     End With
 
     With Specs.It("should include cachebreaker in FormattedResource by default")
@@ -144,7 +144,7 @@ Public Function Specs() As SpecSuite
         .Expect(Request.Body).ToEqual "{""A"":123}"
 
         Request.Method = httpPOST
-        .Expect(Request.Body).ToEqual "{""A"":123,""b"":456}"
+        .Expect(Request.Body).ToEqual "{""b"":456,""A"":123}"
     End With
 
     With Specs.It("should use given client base url for FullUrl only if BaseUrl isn't already set")
@@ -175,25 +175,20 @@ Public Function Specs() As SpecSuite
         .Expect(Request.FullUrl("facebook.com/api/")).ToEqual "https://facebook.com/api/status"
     End With
 
-    With Specs.It("should user form-urlencoded content type for non-GET requests with parameters")
+    With Specs.It("should include content-type based on specified format")
         Set Request = New RestRequest
 
         Request.AddParameter "A", 123
         Request.Method = httpPOST
 
-        .Expect(Request.ContentType).ToEqual "application/x-www-form-urlencoded;charset=UTF-8"
-    End With
-    
-    With Specs.It("should use application/json for GET requests with parameters and requests without parameters")
-        Set Request = New RestRequest
-        
-        Request.Method = httpPOST
+        ' JSON by default
         .Expect(Request.ContentType).ToEqual "application/json"
 
-        Request.AddParameter "A", 123
-        Request.Method = httpGET
-        
+        Request.Format = json
         .Expect(Request.ContentType).ToEqual "application/json"
+        
+        Request.Format = formurlencoded
+        .Expect(Request.ContentType).ToEqual "application/x-www-form-urlencoded;charset=UTF-8"
     End With
 
     With Specs.It("should override existing headers, url segments, and parameters")
@@ -260,6 +255,23 @@ Public Function Specs() As SpecSuite
         .Expect(Request.Body).ToEqual "Howdy!"
     End With
 
+    With Specs.It("should format body based on set format")
+        Set Request = New RestRequest
+        Request.Method = httpPOST
+        
+        Request.AddParameter "A", 123
+        Request.AddParameter "B", "Howdy!"
+        
+        ' JSON by default
+        .Expect(Request.Body).ToEqual "{""A"":123,""B"":""Howdy!""}"
+        
+        Request.Format = json
+        .Expect(Request.Body).ToEqual "{""A"":123,""B"":""Howdy!""}"
+        
+        Request.Format = formurlencoded
+        .Expect(Request.Body).ToEqual "A=123&B=Howdy%21"
+    End With
+    
     InlineRunner.RunSuite Specs
 End Function