Cleanup code: WIP 2

internal/config/config_test.go

@@ -1,10 +1,10 @@
 package config_test
 
 import (
-	"github.com/evg4b/uncors/testing/testconstants"
 	"testing"
 
 	"github.com/evg4b/uncors/internal/config"
+	"github.com/evg4b/uncors/testing/testconstants"
 	"github.com/evg4b/uncors/testing/testutils"
 	"github.com/evg4b/uncors/testing/testutils/params"
 	"github.com/spf13/viper"

internal/config/helpers_test.go

@@ -3,9 +3,9 @@ package config_test
 
 import (
 	"testing"
-	"github.com/evg4b/uncors/testing/testconstants"
 
 	"github.com/evg4b/uncors/internal/config"
+	"github.com/evg4b/uncors/testing/testconstants"
 	"github.com/stretchr/testify/assert"
 )
 
@@ -42,7 +42,7 @@ func TestNormaliseMappings(t *testing.T) {
 			{
 				name: "correctly set https port",
 				mappings: []config.Mapping{
-					{From: "https://localhost", To: "https://github.com"},
+					{From: testconstants.HTTPSLocalhost, To: "https://github.com"},
 				},
 				expected: []config.Mapping{
 					{From: "https://localhost:3001", To: "https://github.com"},
@@ -98,7 +98,7 @@ func TestNormaliseMappings(t *testing.T) {
 				},
 				expected: []config.Mapping{
 					{From: testconstants.HTTPLocalhost, To: "github.com"},
-					{From: "https://localhost", To: "github.com"},
+					{From: testconstants.HTTPSLocalhost, To: "github.com"},
 				},
 				useHTTPS: true,
 			},
@@ -115,10 +115,10 @@ func TestNormaliseMappings(t *testing.T) {
 			{
 				name: "correctly set https port",
 				mappings: []config.Mapping{
-					{From: "https://localhost", To: "https://github.com"},
+					{From: testconstants.HTTPSLocalhost, To: "https://github.com"},
 				},
 				expected: []config.Mapping{
-					{From: "https://localhost", To: "https://github.com"},
+					{From: testconstants.HTTPSLocalhost, To: "https://github.com"},
 				},
 				useHTTPS: true,
 			},

internal/config/mapping_test.go

@@ -2,9 +2,9 @@ package config_test
 
 import (
 	"testing"
-	"github.com/evg4b/uncors/testing/testconstants"
 
 	"github.com/evg4b/uncors/internal/config"
+	"github.com/evg4b/uncors/testing/testconstants"
 	"github.com/evg4b/uncors/testing/testutils"
 	"github.com/spf13/viper"
 	"github.com/stretchr/testify/assert"

internal/config/mappings.go

@@ -13,8 +13,7 @@ type Mappings []Mapping
 func (mappings Mappings) String() string {
 	var builder strings.Builder
 
-	groups := lo.GroupBy(mappings, extractHost)
-	for _, group := range groups {
+	for _, group := range lo.GroupBy(mappings, extractHost) {
 		for _, mapping := range group {
 			builder.WriteString(sfmt.Sprintf("%s => %s\n", mapping.From, mapping.To))
 		}

internal/config/mappings_test.go

@@ -31,7 +31,7 @@ func TestMappings(t *testing.T) {
 			name: "http and https mappings",
 			mappings: config.Mappings{
 				{From: testconstants.HTTPLocalhost, To: "https://github.com"},
-				{From: "https://localhost", To: "https://github.com"},
+				{From: testconstants.HTTPSLocalhost, To: "https://github.com"},
 			},
 			expected: []string{
 				"https://localhost => https://github.com",
@@ -77,7 +77,7 @@ func TestMappings(t *testing.T) {
 						},
 					},
 				},
-				{From: "https://localhost", To: "https://github.com"},
+				{From: testconstants.HTTPSLocalhost, To: "https://github.com"},
 			},
 			expected: []string{
 				"https://localhost => https://github.com",

internal/handler/uncors_handler_test.go

@@ -26,8 +26,6 @@ var (
 	mock3Body = `{"mock": "mock number 3"}`
 	mock4Body = `{"mock": "mock number 4"}`
 
-	localhostSecure = "https://localhost"
-
 	backgroundPng = "background.png"
 	iconsSvg      = "icons.svg"
 	indexJS       = "index.js"
@@ -57,7 +55,7 @@ func TestUncorsRequestHandler(t *testing.T) {
 	mappings := []config.Mapping{
 		{
 			From: testconstants.HTTPLocalhost,
-			To:   localhostSecure,
+			To:   testconstants.HTTPSLocalhost,
 			Statics: []config.StaticDirectory{
 				{Dir: "/assets", Path: "/cc/", Index: indexHTML},
 				{Dir: "/assets", Path: "/pnp/", Index: "index.php"},

internal/helpers/closer_test.go

@@ -1,11 +1,11 @@
 package helpers_test
 
 import (
-	"github.com/evg4b/uncors/testing/testconstants"
 	"testing"
 
 	"github.com/evg4b/uncors/internal/helpers"
 	"github.com/evg4b/uncors/testing/mocks"
+	"github.com/evg4b/uncors/testing/testconstants"
 	"github.com/stretchr/testify/assert"
 )
 

internal/urlreplacer/replacer_test.go

@@ -1,10 +1,10 @@
 package urlreplacer_test
 
 import (
-	"github.com/evg4b/uncors/testing/testconstants"
 	"testing"
 
 	"github.com/evg4b/uncors/internal/urlreplacer"
+	"github.com/evg4b/uncors/testing/testconstants"
 	"github.com/evg4b/uncors/testing/testutils"
 	"github.com/stretchr/testify/assert"
 )
@@ -232,7 +232,7 @@ var isSecureTestCases = []struct {
 	},
 	{
 		name:     "url with https scheme",
-		url:      "https://localhost",
+		url:      testconstants.HTTPSLocalhost,
 		expected: true,
 	},
 }

testing/testconstants/constants.go

@@ -1,10 +1,9 @@
 package testconstants
 
 var (
-	SourceHost1   = "host1"
-	SourceHost2   = "host2"
-	SourceHost3   = "host3"
-	HTTPLocalhost = "http://localhost"
+	SourceHost1 = "host1"
+	SourceHost2 = "host2"
+	SourceHost3 = "host3"
 )
 
 var (

testing/testconstants/hosts.go

@@ -0,0 +1,6 @@
+package testconstants
+
+var (
+	HTTPLocalhost  = "http://localhost"
+	HTTPSLocalhost = "https://localhost"
+)