From c98a644ccd42cb47be21ddcb5ffcca2394bbf11f Mon Sep 17 00:00:00 2001
From: Andrey Ivanov <tiburon-777@users.noreply.github.com>
Date: Fri, 6 Nov 2020 19:25:43 +0300
Subject: [PATCH] =?UTF-8?q?=D0=92=D0=BA=D0=BB=D1=8E=D1=87=D0=B8=D0=BB=20?=
 =?UTF-8?q?=D0=B8=D0=BD=D1=82=D0=B5=D0=B3=D1=80=D0=B0=D1=86=D0=B8=D0=BE?=
 =?UTF-8?q?=D0=BD=D0=BD=D1=8B=D0=B9=20=D1=82=D0=B5=D1=81=D1=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .travis.yml                   | 1 +
 cmd/main_test.go              | 2 +-
 internal/application/query.go | 3 ++-
 previewer.conf                | 2 +-
 4 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 8d8923d..8ac04f4 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -31,5 +31,6 @@ jobs:
       script:
         - make lint
         - make unit-test
+        - make integration-test
         - make build
       if: (type = push) OR (type = pull_request)
diff --git a/cmd/main_test.go b/cmd/main_test.go
index 4e4f0e2..47f4c64 100644
--- a/cmd/main_test.go
+++ b/cmd/main_test.go
@@ -41,7 +41,7 @@ func TestIntegrationPositive(t *testing.T) {
 	})
 	t.Run("remote server return jpeg", func(t *testing.T) {
 		defer wg.Done()
-		body, resp, err := request("http://localhost:80/fill/1024/504/localhost:"+testPort+"/gopher_original_1024x504.jpg", 15*time.Second)
+		body, resp, err := request("http://localhost:8080/fill/1024/504/localhost:"+testPort+"/gopher_original_1024x504.jpg", 15*time.Second)
 		require.NoError(t, err)
 		require.NotNil(t, body)
 		require.Equal(t, 200, resp.StatusCode)
diff --git a/internal/application/query.go b/internal/application/query.go
index f5f7517..945ead6 100644
--- a/internal/application/query.go
+++ b/internal/application/query.go
@@ -1,6 +1,7 @@
 package application
 
 import (
+	"context"
 	"errors"
 	"fmt"
 	"io/ioutil"
@@ -44,7 +45,7 @@ func (q Query) id() string {
 
 func (q Query) fromOrigin(headers http.Header, timeout time.Duration) ([]byte, *http.Response, error) {
 	client := &http.Client{Timeout: timeout}
-	req, err := http.NewRequest("GET", "http://"+q.URL.Host+q.URL.Path, nil)
+	req, err := http.NewRequestWithContext(context.Background(), "GET", "http://"+q.URL.Host+q.URL.Path, nil)
 	if err != nil {
 		return nil, nil, fmt.Errorf("can't create request: %w", err)
 	}
diff --git a/previewer.conf b/previewer.conf
index 50d13f8..6707ae6 100644
--- a/previewer.conf
+++ b/previewer.conf
@@ -1,6 +1,6 @@
 [Server]
 Address = "localhost"
-Port = "80"
+Port = "8080"
 
 [Cache]
 Capacity = 20