From f7bff247aa15e30e456bf44f4dacf690f7e7b0a0 Mon Sep 17 00:00:00 2001
From: Quentin McGaw <quentin.mcgaw@gmail.com>
Date: Wed, 28 Oct 2020 22:09:58 +0000
Subject: [PATCH] Fix #275

---
 internal/provider/cyberghost.go      |  2 +-
 internal/provider/cyberghost_test.go | 82 ++++++++++++++++++++++++++++
 2 files changed, 83 insertions(+), 1 deletion(-)
 create mode 100644 internal/provider/cyberghost_test.go

diff --git a/internal/provider/cyberghost.go b/internal/provider/cyberghost.go
index 22e6d18a..83ada783 100644
--- a/internal/provider/cyberghost.go
+++ b/internal/provider/cyberghost.go
@@ -30,7 +30,7 @@ func newCyberghost(servers []models.CyberghostServer, timeNow timeNowFunc) *cybe
 func (c *cyberghost) filterServers(regions []string, group string) (servers []models.CyberghostServer) {
 	for _, server := range c.servers {
 		switch {
-		case len(group) > 0 && group != server.Group,
+		case len(group) > 0 && !strings.EqualFold(group, server.Group),
 			filterByPossibilities(server.Region, regions):
 		default:
 			servers = append(servers, server)
diff --git a/internal/provider/cyberghost_test.go b/internal/provider/cyberghost_test.go
new file mode 100644
index 00000000..466cff48
--- /dev/null
+++ b/internal/provider/cyberghost_test.go
@@ -0,0 +1,82 @@
+package provider
+
+import (
+	"testing"
+
+	"github.com/qdm12/gluetun/internal/models"
+	"github.com/stretchr/testify/assert"
+)
+
+func Test_cyberghost_filterServers(t *testing.T) {
+	t.Parallel()
+	testCases := map[string]struct {
+		servers         []models.CyberghostServer
+		regions         []string
+		group           string
+		filteredServers []models.CyberghostServer
+	}{
+		"no servers": {},
+		"servers without filter": {
+			servers: []models.CyberghostServer{
+				{Region: "a", Group: "1"},
+				{Region: "b", Group: "1"},
+				{Region: "c", Group: "2"},
+				{Region: "d", Group: "2"},
+			},
+			filteredServers: []models.CyberghostServer{
+				{Region: "a", Group: "1"},
+				{Region: "b", Group: "1"},
+				{Region: "c", Group: "2"},
+				{Region: "d", Group: "2"},
+			},
+		},
+		"servers with regions filter": {
+			servers: []models.CyberghostServer{
+				{Region: "a", Group: "1"},
+				{Region: "b", Group: "1"},
+				{Region: "c", Group: "2"},
+				{Region: "d", Group: "2"},
+			},
+			regions: []string{"a", "c"},
+			filteredServers: []models.CyberghostServer{
+				{Region: "a", Group: "1"},
+				{Region: "c", Group: "2"},
+			},
+		},
+		"servers with group filter": {
+			servers: []models.CyberghostServer{
+				{Region: "a", Group: "1"},
+				{Region: "b", Group: "1"},
+				{Region: "c", Group: "2"},
+				{Region: "d", Group: "2"},
+			},
+			group: "1",
+			filteredServers: []models.CyberghostServer{
+				{Region: "a", Group: "1"},
+				{Region: "b", Group: "1"},
+			},
+		},
+		"servers with regions and group filter": {
+			servers: []models.CyberghostServer{
+				{Region: "a", Group: "1"},
+				{Region: "b", Group: "1"},
+				{Region: "c", Group: "2"},
+				{Region: "d", Group: "2"},
+			},
+			regions: []string{"a", "c"},
+			group:   "1",
+			filteredServers: []models.CyberghostServer{
+				{Region: "a", Group: "1"},
+			},
+		},
+	}
+	for name, testCase := range testCases {
+		testCase := testCase
+		t.Run(name, func(t *testing.T) {
+			t.Parallel()
+			c := &cyberghost{servers: testCase.servers}
+			filteredServers := c.filterServers(testCase.regions, testCase.group)
+			assert.Equal(t, testCase.filteredServers, filteredServers)
+		})
+	}
+}