Mac fixes

Author: timhall

authenticators/GoogleAuthenticator.cls

@@ -93,6 +93,9 @@ Public Sub Login()
         Exit Sub
     End If
 
+    Dim auth_Completed As Boolean
+    auth_Completed = True
+    
 #If Mac Then
 
     ' Mac login opens dialog and then user copy-paste's authorization code into InputBox
@@ -122,8 +125,6 @@ Public Sub Login()
     On Error GoTo auth_Cleanup
 
     Dim auth_IE As Object
-    Dim auth_Completed As Boolean
-    
     auth_Completed = False
 
     Set auth_IE = CreateObject("InternetExplorer.Application")

specs/Specs_WebClient.bas

@@ -22,6 +22,7 @@ Public Function Specs() As SpecSuite
     Dim i As Integer
     Dim Options As Dictionary
     Dim XMLBody As Object
+    Dim Curl As String
 
     Client.BaseUrl = HttpbinBaseUrl
     Client.TimeoutMs = 5000
@@ -69,13 +70,14 @@ Public Function Specs() As SpecSuite
 
     With Specs.It("[Mac-only] Insecure should set --insecure flag in cURL")
 #If Mac Then
-    Dim Curl As String
-    Curl = Client.PrepareCurlRequest(Request)
+    Set Request = New WebRequest
 
+    Curl = Client.PrepareCurlRequest(Request)
     .Expect(Curl).ToNotMatch "--insecure"
 
     Client.Insecure = True
 
+    Curl = Client.PrepareCurlRequest(Request)
     .Expect(Curl).ToMatch "--insecure"
 #Else
     ' (Mac-only)
@@ -245,8 +247,6 @@ Public Function Specs() As SpecSuite
         Request.AddHeader "custom", "Howdy!"
         Request.AddCookie "test-cookie", "howdy"
 
-        Dim Curl As String
-        
         Curl = Client.PrepareCurlRequest(Request)
         .Expect(Curl).ToMatch "http://localhost:3000/text?type=message"
         .Expect(Curl).ToMatch "-X POST"