Merge pull request #62 from /pull/61

Fix for using correct host in networking mode

apitest.go

@@ -700,7 +700,7 @@ func (a *APITest) doRequest() (*http.Response, *http.Request) {
 	} else {
 		res, err = a.networkingHTTPClient.Do(req)
 		if err != nil {
-			panic(err)
+			a.t.Fatal(err)
 		}
 	}
 
@@ -737,7 +737,10 @@ func (a *APITest) buildRequest() *http.Request {
 
 	req, _ := http.NewRequest(a.request.method, a.request.url, bytes.NewBufferString(a.request.body))
 	req.URL.RawQuery = formatQuery(a.request)
-	req.Host = "application"
+	req.Host = SystemUnderTestDefaultName
+	if a.networkingEnabled {
+		req.Host = req.URL.Host
+	}
 
 	for k, v := range a.request.headers {
 		for _, headerValue := range v {

cookies.go

@@ -106,6 +106,18 @@ func (cookie *Cookie) ToHttpCookie() *http.Cookie {
 	return &httpCookie
 }
 
+// FromHTTPCookie transforms an http cookie into a Cookie
+func FromHTTPCookie(httpCookie *http.Cookie) *Cookie {
+	return NewCookie(httpCookie.Name).
+		Value(httpCookie.Value).
+		Path(httpCookie.Path).
+		Domain(httpCookie.Domain).
+		Expires(httpCookie.Expires).
+		MaxAge(httpCookie.MaxAge).
+		Secure(httpCookie.Secure).
+		HttpOnly(httpCookie.HttpOnly)
+}
+
 // Compares cookies based on only the provided fields from Cookie.
 // Supported fields are Name, Value, Domain, Path, Expires, MaxAge, Secure and HttpOnly
 func compareCookies(expectedCookie *Cookie, actualCookie *http.Cookie) (bool, []string) {

cookies_test.go

@@ -61,6 +61,23 @@ func TestApiTest_Cookies_ToHttpCookie(t *testing.T) {
 	}, *httpCookie)
 }
 
+func TestApiTest_Cookies_FromHttpCookie(t *testing.T) {
+	expiry, _ := time.Parse("1/2/2006 15:04:05", "03/01/2017 12:00:00")
+
+	cookie := NewCookie("Tom").
+		Value("LovesBeers").
+		Path("/at-the-lyric").
+		Domain("in.london").
+		Expires(expiry).
+		MaxAge(10).
+		Secure(true).
+		HttpOnly(false)
+
+	result := FromHTTPCookie(cookie.ToHttpCookie())
+
+	assert.Equal(t, cookie, result)
+}
+
 func TestApiTest_Cookies_ToHttpCookie_PartiallyCreated(t *testing.T) {
 	expiry, _ := time.Parse("1/2/2006 15:04:05", "03/01/2017 12:00:00")